diff --git a/pom.xml b/pom.xml index 0e3abd5528949edaa10b335a422c23f75c419844..9b9b7f33db9dd2d4c7d51e391ca9acecc3670d36 100644 --- a/pom.xml +++ b/pom.xml @@ -72,12 +72,6 @@ <version>5.8.2</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.junit.platform</groupId> - <artifactId>junit-platform-suite-api</artifactId> - <version>1.8.2</version> - <scope>test</scope> - </dependency> <dependency> <groupId>org.hamcrest</groupId> <artifactId>hamcrest</artifactId> @@ -88,13 +82,33 @@ <build> <plugins> <plugin> + <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> <version>2.22.2</version> </plugin> + <plugin> + <groupId>org.jacoco</groupId> + <artifactId>jacoco-maven-plugin</artifactId> + <version>0.8.7</version> + <executions> + <execution> + <goals> + <goal>prepare-agent</goal> + </goals> + </execution> + <execution> + <id>report</id> + <phase>test</phase> + <goals> + <goal>report</goal> + </goals> + </execution> + </executions> + </plugin> </plugins> </build> - <profiles> + <!-- <profiles> <profile> <id>coverage</id> <build> @@ -126,5 +140,5 @@ </plugins> </build> </profile> - </profiles> + </profiles> --> </project> \ No newline at end of file diff --git a/src/test/java/beamline/tests/AlgorithmTests.java b/src/test/java/beamline/tests/AlgorithmTest.java similarity index 94% rename from src/test/java/beamline/tests/AlgorithmTests.java rename to src/test/java/beamline/tests/AlgorithmTest.java index 3d0a9f18121f35258aaee603046016aa33112475..074fa4080bfc2e27e1abcf4c4bff4741751ec28d 100644 --- a/src/test/java/beamline/tests/AlgorithmTests.java +++ b/src/test/java/beamline/tests/AlgorithmTest.java @@ -1,5 +1,4 @@ package beamline.tests; - import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.hasItems; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,12 +11,12 @@ import org.junit.jupiter.api.Test; import beamline.models.algorithms.StreamMiningAlgorithm; import io.reactivex.rxjava3.core.Observable; -class AlgorithmTests { +public class AlgorithmTest { Observable<Integer> o = Observable.just(3, 7, 11, 13); @Test - void test_result() { + public void test_result() { StreamMiningAlgorithm<Integer, Integer> m = new StreamMiningAlgorithm<Integer, Integer>() { public Integer product = 1; @@ -35,7 +34,7 @@ class AlgorithmTests { } @Test - void test_hooks() { + public void test_hooks() { StreamMiningAlgorithm<Integer, Integer> m = new StreamMiningAlgorithm<Integer, Integer>() { public Integer product = 1; diff --git a/src/test/java/beamline/tests/FiltersTests.java b/src/test/java/beamline/tests/FiltersTest.java similarity index 90% rename from src/test/java/beamline/tests/FiltersTests.java rename to src/test/java/beamline/tests/FiltersTest.java index 766b304fb80f57635438a042bc4e7b886f4d61b8..b9af34353db193a8161503e5be757608b15525b8 100644 --- a/src/test/java/beamline/tests/FiltersTests.java +++ b/src/test/java/beamline/tests/FiltersTest.java @@ -19,10 +19,10 @@ import beamline.filters.RetainOnCaseAttributeEqualityFilter; import beamline.utils.EventUtils; import io.reactivex.rxjava3.core.Observable; -class FiltersTests { +public class FiltersTest { @Test - void test_exclude_activities_on_name_filter() { + public void test_exclude_activities_on_name_filter() { List<String> results = new ArrayList<String>(); generateObservableSameCaseId() .filter(new ExcludeActivitiesFilter("A")) @@ -32,7 +32,7 @@ class FiltersTests { } @Test - void test_retain_activities_on_name_filter() { + public void test_retain_activities_on_name_filter() { List<String> results = new ArrayList<String>(); generateObservableSameCaseId() .filter(new RetainActivitiesFilter("A","B")) @@ -42,7 +42,7 @@ class FiltersTests { } @Test - void test_retain_activities_on_case_attribute_filter_1() { + public void test_retain_activities_on_case_attribute_filter_1() { List<String> results = new ArrayList<String>(); generateObservableSameCaseId() .filter(new RetainOnCaseAttributeEqualityFilter<XAttributeLiteralImpl>( @@ -54,7 +54,7 @@ class FiltersTests { } @Test - void test_retain_activities_on_case_attribute_filter_2() { + public void test_retain_activities_on_case_attribute_filter_2() { List<String> results = new ArrayList<String>(); generateObservableSameCaseId() .filter(new RetainOnCaseAttributeEqualityFilter<XAttributeLiteralImpl>( @@ -67,7 +67,7 @@ class FiltersTests { } @Test - void test_exclude_activities_on_case_attribute_filter_1() { + public void test_exclude_activities_on_case_attribute_filter_1() { List<String> results = new ArrayList<String>(); generateObservableSameCaseId() .filter(new ExcludeOnCaseAttributeEqualityFilter<XAttributeLiteralImpl>( @@ -79,7 +79,7 @@ class FiltersTests { } @Test - void test_exclude_activities_on_case_attribute_filter_2() { + public void test_exclude_activities_on_case_attribute_filter_2() { List<String> results = new ArrayList<String>(); generateObservableSameCaseId() .filter(new ExcludeOnCaseAttributeEqualityFilter<XAttributeLiteralImpl>( diff --git a/src/test/java/beamline/tests/UtilsTests.java b/src/test/java/beamline/tests/UtilsTest.java similarity index 92% rename from src/test/java/beamline/tests/UtilsTests.java rename to src/test/java/beamline/tests/UtilsTest.java index 290083baf970866e4a14f86593d4f84597da4065..a7fe3dce39daea414861a78254176d4f3dedfa62 100644 --- a/src/test/java/beamline/tests/UtilsTests.java +++ b/src/test/java/beamline/tests/UtilsTest.java @@ -20,10 +20,10 @@ import org.junit.jupiter.api.Test; import beamline.exceptions.EventException; import beamline.utils.EventUtils; -class UtilsTests { +public class UtilsTest { @Test - void test_create_event() { + public void test_create_event() { String activityName = UUID.randomUUID().toString(); String caseId = UUID.randomUUID().toString(); XTrace t = null; @@ -37,7 +37,7 @@ class UtilsTests { } @Test - void test_create_event_time() { + public void test_create_event_time() { String activityName = UUID.randomUUID().toString(); String caseId = UUID.randomUUID().toString(); Date date = Date.valueOf("1996-01-23"); @@ -53,7 +53,7 @@ class UtilsTests { } @Test - void test_create_event_attributes() { + public void test_create_event_attributes() { String activityName = UUID.randomUUID().toString(); String caseId = UUID.randomUUID().toString(); Date date = Date.valueOf("1996-01-23"); @@ -82,7 +82,7 @@ class UtilsTests { } @Test - void test_no_activityname() { + public void test_no_activityname() { assertThrows(EventException.class, () -> { EventUtils.create(null, ""); }); @@ -92,7 +92,7 @@ class UtilsTests { } @Test - void test_extract_name_case() throws EventException { + public void test_extract_name_case() throws EventException { String activityName = UUID.randomUUID().toString(); String caseId = UUID.randomUUID().toString(); XTrace t = EventUtils.create(activityName, caseId);