using DynamicContainer

agorapulse · May 27, 2024 · 7a80724 · 7a80724
1 parent dc01f01
commit 7a80724
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/libs/where4j/src/main/java/com/agorapulse/testing/where4j/Expectations.java b/libs/where4j/src/main/java/com/agorapulse/testing/where4j/Expectations.java
@@ -1,11 +1,13 @@
 package com.agorapulse.testing.where4j;
 
-import com.agorapulse.testing.where4j.dsl.*;
-import org.junit.jupiter.api.DynamicTest;
+import com.agorapulse.testing.where4j.dsl.Headers3;
+import com.agorapulse.testing.where4j.dsl.Row3;
+import com.agorapulse.testing.where4j.dsl.Where3;
+import org.junit.jupiter.api.DynamicContainer;
 
 import java.util.Arrays;
 
-public interface Expectations extends Iterable<DynamicTest> {
+public interface Expectations extends Iterable<DynamicContainer> {
 
     static Headers3 header(String nameA, String nameB, String nameC) {
         return new Headers3(nameA, nameB, nameC);

diff --git a/libs/where4j/src/main/java/com/agorapulse/testing/where4j/dsl/Expectations3.java b/libs/where4j/src/main/java/com/agorapulse/testing/where4j/dsl/Expectations3.java
@@ -1,8 +1,9 @@
 package com.agorapulse.testing.where4j.dsl;
 
 import com.agorapulse.testing.where4j.Expectations;
-import org.junit.jupiter.api.DynamicTest;
+import org.junit.jupiter.api.DynamicContainer;
 
+import java.util.Collections;
 import java.util.Iterator;
 
 class Expectations3<A, B, C> implements Expectations {
@@ -18,8 +19,8 @@ class Expectations3<A, B, C> implements Expectations {
     }
 
     @Override
-    public Iterator<DynamicTest> iterator() {
-        return where.generateTests(template, verification);
+    public Iterator<DynamicContainer> iterator() {
+        return Collections.singleton(DynamicContainer.dynamicContainer(template, where.generateTests(template, verification))).iterator();
     }
 
 }
diff --git a/libs/where4j/src/main/java/com/agorapulse/testing/where4j/dsl/Where3.java b/libs/where4j/src/main/java/com/agorapulse/testing/where4j/dsl/Where3.java
@@ -6,8 +6,8 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Stream;
 
 public class Where3<A, B , C> {
 
@@ -32,7 +32,7 @@ public Expectations verify(String template, Verifcation3<A, B, C> verification)
         });
     }
 
-    Iterator<DynamicTest> generateTests(String template, Assertion3<A, B, C> verification) {
+    Stream<DynamicTest> generateTests(String template, Assertion3<A, B, C> verification) {
         return data.stream().map(row -> {
             String title = template.replace("#" + headers.getA(), String.valueOf(row.getA()));
             title = title.replace("#" + headers.getB(), String.valueOf(row.getB()));
@@ -46,6 +46,6 @@ Iterator<DynamicTest> generateTests(String template, Assertion3<A, B, C> verific
                     }
                 }
             );
-        }).iterator();
+        });
     }
 }