Fix wrong test suite evaluation.

2 files changed, 9 insertions, 1 deletions

diff --git a/src/cz/crcs/ectester/common/test/CompoundTest.java b/src/cz/crcs/ectester/common/test/CompoundTest.java
index d7a2d9c..2c851b2 100644
--- a/src/cz/crcs/ectester/common/test/CompoundTest.java
+++ b/src/cz/crcs/ectester/common/test/CompoundTest.java
@@ -37,10 +37,18 @@ public class CompoundTest extends Test {
         return new CompoundTest(callback, RUN_ALL, tests);
     }
 
+    public static CompoundTest function(Function<Test[], Result> callback, Consumer<Test[]> runCallback, Test... tests) {
+        return new CompoundTest(callback, runCallback, tests);
+    }
+
     public static CompoundTest function(Function<Test[], Result> callback, String description, Test... tests) {
         return new CompoundTest(callback, RUN_ALL, description, tests);
     }
 
+    public static CompoundTest function(Function<Test[], Result> callback, Consumer<Test[]> runCallback, String description, Test... tests) {
+        return new CompoundTest(callback, runCallback, description, tests);
+    }
+
     public static CompoundTest all(Result.ExpectedValue what, Test... all) {
         return new CompoundTest((tests) -> {
             for (Test test : tests) {
diff --git a/src/cz/crcs/ectester/common/test/TestSuite.java b/src/cz/crcs/ectester/common/test/TestSuite.java
index 7883633..3b3cd4b 100644
--- a/src/cz/crcs/ectester/common/test/TestSuite.java
+++ b/src/cz/crcs/ectester/common/test/TestSuite.java
@@ -8,7 +8,7 @@ import cz.crcs.ectester.common.output.TestWriter;
 public abstract class TestSuite {
     protected String name;
     protected String description;
-    protected TestWriter writer;
+    private TestWriter writer;
     private Test running;
 
     public TestSuite(TestWriter writer, String name, String description) {