cleaning up unit tests and converting Java 8 statements to the equivalent Java 7 statements to satisfy IntelliJ

Author: robertpatrick

core/src/test/java/oracle/weblogic/deploy/create/CustomBeanUtilsTest.java

@@ -5,6 +5,7 @@
 package oracle.weblogic.deploy.create;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -14,77 +15,108 @@
 public class CustomBeanUtilsTest {
 
     @Test
-    public void testSimpleTypes() {
-        Object result;
-
-        // boolean to boolean
-        result = CustomBeanUtils.convertValue(Boolean.TRUE, Boolean.class);
+    public void testBooleanValueToBooleanConversion() {
+        Object result = CustomBeanUtils.convertValue(Boolean.TRUE, Boolean.class);
         assertEquals(Boolean.TRUE, result, "Boolean result does not match");
+    }
 
-        // string to boolean
-        result = CustomBeanUtils.convertValue("true", Boolean.class);
+    @Test
+    public void testStringToBooleanConversion() {
+        Object result = CustomBeanUtils.convertValue("true", Boolean.class);
         assertEquals(Boolean.TRUE, result, "String to boolean result does not match");
+    }
 
-        // character to character
-        result = CustomBeanUtils.convertValue('x', Character.class);
+    @Test
+    public void testCharacterConversion() {
+        Object result = CustomBeanUtils.convertValue('x', Character.class);
         assertEquals('x', result, "Character result does not match");
+    }
 
-        // string to character
-        result = CustomBeanUtils.convertValue("x", Character.class);
+    @Test
+    public void testStringToCharacterConversion() {
+        Object result = CustomBeanUtils.convertValue("x", Character.class);
         assertEquals('x', result, "String to character result does not match");
+    }
 
-        // string to double
-        result = CustomBeanUtils.convertValue("123.4", Double.class);
-        assertEquals(123.4, result, "String to double result does not match");
-
-        // string to float
-        result = CustomBeanUtils.convertValue("123.4", Float.class);
-        assertEquals(123.4f, result, "String to float result does not match");
-
-        // string to integer
-        result = CustomBeanUtils.convertValue("1234", Integer.class);
+    @Test
+    public void testStringToIntegerConversion() {
+        Object result = CustomBeanUtils.convertValue("1234", Integer.class);
         assertEquals(1234, result, "String to integer does not match");
+    }
 
-        // string to long
-        result = CustomBeanUtils.convertValue("1234", Long.class);
+    @Test
+    public void testStringToLongConversion() {
+        Object result = CustomBeanUtils.convertValue("1234", Long.class);
         assertEquals(1234L, result, "Boolean text result does not match");
+    }
+
+    @Test
+    public void testStringToFloatConversion() {
+        Object result = CustomBeanUtils.convertValue("123.4", Float.class);
+        assertEquals(123.4f, result, "String to float result does not match");
+    }
+
+    @Test
+    public void testStringToDoubleConversion() {
+        Object result = CustomBeanUtils.convertValue("123.4", Double.class);
+        assertEquals(123.4, result, "String to double result does not match");
+    }
 
-        // string to string
+    @Test
+    public void testStringToStringConversion() {
         String sourceText = "textValue";
-        result = CustomBeanUtils.convertValue(sourceText, String.class);
+        Object result = CustomBeanUtils.convertValue(sourceText, String.class);
         assertEquals(sourceText, result, "String result does not match");
-
-        // fail with bad numeric value
-        assertThrows(IllegalArgumentException.class, () -> CustomBeanUtils.convertValue("1234X", Integer.class));
     }
 
     @Test
-    public void testArrayTypes() {
-        Object result;
+    public void testBadStringToIntegerConversionThrowsException() {
+        assertThrows(IllegalArgumentException.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                CustomBeanUtils.convertValue("1234X", Integer.class);
+            }
+        });
+    }
 
-        // string[] to string[]
+    @Test
+    public void testStringArrayToStringArrayConversion() {
         String[] sourceTexts = { "textValue", "textValue2" };
-        result = CustomBeanUtils.convertValue(sourceTexts, String[].class);
+        Object result = CustomBeanUtils.convertValue(sourceTexts, String[].class);
         assertTrue(arraysMatch(sourceTexts, (String[]) result), "String array result does not match");
+    }
 
-        // delimited string to string[]
+    @Test
+    public void testDelimitedStringToStringArrayConversion() {
         String sourceDelimited = "textValue,textValue2";
-        result = CustomBeanUtils.convertValue(sourceDelimited, String[].class);
+        String[] sourceTexts = { "textValue", "textValue2" };
+
+        Object result = CustomBeanUtils.convertValue(sourceDelimited, String[].class);
         assertTrue(arraysMatch(sourceTexts, (String[]) result), "Delimited string array result does not match");
+    }
 
-        // integer[] to integer[]
+    @Test
+    public void testIntegerArrayToIntegerArrayConversion() {
         Integer[] sourceInts = { 123, 456 };
-        result = CustomBeanUtils.convertValue(sourceInts, Integer[].class);
+        Object result = CustomBeanUtils.convertValue(sourceInts, Integer[].class);
         assertTrue(arraysMatch(sourceInts, (Integer[]) result), "String array result does not match");
+    }
 
-        // string[] to integer[]
+    @Test
+    public void testStringArrayToIntegerArrayConversion() {
         String[] sourceTextInts = { "123", "456" };
-        result = CustomBeanUtils.convertValue(sourceTextInts, Integer[].class);
+        Integer[] sourceInts = { 123, 456 };
+
+        Object result = CustomBeanUtils.convertValue(sourceTextInts, Integer[].class);
         assertTrue(arraysMatch(sourceInts, (Integer[]) result), "Integer string array result does not match");
+    }
 
-        // delimited string to string[]
+    @Test
+    public void testDelimitedStringToIntegerArrayConversion() {
         String sourceDelimitedInts = "123,456";
-        result = CustomBeanUtils.convertValue(sourceDelimitedInts, Integer[].class);
+        Integer[] sourceInts = { 123, 456 };
+
+        Object result = CustomBeanUtils.convertValue(sourceDelimitedInts, Integer[].class);
         assertTrue(arraysMatch(sourceInts, (Integer[]) result), "Delimited integer array result does not match");
     }
 
@@ -98,7 +130,6 @@ private boolean arraysMatch(Object[] array1, Object[] array2) {
                 return false;
             }
         }
-
         return true;
     }
 }

core/src/test/java/oracle/weblogic/deploy/json/JsonTranslatorTest.java

@@ -10,6 +10,7 @@
 import java.util.logging.Logger;
 
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.function.Executable;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -29,8 +30,13 @@ public void testLexicalError() {
         // JSON { "abc": "xyz"\ } causes lexical error
         String text = "{ \"abc\": \"xyz\"/ }";
         InputStream stream = new ByteArrayInputStream(text.getBytes(UTF_8));
-        JsonStreamTranslator translator = new JsonStreamTranslator("String", stream);
-        assertThrows(JsonException.class, translator::parse, "Test must raise JsonException when model has a lexical error");
+        final JsonStreamTranslator translator = new JsonStreamTranslator("String", stream);
+        assertThrows(JsonException.class, new Executable() {
+            @Override
+            public void execute() throws Throwable {
+                translator.parse();
+            }
+        }, "Test must raise JsonException when model has a lexical error");
 
         logger.setLevel(originalLevel);
     }