removed runningTests variable and special treatment of tests in production code

Author: autayeu

src/main/java/pl/project13/maven/git/GitCommitIdMojo.java

@@ -366,9 +366,6 @@ public class GitCommitIdMojo extends AbstractMojo {
    */
   private Properties properties;
 
-  // TODO remove this
-  boolean runningTests = false;
-
   @NotNull
   private final VerboseLog log = new VerboseLogger(this, true);
 
@@ -539,10 +536,8 @@ private void appendPropertiesToReactorProjects(@NotNull Properties properties, @
   private Properties initProperties() throws MojoExecutionException {
     if (generateGitPropertiesFile) {
       return properties = new Properties();
-    } else if (!runningTests) {
-      return properties = project.getProperties();
     } else {
-      return properties = new Properties(); // that's ok for unit tests
+      return properties = project.getProperties();
     }
   }
 

src/test/java/pl/project13/maven/git/GitCommitIdMojoDirtyFilesTest.java

@@ -38,20 +38,20 @@ public void testDetectCleanWorkingDirectory() throws Exception {
     String prefix = "git";
     int abbrevLength = 7;
     String dateFormat = "dd.MM.yyyy '@' HH:mm:ss z";
-    boolean verbose = true;
 
     GitCommitIdMojo mojo = new GitCommitIdMojo();
     mojo.setDotGitDirectory(dotGitDirectory);
     mojo.setPrefix(prefix);
     mojo.setAbbrevLength(abbrevLength);
     mojo.setDateFormat(dateFormat);
-    mojo.setVerbose(verbose);
+    mojo.setVerbose(true);
     mojo.useNativeGit(false);
     mojo.setGitDescribe(gitDescribeConfig);
 
 
-    mojo.runningTests = true;
     mojo.project = mock(MavenProject.class, RETURNS_MOCKS);
+    Properties props = new Properties();
+    when(mojo.project.getProperties()).thenReturn(props);
     when(mojo.project.getPackaging()).thenReturn("jar");
 
     mojo.execute();
@@ -70,20 +70,20 @@ public void testDetectDirtyWorkingDirectory() throws Exception {
     String prefix = "git";
     int abbrevLength = 7;
     String dateFormat = "dd.MM.yyyy '@' HH:mm:ss z";
-    boolean verbose = true;
 
     GitCommitIdMojo mojo = new GitCommitIdMojo();
     mojo.setDotGitDirectory(dotGitDirectory);
     mojo.setPrefix(prefix);
     mojo.setAbbrevLength(abbrevLength);
     mojo.setDateFormat(dateFormat);
-    mojo.setVerbose(verbose);
+    mojo.setVerbose(true);
     mojo.useNativeGit(false);
     mojo.setGitDescribe(gitDescribeConfig);
 
 
-    mojo.runningTests = true;
     mojo.project = mock(MavenProject.class, RETURNS_MOCKS);
+    Properties props = new Properties();
+    when(mojo.project.getProperties()).thenReturn(props);
     when(mojo.project.getPackaging()).thenReturn("jar");
 
     mojo.execute();

src/test/java/pl/project13/maven/git/GitCommitIdMojoTest.java

@@ -36,7 +36,7 @@
  * I'm not a big fan of this test - let's move to integration test from now on.
  *
  */
-// todo remove this test in favor of complete intgration tests
+// todo remove this test in favor of complete integration tests
 public class GitCommitIdMojoTest {
 
   GitCommitIdMojo mojo;
@@ -63,8 +63,9 @@ public void setUp() throws Exception {
     mojo.setCommitIdGenerationMode("full");
 
 
-    mojo.runningTests = true;
     mojo.project = mock(MavenProject.class, RETURNS_MOCKS);
+    Properties props = new Properties();
+    when(mojo.project.getProperties()).thenReturn(props);
     when(mojo.project.getPackaging()).thenReturn("jar");
     when(mojo.project.getVersion()).thenReturn("3.3-SNAPSHOT");