aboutsummaryrefslogtreecommitdiff
path: root/src/cz/crcs/ectester/common/test
diff options
context:
space:
mode:
authorJ08nY2018-01-20 01:12:33 +0100
committerJ08nY2018-01-20 01:14:02 +0100
commitc6345358ab582d96462209d50d37f731690ef311 (patch)
tree13b2990454b92b7b6882e82bc193041d94b523f8 /src/cz/crcs/ectester/common/test
parent87ee30fdf73db49cc538985a3937b8a792c2b30f (diff)
downloadECTester-c6345358ab582d96462209d50d37f731690ef311.tar.gz
ECTester-c6345358ab582d96462209d50d37f731690ef311.tar.zst
ECTester-c6345358ab582d96462209d50d37f731690ef311.zip
Add PerformanceTest and add it to the default card test suite.
Diffstat (limited to 'src/cz/crcs/ectester/common/test')
-rw-r--r--src/cz/crcs/ectester/common/test/BaseTestable.java7
-rw-r--r--src/cz/crcs/ectester/common/test/CompoundTest.java4
-rw-r--r--src/cz/crcs/ectester/common/test/Test.java6
-rw-r--r--src/cz/crcs/ectester/common/test/Testable.java6
4 files changed, 22 insertions, 1 deletions
diff --git a/src/cz/crcs/ectester/common/test/BaseTestable.java b/src/cz/crcs/ectester/common/test/BaseTestable.java
index f376299..a4b9a00 100644
--- a/src/cz/crcs/ectester/common/test/BaseTestable.java
+++ b/src/cz/crcs/ectester/common/test/BaseTestable.java
@@ -22,4 +22,11 @@ public abstract class BaseTestable implements Testable {
public boolean error() {
return error;
}
+
+ @Override
+ public void reset() {
+ hasRun = false;
+ ok = false;
+ error = false;
+ }
}
diff --git a/src/cz/crcs/ectester/common/test/CompoundTest.java b/src/cz/crcs/ectester/common/test/CompoundTest.java
index 3b0b542..10ecf9c 100644
--- a/src/cz/crcs/ectester/common/test/CompoundTest.java
+++ b/src/cz/crcs/ectester/common/test/CompoundTest.java
@@ -1,5 +1,7 @@
package cz.crcs.ectester.common.test;
+import java.util.Arrays;
+import java.util.Objects;
import java.util.function.Function;
/**
@@ -14,7 +16,7 @@ public class CompoundTest extends Test {
private CompoundTest(Function<Test[], Result> callback, Test... tests) {
this.callback = callback;
- this.tests = tests;
+ this.tests = Arrays.stream(tests).filter(Objects::nonNull).toArray(Test[]::new);
}
private CompoundTest(Function<Test[], Result> callback, String descripiton, Test... tests) {
diff --git a/src/cz/crcs/ectester/common/test/Test.java b/src/cz/crcs/ectester/common/test/Test.java
index 4f5bb6e..3d0baf6 100644
--- a/src/cz/crcs/ectester/common/test/Test.java
+++ b/src/cz/crcs/ectester/common/test/Test.java
@@ -52,6 +52,12 @@ public abstract class Test implements Testable {
return hasRun;
}
+ @Override
+ public void reset() {
+ hasRun = false;
+ result = null;
+ }
+
public abstract String getDescription();
@Override
diff --git a/src/cz/crcs/ectester/common/test/Testable.java b/src/cz/crcs/ectester/common/test/Testable.java
index 5b84a45..33c9485 100644
--- a/src/cz/crcs/ectester/common/test/Testable.java
+++ b/src/cz/crcs/ectester/common/test/Testable.java
@@ -13,12 +13,18 @@ public interface Testable {
* @return Whether an error happened.
*/
boolean error();
+
/**
* @return Whether this runnable was run.
*/
boolean hasRun();
/**
+ *
+ */
+ void reset();
+
+ /**
* Run this Runnable.
*
* @throws TestException If an unexpected exception/error is encountered.