cleanup test and introduce a common method that verifies if a key is present inside the properties and matches a specific value

Author: TheSnoozer

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

@@ -300,8 +300,7 @@ public void shouldGenerateDescribeWithTagOnlyWhenForceLongFormatIsFalse(boolean
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.describe");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo("v1.0.0-dirty");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "v1.0.0-dirty");
   }
 
   @Test
@@ -324,13 +323,9 @@ public void shouldGenerateDescribeWithTagOnlyWhenForceLongFormatIsFalseAndAbbrev
     mojo.execute();
 
     // then
-    Set<String> propNames = targetProject.getProperties().stringPropertyNames();
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "v1.0.0");
 
-    assertThat(propNames).contains("git.commit.id.describe");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo("v1.0.0");
-
-    assertThat(propNames).contains("git.commit.id.describe-short");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe-short")).isEqualTo("v1.0.0");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe-short", "v1.0.0");
   }
 
   @Test
@@ -353,8 +348,7 @@ public void shouldGenerateDescribeWithTagAndZeroAndCommitIdWhenForceLongFormatIs
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.describe");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo("v1.0.0-0-gde4db35");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "v1.0.0-0-gde4db35");
   }
 
   @Test
@@ -377,13 +371,9 @@ public void shouldGenerateDescribeWithTagAndZeroAndCommitIdWhenForceLongFormatIs
     mojo.execute();
 
     // then
-    Set<String> propNames = targetProject.getProperties().stringPropertyNames();
-
-    assertThat(propNames).contains("git.commit.id.describe");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo("v1.0.0-0-gde4db35917");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "v1.0.0-0-gde4db35917");
 
-    assertThat(propNames).contains("git.commit.id.describe-short");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe-short")).isEqualTo("v1.0.0-0");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe-short", "v1.0.0-0");
   }
 
   @Test
@@ -405,8 +395,7 @@ public void shouldGenerateCommitIdAbbrevWithDefaultLength(boolean useNativeGit)
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.abbrev");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.abbrev")).isEqualTo("de4db35");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.abbrev", "de4db35");
   }
 
   @Test
@@ -527,8 +516,7 @@ public void shouldAlwaysPrintGitDescribe(boolean useNativeGit) throws Exception
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.describe");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo("0b0181b");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "0b0181b");
   }
 
   @Test
@@ -674,11 +662,9 @@ public void shouldGenerateClosestTagInformationWhenOnATag(boolean useNativeGit)
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.name");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.name")).isEqualTo("v1.0.0");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.name", "v1.0.0");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.commit.count");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.commit.count")).isEqualTo("0");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "0");
   }
 
   @Test
@@ -703,11 +689,9 @@ public void shouldGenerateClosestTagInformationWhenOnATagAndDirty(boolean useNat
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.name");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.name")).isEqualTo("v1.0.0");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.name", "v1.0.0");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.commit.count");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.commit.count")).isEqualTo("0");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "0");
   }  
 
 
@@ -736,11 +720,9 @@ public void shouldGenerateClosestTagInformationWhenCommitHasTwoTags(boolean useN
 
     // then
     // AvailableGitTestRepo.WITH_COMMIT_THAT_HAS_TWO_TAGS ==> Where the newest-tag was created latest
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.name");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.name")).isEqualTo("newest-tag");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.name", "newest-tag");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.commit.count");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.commit.count")).isEqualTo("0");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "0");
   }
 
   @Test
@@ -777,11 +759,9 @@ public void shouldUseDateFormatTimeZone(boolean useNativeGit) throws Exception {
 
     // then
     Properties properties = targetProject.getProperties();
-    assertThat(properties.stringPropertyNames()).contains("git.commit.time");
-    assertThat(properties.getProperty("git.commit.time")).isEqualTo(expectedTimeZoneOffset);
+    assertPropertyPresentAndEqual(properties, "git.commit.time", expectedTimeZoneOffset);
 
-    assertThat(properties.stringPropertyNames()).contains("git.build.time");
-    assertThat(properties.getProperty("git.build.time")).isEqualTo(expectedTimeZoneOffset);
+    assertPropertyPresentAndEqual(properties, "git.build.time", expectedTimeZoneOffset);
 
     // set the timezone back
     TimeZone.setDefault(currentDefaultTimeZone);
@@ -893,17 +873,13 @@ public void shouldGenerateClosestTagInformationWithExcludeLightweightTagsForClos
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.abbrev");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.abbrev")).isEqualTo("b6a73ed");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.abbrev", "b6a73ed");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.describe");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo("annotated-tag-2-gb6a73ed74-customDirtyMark");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "annotated-tag-2-gb6a73ed74-customDirtyMark");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.name");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.name")).isEqualTo("annotated-tag");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.name", "annotated-tag");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.commit.count");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.commit.count")).isEqualTo("2");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "2");
   }
 
   @Test
@@ -930,17 +906,13 @@ public void shouldGenerateClosestTagInformationWithIncludeLightweightTagsForClos
     mojo.execute();
 
     // then
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.abbrev");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.abbrev")).isEqualTo("b6a73ed");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.abbrev", "b6a73ed");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.commit.id.describe");
-    assertThat(targetProject.getProperties().getProperty("git.commit.id.describe")).isEqualTo("lightweight-tag-1-gb6a73ed74-customDirtyMark");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.commit.id.describe", "lightweight-tag-1-gb6a73ed74-customDirtyMark");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.name");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.name")).isEqualTo("lightweight-tag");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.name", "lightweight-tag");
 
-    assertThat(targetProject.getProperties().stringPropertyNames()).contains("git.closest.tag.commit.count");
-    assertThat(targetProject.getProperties().getProperty("git.closest.tag.commit.count")).isEqualTo("1");
+    assertPropertyPresentAndEqual(targetProject.getProperties(), "git.closest.tag.commit.count", "1");
   }
 
   private GitDescribeConfig createGitDescribeConfig(boolean forceLongFormat, int abbrev) {
@@ -956,6 +928,11 @@ private void alterMojoSettings(String parameterName, Object parameterValue) {
     setInternalState(mojo, parameterName, parameterValue);
   }
 
+  private void assertPropertyPresentAndEqual(Properties properties, String key, String expected) {
+    assertThat(properties.stringPropertyNames()).contains(key);
+    assertThat(properties.getProperty(key)).isEqualTo(expected);
+  }
+
   private void assertGitPropertiesPresentInProject(Properties properties) {
     assertThat(properties).satisfies(new ContainsKeyCondition("git.build.time"));
     assertThat(properties).satisfies(new ContainsKeyCondition("git.build.host"));