Skip to content

Commit 8093cd9

Browse files
thegridmanthegridman
committed
Move Vector gRPC tests to Java 21 specific test modules
(merge main -> ce/main 108359) [git-p4: depot-paths = "//dev/coherence-ce/main/": change = 108360]
1 parent 049491e commit 8093cd9

File tree

12 files changed

+314
-23
lines changed

12 files changed

+314
-23
lines changed

‎prj/coherence-grpc-proxy-helidon/pom.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<properties>
2323
<module.name>com.oracle.coherence.grpc.proxy.helidon</module.name>
2424

25+
<java.version>21</java.version>
26+
<java.version.release>21</java.version.release>
2527
<!-- this module should be published -->
2628
<maven.deploy.skip>false</maven.deploy.skip>
2729
</properties>

‎prj/test/functional/grpc-proxy-helidon/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
2626
<test.server.classpath>${project.build.directory}/server</test.server.classpath>
2727
<is.not.java.21>false</is.not.java.21>
28+
29+
<java.version>21</java.version>
30+
<java.version.release>21</java.version.release>
2831
</properties>
2932

3033
<dependencies>
@@ -39,10 +42,15 @@
3942
<version>${project.version}</version>
4043
</dependency>
4144
<dependency>
42-
<groupId>com.oracle.coherence.ce.tests</groupId>
45+
<groupId>${coherence.group.id}.tests</groupId>
4346
<artifactId>grpc-proxy-tck</artifactId>
4447
<version>${project.version}</version>
4548
</dependency>
49+
<dependency>
50+
<groupId>${coherence.group.id}.tests</groupId>
51+
<artifactId>grpc-proxy-tck-java21</artifactId>
52+
<version>${project.version}</version>
53+
</dependency>
4654

4755
<dependency>
4856
<groupId>org.junit.jupiter</groupId>
@@ -63,6 +71,7 @@
6371
<configuration>
6472
<dependenciesToScan>
6573
<dependency>com.oracle.coherence.tests:grpc-proxy-tck</dependency>
74+
<dependency>com.oracle.coherence.tests:grpc-proxy-tck-java21</dependency>
6675
</dependenciesToScan>
6776
<systemPropertyVariables>
6877
<test.server.classpath>${test.server.classpath},${project.build.directory}</test.server.classpath>

‎prj/test/functional/grpc-proxy-helidon/src/main/java/helidon/grpc/proxy/TestVectorStoreServiceProviderImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
package helidon.grpc.proxy;
99

1010
import com.oracle.coherence.ai.grpc.SyncVectorStoreService;
11-
1211
import com.oracle.coherence.ai.grpc.VectorStoreService;
1312

14-
import grpc.proxy.TestVectorStoreServiceProvider;
13+
import grpc.proxy.java21.TestVectorStoreServiceProvider;
14+
1515

1616
public class TestVectorStoreServiceProviderImpl
1717
implements TestVectorStoreServiceProvider

‎prj/test/functional/grpc-proxy-helidon/src/main/resources/META-INF/services/grpc.proxy.TestVectorStoreServiceProvider renamed to ‎prj/test/functional/grpc-proxy-helidon/src/main/resources/META-INF/services/grpc.proxy.java21.TestVectorStoreServiceProvider

File renamed without changes.

