EXP-660: Fix incorrect conflict resolution from merge/rebase

Fix unit tests from 100% allocation suppression
indeedeng · Jun 6, 2024 · 180e32c · 180e32c
1 parent 571b9c9
commit 180e32c
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/proctor-consumer/src/test/java/com/indeed/proctor/consumer/TestAbstractGroups.java b/proctor-consumer/src/test/java/com/indeed/proctor/consumer/TestAbstractGroups.java
@@ -202,7 +202,7 @@ public void testToLoggingString() {
                 .isEmpty();
         assertThat(sampleGroups.toLoggingString())
                 .isEqualTo(
-                        "#A1:abtst1,#A1:bgtst0,#A1:groupwithfallbacktst2,#A1:no_definition_tst2,#A1:propertytest2");
+                        "#A1:abtst1,#A1:bgtst0,#A1:groupwithfallbacktst2,#A1:no_definition_tst2");
     }
 
     @Test
@@ -317,7 +317,7 @@ public void testToLoggingStringWithExposureAndObserver() {
 
         // getGroupsString and getAsProctorResult should not mark tests as used
         final String fullLoggingString =
-                "#A1:abtst1,#A1:bgtst0,#A1:groupwithfallbacktst2,#A1:no_definition_tst2,#A1:propertytest2";
+                "#A1:abtst1,#A1:bgtst0,#A1:groupwithfallbacktst2,#A1:no_definition_tst2";
         assertThat(sampleGroups.getAsProctorResult()).isNotNull();
         assertThat(sampleGroups.toLoggingString()).isEqualTo(fullLoggingString);
         assertThat(sampleGroups.toLongString()).isNotBlank();
@@ -354,8 +354,7 @@ public void testGetLoggingTestNames() {
                         CONTROL_SELECTED_TEST.getName(),
                         GROUP1_SELECTED_TEST.getName(),
                         GROUP_WITH_FALLBACK_TEST.getName(),
-                        MISSING_DEFINITION_TEST.getName(),
-                        PROPERTY_TEST.getName());
+                        MISSING_DEFINITION_TEST.getName());
     }
 
     @Test
@@ -385,8 +384,7 @@ public void testAppendTestGroups() {
                         "#A1:bgtst0",
                         "#A1:abtst1",
                         "#A1:groupwithfallbacktst2",
-                        "#A1:no_definition_tst2",
-                        "#A1:propertytest2");
+                        "#A1:no_definition_tst2");
     }
 
     @Test
@@ -395,7 +393,7 @@ public void testGetJavaScriptConfig() {
         assertThat(emptyGroup.getJavaScriptConfig()).hasSize(0);
 
         assertThat(sampleGroups.getJavaScriptConfig())
-                .hasSize(5)
+                .hasSize(6)
                 .containsEntry(GROUP1_SELECTED_TEST.getName(), 1)
                 .containsEntry(CONTROL_SELECTED_TEST.getName(), 0)
                 .containsEntry(GROUP_WITH_FALLBACK_TEST.getName(), 2)