Skip to content

Commit 7fee6e2

Browse files
verhasverhas
committed
TestEngine is moved to a separate module so that javageci-jamal can be used without the test engine
1 parent 492f40f commit 7fee6e2

File tree

19 files changed

+154
-22
lines changed

19 files changed

+154
-22
lines changed

‎diagrams.graffle

239 KB
Binary file not shown.

‎javageci-jamal-test/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@
3434
<version>1.6.3-SNAPSHOT</version>
3535
<scope>test</scope>
3636
</dependency>
37+
<dependency>
38+
<groupId>com.javax0.geci</groupId>
39+
<artifactId>javageci-testengine</artifactId>
40+
<version>1.6.3-SNAPSHOT</version>
41+
<scope>test</scope>
42+
</dependency>
3743
<dependency>
3844
<groupId>org.junit.jupiter</groupId>
3945
<artifactId>junit-jupiter-api</artifactId>

‎javageci-jamal-test/pom.xml.jam

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
{dependencies#
1212
{dependency :{GROUPID}:javageci-jamal:{VERSION}:test}
13+
{dependency :{GROUPID}:javageci-testengine:{VERSION}:test}
1314
{@for MODULE in (api,engine)=
1415
{dependency :org.junit.jupiter:junit-jupiter-MODULE::test}}
1516
{@for MODULE in (testsupport)={dependency :com.javax0.jamal:jamal-MODULE:{JAMAL_VERSION}:}}

‎javageci-jamal-test/src/test/java/module-info.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
open module geci.jamal.test {
22
requires geci.jamal;
3+
requires geci.testengine;
34
requires jamal.testsupport;
45
exports javax0.geci.jamal_test;
56
exports javax0.geci.jamal_test.unittestproxy;

‎javageci-jamal/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,17 @@
106106
<version>1.7.7</version>
107107
<scope>compile</scope>
108108
</dependency>
109+
<dependency>
110+
<groupId>com.javax0.jamal</groupId>
111+
<artifactId>jamal-api</artifactId>
112+
<version>1.7.7</version>
113+
<scope>compile</scope>
114+
</dependency>
115+
<dependency>
116+
<groupId>com.javax0.jamal</groupId>
117+
<artifactId>jamal-tools</artifactId>
118+
<version>1.7.7</version>
119+
<scope>compile</scope>
120+
</dependency>
109121
</dependencies>
110122
</project>

‎javageci-jamal/pom.xml.jam

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
{dependency :{GROUPID}:javageci-MODULE::}}
1414
{@for MODULE in (api,engine)=
1515
{dependency :org.junit.jupiter:junit-jupiter-MODULE::compile}}
16-
{@for MODULE in (engine,snippet,io,plantuml,ruby,groovy,scriptbasic,yaml)={dependency :com.javax0.jamal:jamal-MODULE:{JAMAL_VERSION}:compile}}
16+
{@for MODULE in (engine,snippet,io,plantuml,ruby,groovy,scriptbasic,yaml,api,tools)={dependency :com.javax0.jamal:jamal-MODULE:{JAMAL_VERSION}:compile}}
1717
}
1818
{end project}

‎javageci-jamal/src/main/java/module-info.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import javax0.geci.jamal.junit5.Engine;
21
import javax0.geci.jamal.macros.Cap;
32
import javax0.geci.jamal.macros.Contains;
43
import javax0.geci.jamal.macros.Equals;
@@ -24,9 +23,7 @@
2423
requires transitive org.junit.jupiter.api;
2524
requires transitive org.junit.platform.engine;
2625
exports javax0.geci.jamal;
27-
exports javax0.geci.jamal.junit5;
2826
exports javax0.geci.jamal.util to geci.jamal.test;
29-
provides org.junit.platform.engine.TestEngine with Engine;
3027
provides javax0.jamal.api.Macro with
3128
Methods,
3229
Fields,

‎javageci-jamal/src/test/java/javax0/geci/jamal/Test.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
package javax0.geci.jamal;
2+
3+
public class Test {
4+
}

