move: detection of maven/junit moved from RuntimeUtils to HostSystem

assira/src/main/java/net/ranides/assira/system/HostSystem.java

@@ -6,12 +6,11 @@
  */
 package net.ranides.assira.system;
 
-import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.Locale;
 import java.util.Set;
-import java.util.regex.Pattern;
 import net.ranides.assira.text.StringUtils;
+import net.ranides.assira.trace.TraceUtils;
 
 /**
  *
@@ -39,7 +38,9 @@ public enum HostSystem {
     WINDOWS_VISTA("windows vista"),
     WINDOWS_7("windows 7"),
     WINDOWS_8("windows 8"),
-    WINDOWS_10("windows 10")
+    WINDOWS_10("windows 10"),
+    MAVEN( TraceUtils.getNames().stream().anyMatch(c -> c.startsWith("org.apache.maven.surefire.")) ),
+    JUNIT( null!=RuntimeUtils.getProperty("test") )
     ;
     
     private static final class Li { // NOPMD - lazy init idiom
@@ -68,6 +69,10 @@ public enum HostSystem {
     HostSystem(String name, String version) {
         this.detected = StringUtils.split(name,"|").matchAny(Li.OS_NAME::startsWith) && Li.OS_VERSION.startsWith(version);
     }
+
+    private HostSystem(boolean detected) {
+        this.detected = detected;
+    }
     
     public boolean detected() {
         return detected;

assira/src/main/java/net/ranides/assira/system/RuntimeUtils.java

@@ -78,12 +78,6 @@ public final class RuntimeUtils {
         }
     }
     
-    
-    public static boolean invokedInsideMaven() {
-        return TraceUtils.getNames()
-            .stream().anyMatch(c -> c.startsWith("org.apache.maven.surefire."));
-    }
-    
     public static <T> T doPrivileged(PrivilegedAction<T> action) {
         return AccessController.doPrivileged(action);
     }
@@ -104,14 +98,4 @@ public final class RuntimeUtils {
         }
     }
 
-    public static boolean invokedInsideSingleTest() {
-        return Li.SINGLE_TEST;
-    }
- 
-    private static final class Li { // NOPMD lazy init idiom
-        
-        private static final boolean SINGLE_TEST = null != doPrivileged(() -> System.getProperty("test"));
-        
-    }
-
 }

assira/src/test/java/net/ranides/assira/system/HostSystemTest.java

@@ -18,6 +18,9 @@ public class HostSystemTest {
     @Test
     public void testHost() {
         System.out.printf("HostSystem = %s%n", HostSystem.current());
+        System.out.printf("HostSystem.Maven = %s%n", HostSystem.MAVEN.detected());
+        System.out.printf("HostSystem.JUnit = %s%n", HostSystem.JUNIT.detected());
+        
         assertFalse(HostSystem.current().isEmpty());
     }
     

assira/src/test/java/net/ranides/assira/system/RuntimeUtilsTest.java

@@ -1,33 +0,0 @@
-/*
- * @author Ranides Atterwim <ranides@gmail.com>
- * @copyright Ranides Atterwim
- * @license WTFPL
- * @url http://ranides.net/projects/assira
- */
-package net.ranides.assira.system;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-/**
- *
- * @author Ranides Atterwim <ranides@gmail.com>
- */
-public class RuntimeUtilsTest {
-    
-    public RuntimeUtilsTest() {
-    }
-
-    @Test
-    public void testInvokedInsideMaven() {
-        assertTrue( RuntimeUtils.invokedInsideMaven() );
-    }
-    
-    @Test
-    public void testInvokedInsideSingleTest() {
-        // we have to check that manually
-        System.err.printf("RuntimeUtils.invokedInsideSingleTest = %s%n", RuntimeUtils.invokedInsideSingleTest());
-        assertTrue(true);
-    }
-    
-}