Merge pull request #142 from mercyblitz/dev

Test coverage

Author: mercyblitz

microsphere-java-core/src/main/java/io/microsphere/process/ProcessExecutor.java

@@ -8,6 +8,7 @@
 import static io.microsphere.constants.SymbolConstants.SPACE_CHAR;
 import static io.microsphere.process.ProcessManager.INSTANCE;
 import static io.microsphere.text.FormatUtils.format;
+import static io.microsphere.util.ArrayUtils.isNotEmpty;
 import static java.lang.Long.MAX_VALUE;
 import static java.lang.Long.getLong;
 import static java.lang.Runtime.getRuntime;
@@ -42,7 +43,7 @@ public class ProcessExecutor {
      */
     public ProcessExecutor(String command, String... options) {
         StringBuilder optionsBuilder = new StringBuilder();
-        if (options != null) {
+        if (isNotEmpty(options)) {
             for (String argument : options) {
                 optionsBuilder.append(SPACE_CHAR).append(argument);
             }

microsphere-java-core/src/test/java/io/microsphere/reflect/AbstractJavaTypeKindTest.java

@@ -0,0 +1,12 @@
+package io.microsphere.reflect;
+
+public abstract class AbstractJavaTypeKindTest {
+
+    abstract void testGetSuperType();
+
+    abstract void testGetRawType();
+
+    abstract void testGetInterfaces();
+
+    abstract void testGetGenericTypes();
+}

…icrosphere/reflect/BaseJavaTypeTest.java …sphere/reflect/AbstractJavaTypeTest.javamicrosphere-java-core/src/test/java/io/microsphere/reflect/BaseJavaTypeTest.java renamed to microsphere-java-core/src/test/java/io/microsphere/reflect/AbstractJavaTypeTest.java microsphere-java-core/src/test/java/io/microsphere/reflect/BaseJavaTypeTest.java renamed to microsphere-java-core/src/test/java/io/microsphere/reflect/AbstractJavaTypeTest.java

@@ -54,7 +54,7 @@
  * @author <a href="mailto:mercyblitz@gmail.com">Mercy</a>
  * @since JavaType
  */
-public abstract class BaseJavaTypeTest<T> {
+public abstract class AbstractJavaTypeTest<T> {
 
     protected JavaType javaType;
 
@@ -91,14 +91,14 @@ private static void testSearchInterfaceType() {
         assertNull(searchInterfaceType(Serializable.class, AbstractList.class));
     }
 
-    public BaseJavaTypeTest() {
+    public AbstractJavaTypeTest() {
         this.type = resolveType();
     }
 
     protected Type resolveType() {
         ParameterizedType superType = (ParameterizedType) this.getClass().getGenericSuperclass();
         Type superRawType;
-        while ((superRawType = superType.getRawType()) != BaseJavaTypeTest.class) {
+        while ((superRawType = superType.getRawType()) != AbstractJavaTypeTest.class) {
             superType = (ParameterizedType) ((Class) superRawType).getGenericSuperclass();
         }
         return superType.getActualTypeArguments()[0];

microsphere-java-core/src/test/java/io/microsphere/reflect/JavaTypeKindTestForClass.java

@@ -42,9 +42,10 @@
  * @see Class
  * @since 1.0.0
  */
-public class JavaTypeKindTestForClass {
+public class JavaTypeKindTestForClass extends AbstractJavaTypeKindTest {
 
     @Test
+    @Override
     public void testGetSuperType() {
         Type superType = CLASS.getSuperType(Object.class);
         assertNull(superType);
@@ -54,6 +55,7 @@ public void testGetSuperType() {
     }
 
     @Test
+    @Override
     public void testGetRawType() {
         Type rawType = CLASS.getRawType(Object.class);
         assertSame(Object.class, rawType);
@@ -63,6 +65,7 @@ public void testGetRawType() {
     }
 
     @Test
+    @Override
     public void testGetInterfaces() {
         Type[] interfaces = CLASS.getInterfaces(Object.class);
         assertArrayEquals(EMPTY_TYPE_ARRAY, interfaces);
@@ -73,6 +76,7 @@ public void testGetInterfaces() {
     }
 
     @Test
+    @Override
     public void testGetGenericTypes() {
         Type[] genericTypes = CLASS.getGenericTypes(from(Object.class));
         assertArrayEquals(EMPTY_TYPE_ARRAY, genericTypes);

microsphere-java-core/src/test/java/io/microsphere/reflect/JavaTypeKindTestForGenericArrayType.java

@@ -36,7 +36,7 @@
  * @see GenericArrayType
  * @since 1.0.0
  */
-public class JavaTypeKindTestForGenericArrayType {
+public class JavaTypeKindTestForGenericArrayType extends AbstractJavaTypeKindTest {
 
     @Test
     public void testGetSuperType() {

microsphere-java-core/src/test/java/io/microsphere/reflect/JavaTypeKindTestForParameterizedType.java

@@ -45,7 +45,7 @@
  * @see ParameterizedType
  * @since 1.0.0
  */
-public class JavaTypeKindTestForParameterizedType {
+public class JavaTypeKindTestForParameterizedType extends AbstractJavaTypeKindTest {
 
     @Test
     public void testGetSuperType() {

microsphere-java-core/src/test/java/io/microsphere/reflect/JavaTypeKindTestForTypeVariable.java

@@ -36,7 +36,7 @@
  * @see TypeVariable
  * @since 1.0.0
  */
-public class JavaTypeKindTestForTypeVariable {
+public class JavaTypeKindTestForTypeVariable extends AbstractJavaTypeKindTest {
 
     @Test
     public void testGetSuperType() {

microsphere-java-core/src/test/java/io/microsphere/reflect/JavaTypeKindTestForUnknown.java

@@ -33,7 +33,7 @@
  * @see Kind#UNKNOWN
  * @since 1.0.0
  */
-public class JavaTypeKindTestForUnknown {
+public class JavaTypeKindTestForUnknown extends AbstractJavaTypeKindTest {
 
     @Test
     public void testGetSuperType() {

microsphere-java-core/src/test/java/io/microsphere/reflect/JavaTypeKindTestForWildcardType.java

@@ -36,7 +36,7 @@
  * @see WildcardType
  * @since 1.0.0
  */
-public class JavaTypeKindTestForWildcardType {
+public class JavaTypeKindTestForWildcardType extends AbstractJavaTypeKindTest {
 
     @Test
     public void testGetSuperType() {

microsphere-java-core/src/test/java/io/microsphere/reflect/JavaTypeTest.java

@@ -106,43 +106,81 @@ public void testFromField() {
 
     @Test
     public void testForClass() throws Throwable {
-        testBaseJavaTypeTest(JavaTypeTestForClass.class);
+        testAbstractJavaTypeTest(JavaTypeTestForClass.class);
     }
 
     @Test
     public void testForGenericArrayType() throws Throwable {
-        testBaseJavaTypeTest(JavaTypeTestForGenericArrayType.class);
+        testAbstractJavaTypeTest(JavaTypeTestForGenericArrayType.class);
     }
 
     @Test
     public void testForObjectClass() throws Throwable {
-        testBaseJavaTypeTest(JavaTypeTestForObjectClass.class);
+        testAbstractJavaTypeTest(JavaTypeTestForObjectClass.class);
     }
 
     @Test
     public void testForParameterizedType() throws Throwable {
-        testBaseJavaTypeTest(JavaTypeTestForParameterizedType.class);
+        testAbstractJavaTypeTest(JavaTypeTestForParameterizedType.class);
 
     }
 
     @Test
     public void testForTypeVariable() throws Throwable {
-        testBaseJavaTypeTest(JavaTypeTestForTypeVariable.class);
+        testAbstractJavaTypeTest(JavaTypeTestForTypeVariable.class);
     }
 
     @Test
     public void testForUnknown() throws Throwable {
-        testBaseJavaTypeTest(JavaTypeTestForUnknown.class);
+        testAbstractJavaTypeTest(JavaTypeTestForUnknown.class);
     }
 
     @Test
     public void testForWildcardType() throws Throwable {
-        testBaseJavaTypeTest(JavaTypeTestForWildcardType.class);
+        testAbstractJavaTypeTest(JavaTypeTestForWildcardType.class);
     }
 
-    private void testBaseJavaTypeTest(Class<? extends BaseJavaTypeTest> testClass) throws Throwable {
-        BaseJavaTypeTest.beforeAll();
-        BaseJavaTypeTest test = testClass.getConstructor().newInstance();
+    @Test
+    public void testKindForClass() throws Throwable {
+        testAbstractJavaTypeKindTest(JavaTypeKindTestForClass.class);
+    }
+
+    @Test
+    public void testKindForGenericArrayType() throws Throwable {
+        testAbstractJavaTypeKindTest(JavaTypeKindTestForGenericArrayType.class);
+    }
+
+    @Test
+    public void testKindForParameterizedType() throws Throwable {
+        testAbstractJavaTypeKindTest(JavaTypeKindTestForParameterizedType.class);
+    }
+
+    @Test
+    public void testKindForTypeVariable() throws Throwable {
+        testAbstractJavaTypeKindTest(JavaTypeKindTestForTypeVariable.class);
+    }
+
+    @Test
+    public void testKindForUnknown() throws Throwable {
+        testAbstractJavaTypeKindTest(JavaTypeKindTestForUnknown.class);
+    }
+
+    @Test
+    public void testKindForWildcardType() throws Throwable {
+        testAbstractJavaTypeKindTest(JavaTypeKindTestForWildcardType.class);
+    }
+
+    private void testAbstractJavaTypeKindTest(Class<? extends AbstractJavaTypeKindTest> testClass) throws Throwable {
+        AbstractJavaTypeKindTest test = testClass.getConstructor().newInstance();
+        test.testGetSuperType();
+        test.testGetRawType();
+        test.testGetInterfaces();
+        test.testGetGenericTypes();
+    }
+
+    private void testAbstractJavaTypeTest(Class<? extends AbstractJavaTypeTest> testClass) throws Throwable {
+        AbstractJavaTypeTest.beforeAll();
+        AbstractJavaTypeTest test = testClass.getConstructor().newInstance();
         test.init();
         test.test();
     }