Merge pull request #81 from skivol/feature/consider-maven-surefire-de…

…bug-property-while-deciding-if-we-are-debugging

Consider also "maven.surefire.debug" environment variable while decid…

utils/src/main/java/se/fortnox/reactivewizard/util/DebugUtil.java

@@ -4,14 +4,17 @@
  * Utilities for debugging in the development environment.
  */
 public class DebugUtil {
-    public static final boolean IS_DEBUG = isIdePresent();
+    public static final boolean IS_DEBUG = isIdePresent(DebugUtil.class.getClassLoader()) || isMavenDebug();
 
     /**
      * Checks for the presence of an IDE, currently just IntelliJ.
+     * @param classLoader to use for the check
      */
-    private static boolean isIdePresent() {
-        ClassLoader classLoader = DebugUtil.class.getClassLoader();
+    static boolean isIdePresent(ClassLoader classLoader) {
         return classLoader.getResource("com/intellij") != null;
     }
 
+    static boolean isMavenDebug() {
+        return Boolean.getBoolean("maven.surefire.debug");
+    }
 }

utils/src/test/java/se/fortnox/reactivewizard/util/DebugUtilTest.java

@@ -1,13 +1,40 @@
 package se.fortnox.reactivewizard.util;
 
 import org.junit.Test;
+import org.mockito.Mockito;
+
+import java.net.MalformedURLException;
+import java.net.URL;
 
 import static org.fest.assertions.Assertions.assertThat;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.when;
 
 public class DebugUtilTest {
 
     @Test
-    public void testIsIdePresent() {
-        assertThat(DebugUtil.IS_DEBUG).isNotNull();
+    public void testIsDebug() {
+        assertThat(DebugUtil.IS_DEBUG).isNotNull(); // will be true if running from Intellij IDEA and false from command line
+    }
+
+    @Test
+    public void testIsIdePresent() throws MalformedURLException {
+        ClassLoader classLoaderWithIdeaDebugger = Mockito.mock(ClassLoader.class);
+        when(classLoaderWithIdeaDebugger.getResource(eq("com/intellij")))
+                .thenReturn(new URL("jar:file:/path/to/debugger-agent-storage.jar!/com/intellij"));
+
+        assertThat(DebugUtil.isIdePresent(classLoaderWithIdeaDebugger)).isTrue();
+    }
+
+    @Test
+    public void testIsMavenDebug() {
+        String debugPropName = "maven.surefire.debug";
+        boolean originalSurefireDebugProp = Boolean.getBoolean(debugPropName);
+        System.setProperty(debugPropName, "true");
+
+        assertThat(DebugUtil.isMavenDebug()).isTrue();
+
+        // Clean up
+        System.setProperty(debugPropName, String.valueOf(originalSurefireDebugProp));
     }
 }