‎prj/test/functional/grpc-proxy-netty-21/pom.xml

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2000, 2024, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
7+
-->
8+
<project xmlns="http://maven.apache.org/POM/4.0.0"
9+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
11+
<modelVersion>4.0.0</modelVersion>
12+
13+
<parent>
14+
<groupId>com.oracle.coherence.tests</groupId>
15+
<artifactId>coherence-functional-tests</artifactId>
16+
<version>${revision}</version>
17+
<relativePath>../pom.xml</relativePath>
18+
</parent>
19+
20+
<artifactId>grpc-proxy-netty-java21</artifactId>
21+
<name>Coherence gRPC Proxy Java 21+ Tests (Netty)</name>
22+
23+
<properties>
24+
<module.name>netty.grpc.proxy.java21.testing</module.name>
25+
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
26+
<test.server.classpath>${project.build.directory}/server</test.server.classpath>
27+
<is.not.java.21>false</is.not.java.21>
28+
29+
<java.version>21</java.version>
30+
<java.version.release>21</java.version.release>
31+
</properties>
32+
33+
<dependencies>
34+
<dependency>
35+
<groupId>${coherence.group.id}</groupId>
36+
<artifactId>coherence</artifactId>
37+
<version>${project.version}</version>
38+
</dependency>
39+
<dependency>
40+
<groupId>${coherence.group.id}</groupId>
41+
<artifactId>coherence-grpc-proxy</artifactId>
42+
<version>${project.version}</version>
43+
</dependency>
44+
45+
<dependency>
46+
<groupId>${coherence.group.id}.tests</groupId>
47+
<artifactId>grpc-proxy-netty</artifactId>
48+
<version>${project.version}</version>
49+
</dependency>
50+
<dependency>
51+
<groupId>${coherence.group.id}.tests</groupId>
52+
<artifactId>grpc-proxy-tck-java21</artifactId>
53+
<version>${project.version}</version>
54+
</dependency>
55+
56+
<dependency>
57+
<groupId>org.junit.jupiter</groupId>
58+
<artifactId>junit-jupiter-api</artifactId>
59+
</dependency>
60+
</dependencies>
61+
62+
<build>
63+
<plugins>
64+
<plugin>
65+
<groupId>com.oracle.coherence.moditect</groupId>
66+
<artifactId>moditect-maven-plugin</artifactId>
67+
</plugin>
68+
69+
<plugin>
70+
<groupId>org.apache.maven.plugins</groupId>
71+
<artifactId>maven-failsafe-plugin</artifactId>
72+
<configuration>
73+
<dependenciesToScan>
74+
<dependency>com.oracle.coherence.tests:grpc-proxy-tck-java21</dependency>
75+
</dependenciesToScan>
76+
<systemPropertyVariables>
77+
<test.server.classpath>${test.server.classpath},${project.build.directory}</test.server.classpath>
78+
</systemPropertyVariables>
79+
</configuration>
80+
</plugin>
81+
82+
<plugin>
83+
<groupId>org.apache.maven.plugins</groupId>
84+
<artifactId>maven-dependency-plugin</artifactId>
85+
<executions>
86+
<execution>
87+
<id>get-dependencies</id>
88+
<goals>
89+
<goal>copy-dependencies</goal>
90+
</goals>
91+
<phase>prepare-package</phase>
92+
<configuration>
93+
<outputDirectory>${test.server.classpath}</outputDirectory>
94+
<excludeScope>provided</excludeScope>
95+
</configuration>
96+
</execution>
97+
</executions>
98+
</plugin>
99+
</plugins>
100+
</build>
101+
102+
<profiles>
103+
<profile>
104+
<id>stage8</id>
105+
<properties>
106+
<skipTests>${is.not.java.21}</skipTests>
107+
</properties>
108+
</profile>
109+
110+
<profile>
111+
<id>NotJava21</id>
112+
<activation>
113+
<jdk>(,20]</jdk>
114+
</activation>
115+
<properties>
116+
<is.not.java.21>true</is.not.java.21>
117+
<skipTests>true</skipTests>
118+
</properties>
119+
</profile>
120+
</profiles>
121+
</project>

‎prj/test/functional/grpc-proxy-netty/src/main/java/netty/grpc/proxy/TestVectorStoreServiceProviderImpl.java renamed to ‎prj/test/functional/grpc-proxy-netty-21/src/main/java/netty/grpc/proxy/java21/TestVectorStoreServiceProviderImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55
* https://oss.oracle.com/licenses/upl.
66
*/
77

8-
package netty.grpc.proxy;
8+
package netty.grpc.proxy.java21;
99

1010

1111
import com.oracle.coherence.ai.grpc.AsyncVectorStoreService;
1212
import com.oracle.coherence.ai.grpc.VectorStoreService;
1313

14-
import grpc.proxy.TestVectorStoreServiceProvider;
14+
import grpc.proxy.java21.TestVectorStoreServiceProvider;
1515

1616
public class TestVectorStoreServiceProviderImpl
1717
implements TestVectorStoreServiceProvider

‎prj/test/functional/grpc-proxy-netty/src/main/resources/META-INF/services/grpc.proxy.TestVectorStoreServiceProvider renamed to ‎prj/test/functional/grpc-proxy-netty-21/src/main/resources/META-INF/services/grpc.proxy.java21.TestVectorStoreServiceProvider

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# https://oss.oracle.com/licenses/upl.
66
#
77

8-
netty.grpc.proxy.TestVectorStoreServiceProviderImpl
8+
netty.grpc.proxy.java21.TestVectorStoreServiceProviderImpl