‎javageci-testengine/README.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
= Java::Geci Junit5 TestEngine
2+
3+
== Introduction

‎javageci-testengine/README.adoc.jam

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
= Java::Geci Junit5 TestEngine
2+
3+
== Introduction
4+

‎javageci-testengine/pom.xml

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
3+
<modelVersion>4.0.0</modelVersion>
4+
<name>javageci testengine</name>
5+
<packaging>jar</packaging>
6+
<artifactId>javageci-testengine</artifactId>
7+
<version>1.6.3-SNAPSHOT</version>
8+
<parent>
9+
<groupId>com.javax0.geci</groupId>
10+
<artifactId>javageci-parent</artifactId>
11+
<version>1.6.3-SNAPSHOT</version>
12+
</parent>
13+
<description>Javageci Junit 5 Test Engine</description>
14+
<build>
15+
<plugins>
16+
<plugin>
17+
<groupId>org.apache.maven.plugins</groupId>
18+
<artifactId>maven-surefire-plugin</artifactId>
19+
</plugin>
20+
<plugin>
21+
<groupId>org.apache.maven.plugins</groupId>
22+
<artifactId>maven-source-plugin</artifactId>
23+
</plugin>
24+
<plugin>
25+
<groupId>org.apache.maven.plugins</groupId>
26+
<artifactId>maven-javadoc-plugin</artifactId>
27+
</plugin>
28+
</plugins>
29+
</build>
30+
<dependencies>
31+
<dependency>
32+
<groupId>com.javax0.geci</groupId>
33+
<artifactId>javageci-jamal</artifactId>
34+
</dependency>
35+
<dependency>
36+
<groupId>com.javax0.jamal</groupId>
37+
<artifactId>jamal-tools</artifactId>
38+
<version>1.7.7</version>
39+
<scope>compile</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.javax0.jamal</groupId>
43+
<artifactId>jamal-api</artifactId>
44+
<version>1.7.7</version>
45+
<scope>compile</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.javax0.jamal</groupId>
49+
<artifactId>jamal-engine</artifactId>
50+
<version>1.7.7</version>
51+
<scope>compile</scope>
52+
</dependency>
53+
<dependency>
54+
<groupId>org.junit.jupiter</groupId>
55+
<artifactId>junit-jupiter-api</artifactId>
56+
<scope>compile</scope>
57+
</dependency>
58+
<dependency>
59+
<groupId>org.junit.jupiter</groupId>
60+
<artifactId>junit-jupiter-engine</artifactId>
61+
<scope>compile</scope>
62+
</dependency>
63+
</dependencies>
64+
</project>

