Removed bad test and extracted build statement to method

AdevintaSpain · May 12, 2021 · c60f9f3 · c60f9f3
1 parent e3ac3d3
commit c60f9f3
Showing 1 changed file with 20 additions and 23 deletions.
diff --git a/library/src/test/java/com/schibsted/spain/barista/rule/flaky/FlakyStatementBuilderTest.java b/library/src/test/java/com/schibsted/spain/barista/rule/flaky/FlakyStatementBuilderTest.java
@@ -49,11 +49,7 @@ public void repeatStatementReturnedWhenRepeatSetRepeatAttemptsByDefault() throws
     Statement baseStatement = new SomeStatement();
     Description description = Description.EMPTY;
 
-    Statement resultStatement = new FlakyStatementBuilder()
-        .setBase(baseStatement)
-        .setDescription(description)
-        .setRepeatAttemptsByDefault(3)
-        .build();
+    Statement resultStatement = createStatementWithRepeatAttemptsByDefault(baseStatement, description);
 
     assertTrue(resultStatement instanceof RepeatStatement);
   }
@@ -73,43 +69,36 @@ public void allowFlakyStatementReturnedWhenNoAnnotationsFoundButUsesDefault() th
     Statement baseStatement = new SomeStatement();
     Description description = Description.EMPTY;
 
-    Statement resultStatement = new FlakyStatementBuilder()
-        .setBase(baseStatement)
-        .setDescription(description)
-        .allowFlakyAttemptsByDefault(5)
-        .build();
+    Statement resultStatement = createStatementWithAllowFlakyByDefault(baseStatement, description);
 
     assertTrue(resultStatement instanceof AllowFlakyStatement);
   }
 
   @Test
-  public void lastStatementReturnedWhenRepeatSetRepeatAttemptsByDefaultAndAllowFlakyStatementAtTheSameTime() throws Exception {
+  public void lastStatementReturnedWhenRepeatAttemptsByDefaultAndAllowFlakyStatementUsedAtTheSameTime() throws Exception {
     Statement baseStatement = new SomeStatement();
     Description description = Description.EMPTY;
 
-    Statement resultStatement = new FlakyStatementBuilder()
+    Statement resultStatement = createStatementWithFlakyAndReturn(baseStatement, description);
+
+    assertTrue(resultStatement instanceof RepeatStatement);
+  }
+
+  private Statement createStatementWithFlakyAndReturn(Statement baseStatement, Description description) {
+    return new FlakyStatementBuilder()
         .setBase(baseStatement)
         .setDescription(description)
         .allowFlakyAttemptsByDefault(5)
         .setRepeatAttemptsByDefault(3)
         .build();
-
-    assertTrue(resultStatement instanceof RepeatStatement);
   }
 
-  @Test
-  public void allowFlakyStatementReturnedWhenAllowFlakyAnnotationFoundEvenRepeatStatement() throws Exception {
-    Statement baseStatement = new SomeStatement();
-    Description description = Description.EMPTY;
-
-    Statement resultStatement = new FlakyStatementBuilder()
+  private Statement createStatementWithAllowFlakyByDefault(Statement baseStatement, Description description) {
+    return new FlakyStatementBuilder()
         .setBase(baseStatement)
         .setDescription(description)
         .allowFlakyAttemptsByDefault(5)
-        .setRepeatAttemptsByDefault(3)
         .build();
-
-    assertTrue(resultStatement instanceof RepeatStatement);
   }
 
   //region Shortcut methods
@@ -120,6 +109,14 @@ private Statement createStatement(Statement baseStatement, Description descripti
         .build();
   }
 
+  private Statement createStatementWithRepeatAttemptsByDefault(Statement baseStatement, Description description) {
+    return new FlakyStatementBuilder()
+        .setBase(baseStatement)
+        .setDescription(description)
+        .setRepeatAttemptsByDefault(3)
+        .build();
+  }
+
   private Description withAnnotations(Annotation... annotations) {
     return Description.createTestDescription(CLASS, TEST, annotations);
   }