‎prj/test/functional/grpc-proxy-tck-21/pom.xml

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright (c) 2000, 2024, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
7+
-->
8+
<project xmlns="http://maven.apache.org/POM/4.0.0"
9+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
11+
<modelVersion>4.0.0</modelVersion>
12+
13+
<parent>
14+
<groupId>com.oracle.coherence.tests</groupId>
15+
<artifactId>coherence-functional-tests</artifactId>
16+
<version>${revision}</version>
17+
<relativePath>../pom.xml</relativePath>
18+
</parent>
19+
20+
<artifactId>grpc-proxy-tck-java21</artifactId>
21+
<name>Coherence gRPC Proxy Java 21+ Tests (TCK)</name>
22+
23+
<properties>
24+
<module.name>grpc.proxy.java21.testing</module.name>
25+
<testClassesDirectory>${project.build.outputDirectory}</testClassesDirectory>
26+
<test.server.classpath>${project.build.directory}/server</test.server.classpath>
27+
28+
<java.version>21</java.version>
29+
<java.version.release>21</java.version.release>
30+
</properties>
31+
32+
<dependencies>
33+
<dependency>
34+
<groupId>${coherence.group.id}</groupId>
35+
<artifactId>coherence-grpc-proxy</artifactId>
36+
<version>${project.version}</version>
37+
<scope>provided</scope>
38+
<optional>true</optional>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>${coherence.group.id}</groupId>
43+
<artifactId>coherence-ai</artifactId>
44+
<version>${project.version}</version>
45+
</dependency>
46+
47+
<dependency>
48+
<groupId>${coherence.group.id}.tests</groupId>
49+
<artifactId>grpc-proxy-tck</artifactId>
50+
<version>${project.version}</version>
51+
</dependency>
52+
53+
<dependency>
54+
<groupId>${coherence.group.id}</groupId>
55+
<artifactId>coherence-json</artifactId>
56+
<version>${project.version}</version>
57+
</dependency>
58+
59+
<dependency>
60+
<groupId>${coherence.group.id}</groupId>
61+
<artifactId>coherence-testing-support</artifactId>
62+
<version>${project.version}</version>
63+
<exclusions>
64+
<exclusion>
65+
<groupId>junit</groupId>
66+
<artifactId>junit</artifactId>
67+
</exclusion>
68+
</exclusions>
69+
</dependency>
70+
71+
<dependency>
72+
<groupId>org.junit.jupiter</groupId>
73+
<artifactId>junit-jupiter-api</artifactId>
74+
</dependency>
75+
<dependency>
76+
<groupId>org.junit.jupiter</groupId>
77+
<artifactId>junit-jupiter-params</artifactId>
78+
</dependency>
79+
80+
<dependency>
81+
<groupId>io.reactivex.rxjava3</groupId>
82+
<artifactId>rxjava</artifactId>
83+
</dependency>
84+
<dependency>
85+
<groupId>jakarta.json.bind</groupId>
86+
<artifactId>jakarta.json.bind-api</artifactId>
87+
</dependency>
88+
</dependencies>
89+
90+
<build>
91+
<plugins>
92+
<plugin>
93+
<groupId>com.oracle.coherence.moditect</groupId>
94+
<artifactId>moditect-maven-plugin</artifactId>
95+
</plugin>
96+
97+
<plugin>
98+
<groupId>org.apache.maven.plugins</groupId>
99+
<artifactId>maven-surefire-plugin</artifactId>
100+
<configuration>
101+
<!--
102+
Tests are run by other modules
103+
grpc-proxy-helidon
104+
grpc-proxy-netty
105+
-->
106+
<skip>true</skip>
107+
<systemProperties>
108+
<test.server.classpath>${test.server.classpath}</test.server.classpath>
109+
</systemProperties>
110+
</configuration>
111+
</plugin>
112+
113+
<plugin>
114+
<groupId>org.apache.maven.plugins</groupId>
115+
<artifactId>maven-failsafe-plugin</artifactId>
116+
<configuration>
117+
<!--
118+
Tests are run by other modules
119+
grpc-proxy-helidon
120+
grpc-proxy-netty
121+
-->
122+
<skip>true</skip>
123+
<systemProperties>
124+
<test.server.classpath>${test.server.classpath}</test.server.classpath>
125+
</systemProperties>
126+
</configuration>
127+
</plugin>
128+
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-dependency-plugin</artifactId>
132+
<executions>
133+
<execution>
134+
<id>get-dependencies</id>
135+
<goals>
136+
<goal>copy-dependencies</goal>
137+
</goals>
138+
<phase>prepare-package</phase>
139+
<configuration>
140+
<outputDirectory>${test.server.classpath}</outputDirectory>
141+
</configuration>
142+
</execution>
143+
</executions>
144+
</plugin>
145+
</plugins>
146+
</build>
147+
</project>

‎prj/test/functional/grpc-proxy-tck/src/main/java/grpc/proxy/TestVectorStoreServiceProvider.java renamed to ‎prj/test/functional/grpc-proxy-tck-21/src/main/java/grpc/proxy/java21/TestVectorStoreServiceProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* https://oss.oracle.com/licenses/upl.
66
*/
77

8-
package grpc.proxy;
8+
package grpc.proxy.java21;
99

1010
import com.oracle.coherence.ai.grpc.VectorStoreService;
1111

0 commit comments

Comments
 (0)