‎javageci-testengine/pom.xml.jam

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{@import https://raw.githubusercontent.com/central7/pom/main/pom.jim}
2+
{@import ../version.jim}
3+
{project javageci testengine}
4+
{packaging jar}
5+
{GAV ::javageci-testengine:{VERSION}}
6+
{parent :{GROUPID}:javageci-parent}
7+
{description|Javageci Junit 5 Test Engine}
8+
9+
{@include ../plugins.jim}
10+
11+
{dependencies#
12+
{@for MODULE in (jamal)=
13+
{dependency :{GROUPID}:javageci-MODULE::}}
14+
{@for MODULE in (tools,api,engine)=
15+
{dependency :com.javax0.jamal:jamal-MODULE:{JAMAL_VERSION}:compile}}
16+
{@for MODULE in (api,engine)=
17+
{dependency :org.junit.jupiter:junit-jupiter-MODULE::compile}}
18+
}
19+
{end project}

‎javageci-jamal/src/main/java/javax0/geci/jamal/junit5/Engine.java renamed to ‎javageci-testengine/src/main/java/javax0/geci/jamal/junit5/Engine.java

File renamed without changes.

‎javageci-jamal/src/main/java/javax0/geci/jamal/junit5/GeciJamalTestDescriptor.java renamed to ‎javageci-testengine/src/main/java/javax0/geci/jamal/junit5/GeciJamalTestDescriptor.java

File renamed without changes.

‎javageci-jamal/src/main/java/javax0/geci/jamal/junit5/GeciTestSource.java renamed to ‎javageci-testengine/src/main/java/javax0/geci/jamal/junit5/GeciTestSource.java

File renamed without changes.

‎javageci-testengine/src/main/java/module-info.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import javax0.geci.jamal.junit5.Engine;
2+
3+
module geci.testengine {
4+
requires geci.jamal;
5+
requires geci.tools;
6+
requires geci.api;
7+
requires org.junit.jupiter.engine;
8+
requires org.junit.jupiter.api;
9+
requires org.junit.platform.engine;
10+
exports javax0.geci.jamal.junit5;
11+
provides org.junit.platform.engine.TestEngine with Engine;
12+
}

‎javageci-jamal/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine renamed to ‎javageci-testengine/src/main/resources/META-INF/services/org.junit.platform.engine.TestEngine

File renamed without changes.

‎pom.xml

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<module>javageci-jamal</module>
1818
<module>javageci-jamal-test</module>
1919
<module>javageci-core-annotations</module>
20+
<module>javageci-testengine</module>
2021
</modules>
2122
<licenses>
2223
<license>
@@ -98,24 +99,12 @@
9899
--add-opens geci.examples/javax0.geci.tests.record=ALL-UNNAMED
99100
--add-opens geci.examples/javax0.geci.tests.accessor=ALL-UNNAMED
100101
--add-opens geci.examples/javax0.geci.tests.equals=ALL-UNNAMED
101-
--add-opens geci.examples/javax0.geci.test.tools.lexeger=ALL-UNNAMED
102+
--add-opens geci.examples/javax0.geci.jamal.test.tools.lexeger=ALL-UNNAMED
102103
--add-exports geci.examples/javax0.geci.tests.fluent=geci.tools
103104
--add-exports geci.examples/javax0.geci.tutorials.simple=geci.core
104105
--add-exports geci.examples/javax0.geci.tests.fluent=geci.core
105106
--add-exports geci.examples/javax0.geci.buildfluent=geci.core
106107
--add-exports geci.examples/javax0.geci.geci.jamal.reflection=ALL-UNNAMED
107-
--add-opens geci.jamal/javax0.geci.jamal=ALL-UNNAMED --add-exports
108-
geci.jamal/javax0.geci.jamal=ALL-UNNAMED
109-
--add-opens geci.jamal/javax0.geci.jamal.util=ALL-UNNAMED --add-exports
110-
geci.jamal/javax0.geci.jamal.util=ALL-UNNAMED
111-
--add-opens geci.jamal/javax0.geci.jamal.sample=ALL-UNNAMED --add-exports
112-
geci.jamal/javax0.geci.jamal.sample=ALL-UNNAMED
113-
--add-opens geci.jamal/javax0.geci.jamal=org.junit.platform.commons --add-exports
114-
geci.jamal/javax0.geci.jamal=org.junit.platform.commons
115-
--add-opens geci.jamal/javax0.geci.jamal.util=org.junit.platform.commons --add-exports
116-
geci.jamal/javax0.geci.jamal.util=org.junit.platform.commons
117-
--add-opens geci.jamal/javax0.geci.jamal.sample=org.junit.platform.commons --add-exports
118-
geci.jamal/javax0.geci.jamal.sample=org.junit.platform.commons
119108
--add-exports org.junit.platform.commons/org.junit.platform.commons.util=ALL-UNNAMED
120109
--add-exports org.junit.platform.commons/org.junit.platform.commons.logging=ALL-UNNAMED
121110
</argLine>
@@ -217,6 +206,16 @@
217206
<artifactId>javageci-core-annotations</artifactId>
218207
<version>1.6.3-SNAPSHOT</version>
219208
</dependency>
209+
<dependency>
210+
<groupId>com.javax0.geci</groupId>
211+
<artifactId>javageci-jamal</artifactId>
212+
<version>1.6.3-SNAPSHOT</version>
213+
</dependency>
214+
<dependency>
215+
<groupId>com.javax0.geci</groupId>
216+
<artifactId>javageci-testengine</artifactId>
217+
<version>1.6.3-SNAPSHOT</version>
218+
</dependency>
220219
<dependency>
221220
<groupId>org.junit.jupiter</groupId>
222221
<artifactId>junit-jupiter-api</artifactId>
@@ -283,6 +282,18 @@
283282
<version>1.7.7</version>
284283
<scope>test</scope>
285284
</dependency>
285+
<dependency>
286+
<groupId>com.javax0.jamal</groupId>
287+
<artifactId>jamal-tools</artifactId>
288+
<version>1.7.7</version>
289+
<scope>test</scope>
290+
</dependency>
291+
<dependency>
292+
<groupId>com.javax0.jamal</groupId>
293+
<artifactId>jamal-api</artifactId>
294+
<version>1.7.7</version>
295+
<scope>test</scope>
296+
</dependency>
286297
<dependency>
287298
<groupId>org.assertj</groupId>
288299
<artifactId>assertj-core</artifactId>

‎pom.xml.jam

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
{packaging pom}
99
{GAV :{GROUPID}:javageci-parent:{VERSION}}
1010
{description/Java GEnerate Code Inline source code generation framework}
11-
{modules|javageci-engine,javageci-api,javageci-tools,javageci-core,javageci-annotation,javageci-examples,javageci-jamal,javageci-jamal-test,javageci-core-annotations}
11+
{modules|javageci-engine,javageci-api,javageci-tools,javageci-core,javageci-annotation,javageci-examples,javageci-jamal,javageci-jamal-test,javageci-core-annotations,javageci-testengine}
1212
{license|The Apache License, Version 2.0|http://www.apache.org/licenses/LICENSE-2.0.txt}
1313
{developer|Peter Verhas|[email protected]}
1414
{github|verhas|javageci}
@@ -45,8 +45,6 @@
4545
{opens/examples/$P}}
4646
{@for $P in (tests.fluent/geci.tools,tutorials.simple/geci.core,tests.fluent/geci.core,buildfluent/geci.core,geci.jamal.reflection)=
4747
{exports/examples/$P}}
48-
{@for $P in (jamal,jamal.util,jamal.sample,jamal/org.junit.platform.commons,jamal.util/org.junit.platform.commons,jamal.sample/org.junit.platform.commons)=
49-
{opexs/jamal/$P}}
5048
{@for $P in (util,logging)=
5149
--add-exports org.junit.platform.commons/org.junit.platform.commons.$P=ALL-UNNAMED}
5250
}
@@ -95,9 +93,9 @@
9593
}
9694
{dependencyManagement|
9795
{dependencies|
98-
{@for MODULE in (api,core,tools,engine,annotation,core-annotations)={dependency :{GROUPID}:javageci-MODULE:{VERSION}:}}
96+
{@for MODULE in (api,core,tools,engine,annotation,core-annotations,jamal,testengine)={dependency :{GROUPID}:javageci-MODULE:{VERSION}:}}
9997
{@for MODULE in (api,engine)={dependency :org.junit.jupiter:junit-jupiter-MODULE:{JUPITER_VERSION}:test}}
100-
{@for MODULE in (engine,testsupport,snippet,io,plantuml,ruby,groovy,scriptbasic,yaml)={dependency :com.javax0.jamal:jamal-MODULE:{JAMAL_VERSION}:test}}
98+
{@for MODULE in (engine,testsupport,snippet,io,plantuml,ruby,groovy,scriptbasic,yaml,tools,api)={dependency :com.javax0.jamal:jamal-MODULE:{JAMAL_VERSION}:test}}
10199
{dependency :org.assertj:assertj-core:{ASSERTJ_VERSION}:test}
102100
}
103101
}

0 commit comments

Comments
 (0)