Remove dependency between IteratorOfXXX tests #838

yegor256 · May 12, 2018 · 6caaae6 · 6caaae6
1 parent 6f726eb
commit 6caaae6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 20 deletions.
diff --git a/src/test/java/org/cactoos/iterator/IteratorOfFloatsTest.java b/src/test/java/org/cactoos/iterator/IteratorOfFloatsTest.java
@@ -51,25 +51,20 @@ public void emptyIteratorThrowsException() {
 
     @Test
     public void nonEmptyIteratorDoesNotHaveNext() {
+        final IteratorOfFloats iterator = new IteratorOfFloats(1.0f, 2.0f);
+        iterator.next();
+        iterator.next();
         MatcherAssert.assertThat(
             "hasNext is true for fully traversed iterator.",
-            this.iteratorWithFetchedElements().hasNext(),
+            iterator.hasNext(),
             new IsEqual<>(false)
         );
     }
 
     @Test(expected = NoSuchElementException.class)
     public void nonEmptyIteratorThrowsException() {
-        this.iteratorWithFetchedElements().next();
-    }
-
-    private IteratorOfFloats iteratorWithFetchedElements() {
-        final IteratorOfFloats iterator = new IteratorOfFloats(
-            1.0f, 2.0f, 3.0f
-        );
-        iterator.next();
+        final IteratorOfFloats iterator = new IteratorOfFloats(1.0f);
         iterator.next();
         iterator.next();
-        return iterator;
     }
 }
diff --git a/src/test/java/org/cactoos/iterator/IteratorOfIntsTest.java b/src/test/java/org/cactoos/iterator/IteratorOfIntsTest.java
@@ -51,25 +51,20 @@ public void emptyIteratorThrowsException() {
 
     @Test
     public void nonEmptyIteratorDoesNotHaveNext() {
+        final IteratorOfInts iterator = new IteratorOfInts(1, 2);
+        iterator.next();
+        iterator.next();
         MatcherAssert.assertThat(
             "hasNext is true for fully traversed iterator.",
-            this.iteratorWithFetchedElements().hasNext(),
+            iterator.hasNext(),
             new IsEqual<>(false)
         );
     }
 
     @Test(expected = NoSuchElementException.class)
     public void nonEmptyIteratorThrowsException() {
-        this.iteratorWithFetchedElements().next();
-    }
-
-    private IteratorOfInts iteratorWithFetchedElements() {
-        final IteratorOfInts iterator = new IteratorOfInts(
-            1, 2, 3
-        );
-        iterator.next();
+        final IteratorOfInts iterator = new IteratorOfInts(1);
         iterator.next();
         iterator.next();
-        return iterator;
     }
 }