This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch jpa3.2
in repository https://gitbox.apache.org/repos/asf/tomee.git
commit da480e2e6c52e5ff21895a6c045b03ce0f11ccb2
Author: Richard Zowalla <r...@apache.org>
AuthorDate: Thu Jul 17 17:13:01 2025 +0200
Refine tests
---
.../{jpa32-tomee => jpa32-tomee-plume}/pom.xml | 4 ++--
.../src/test/java/org/example/h7/EclipseLinkTest.java | 0
.../src/test/java/org/example/h7/Hibernate6Test.java | 0
.../src/test/java/org/example/h7/Hibernate7Test.java | 0
.../src/test/resources/arquillian.xml | 2 +-
.../src/test/resources/hibernate6-pom.xml | 0
.../src/test/resources/hibernate7-pom.xml | 0
.../{jpa32-tomee => jpa32-tomee-web}/pom.xml | 4 ++--
.../src/test/java/org/example/h7/Hibernate6Test.java | 0
.../src/test/java/org/example/h7/Hibernate7Test.java | 0
.../src/test/java/org/example/h7/OpenJPATest.java | 4 +---
.../src/test/resources/arquillian.xml | 1 -
.../src/test/resources/hibernate6-pom.xml | 0
.../src/test/resources/hibernate7-pom.xml | 0
arquillian/functional-tests/pom.xml | 18 ++++--------------
15 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/arquillian/functional-tests/jpa32-tomee/pom.xml
b/arquillian/functional-tests/jpa32-tomee-plume/pom.xml
similarity index 96%
copy from arquillian/functional-tests/jpa32-tomee/pom.xml
copy to arquillian/functional-tests/jpa32-tomee-plume/pom.xml
index 4f73268cef..a9e7a2dcde 100644
--- a/arquillian/functional-tests/jpa32-tomee/pom.xml
+++ b/arquillian/functional-tests/jpa32-tomee-plume/pom.xml
@@ -26,8 +26,8 @@
<version>10.1.1-jpa32-SNAPSHOT</version>
</parent>
- <artifactId>jpa32-tomee</artifactId>
- <name>TomEE :: Arquillian :: Functional Tests :: JPA 3.2</name>
+ <artifactId>jpa32-tomee-plume</artifactId>
+ <name>TomEE :: Arquillian :: Functional Tests :: JPA 3.2 :: Plume</name>
<properties>
<version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/EclipseLinkTest.java
b/arquillian/functional-tests/jpa32-tomee-plume/src/test/java/org/example/h7/EclipseLinkTest.java
similarity index 100%
rename from
arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/EclipseLinkTest.java
rename to
arquillian/functional-tests/jpa32-tomee-plume/src/test/java/org/example/h7/EclipseLinkTest.java
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate6Test.java
b/arquillian/functional-tests/jpa32-tomee-plume/src/test/java/org/example/h7/Hibernate6Test.java
similarity index 100%
copy from
arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate6Test.java
copy to
arquillian/functional-tests/jpa32-tomee-plume/src/test/java/org/example/h7/Hibernate6Test.java
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate7Test.java
b/arquillian/functional-tests/jpa32-tomee-plume/src/test/java/org/example/h7/Hibernate7Test.java
similarity index 100%
copy from
arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate7Test.java
copy to
arquillian/functional-tests/jpa32-tomee-plume/src/test/java/org/example/h7/Hibernate7Test.java
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/resources/arquillian.xml
b/arquillian/functional-tests/jpa32-tomee-plume/src/test/resources/arquillian.xml
similarity index 100%
copy from
arquillian/functional-tests/jpa32-tomee/src/test/resources/arquillian.xml
copy to
arquillian/functional-tests/jpa32-tomee-plume/src/test/resources/arquillian.xml
index 966cb8dcc5..effc826630 100644
--- a/arquillian/functional-tests/jpa32-tomee/src/test/resources/arquillian.xml
+++
b/arquillian/functional-tests/jpa32-tomee-plume/src/test/resources/arquillian.xml
@@ -26,8 +26,8 @@
<property name="stopPort">-1</property>
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
- <property name="simpleLog">true</property>
<property name="classifier">plume</property>
+ <property name="simpleLog">true</property>
</configuration>
</container>
</arquillian>
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate6-pom.xml
b/arquillian/functional-tests/jpa32-tomee-plume/src/test/resources/hibernate6-pom.xml
similarity index 100%
copy from
arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate6-pom.xml
copy to
arquillian/functional-tests/jpa32-tomee-plume/src/test/resources/hibernate6-pom.xml
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate7-pom.xml
b/arquillian/functional-tests/jpa32-tomee-plume/src/test/resources/hibernate7-pom.xml
similarity index 100%
copy from
arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate7-pom.xml
copy to
arquillian/functional-tests/jpa32-tomee-plume/src/test/resources/hibernate7-pom.xml
diff --git a/arquillian/functional-tests/jpa32-tomee/pom.xml
b/arquillian/functional-tests/jpa32-tomee-web/pom.xml
similarity index 96%
rename from arquillian/functional-tests/jpa32-tomee/pom.xml
rename to arquillian/functional-tests/jpa32-tomee-web/pom.xml
index 4f73268cef..e5cb0a9be2 100644
--- a/arquillian/functional-tests/jpa32-tomee/pom.xml
+++ b/arquillian/functional-tests/jpa32-tomee-web/pom.xml
@@ -26,8 +26,8 @@
<version>10.1.1-jpa32-SNAPSHOT</version>
</parent>
- <artifactId>jpa32-tomee</artifactId>
- <name>TomEE :: Arquillian :: Functional Tests :: JPA 3.2</name>
+ <artifactId>jpa32-tomee-web</artifactId>
+ <name>TomEE :: Arquillian :: Functional Tests :: JPA 3.2 :: Web
Profile</name>
<properties>
<version.shrinkwrap.resolver>3.3.4</version.shrinkwrap.resolver>
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate6Test.java
b/arquillian/functional-tests/jpa32-tomee-web/src/test/java/org/example/h7/Hibernate6Test.java
similarity index 100%
rename from
arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate6Test.java
rename to
arquillian/functional-tests/jpa32-tomee-web/src/test/java/org/example/h7/Hibernate6Test.java
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate7Test.java
b/arquillian/functional-tests/jpa32-tomee-web/src/test/java/org/example/h7/Hibernate7Test.java
similarity index 100%
rename from
arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/Hibernate7Test.java
rename to
arquillian/functional-tests/jpa32-tomee-web/src/test/java/org/example/h7/Hibernate7Test.java
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/OpenJPATest.java
b/arquillian/functional-tests/jpa32-tomee-web/src/test/java/org/example/h7/OpenJPATest.java
similarity index 93%
rename from
arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/OpenJPATest.java
rename to
arquillian/functional-tests/jpa32-tomee-web/src/test/java/org/example/h7/OpenJPATest.java
index e5a9cae341..8d042f5cbe 100644
---
a/arquillian/functional-tests/jpa32-tomee/src/test/java/org/example/h7/OpenJPATest.java
+++
b/arquillian/functional-tests/jpa32-tomee-web/src/test/java/org/example/h7/OpenJPATest.java
@@ -52,8 +52,7 @@ public class OpenJPATest {
" xmlns=\"https://jakarta.ee/xml/ns/persistence\";
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; +
"
xsi:schemaLocation=\"https://jakarta.ee/xml/ns/persistence"; +
"
https://jakarta.ee/xml/ns/persistence/persistence_3_1.xsd\";>\n" +
- " <persistence-unit name=\"openjpa\">\n" +
- "
<provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>\n" +
+ " <persistence-unit name=\"test\">\n" +
"
<exclude-unlisted-classes>true</exclude-unlisted-classes>\n" +
" <properties>\n" +
" <property
name=\"openejb.jpa.init-entitymanager\" value=\"true\" />\n" +
@@ -77,7 +76,6 @@ public class OpenJPATest {
final EntityManagerFactory emf = (EntityManagerFactory)
SystemInstance.get().getComponent(ContainerSystem.class)
.getJNDIContext().lookup(Assembler.PERSISTENCE_UNIT_NAMING_CONTEXT +
info.persistenceUnits.iterator().next().id);
- System.out.println(((ReloadableEntityManagerFactory)
emf).getDelegate().getClass().getName());
assertTrue(((ReloadableEntityManagerFactory)
emf).getDelegate().getClass().getName().startsWith("org.apache."));
}
}
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/resources/arquillian.xml
b/arquillian/functional-tests/jpa32-tomee-web/src/test/resources/arquillian.xml
similarity index 96%
rename from
arquillian/functional-tests/jpa32-tomee/src/test/resources/arquillian.xml
rename to
arquillian/functional-tests/jpa32-tomee-web/src/test/resources/arquillian.xml
index 966cb8dcc5..9ecfccfb2c 100644
--- a/arquillian/functional-tests/jpa32-tomee/src/test/resources/arquillian.xml
+++
b/arquillian/functional-tests/jpa32-tomee-web/src/test/resources/arquillian.xml
@@ -27,7 +27,6 @@
<property name="dir">target/apache-tomee-remote</property>
<property
name="appWorkingDir">target/arquillian-test-working-dir</property>
<property name="simpleLog">true</property>
- <property name="classifier">plume</property>
</configuration>
</container>
</arquillian>
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate6-pom.xml
b/arquillian/functional-tests/jpa32-tomee-web/src/test/resources/hibernate6-pom.xml
similarity index 100%
rename from
arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate6-pom.xml
rename to
arquillian/functional-tests/jpa32-tomee-web/src/test/resources/hibernate6-pom.xml
diff --git
a/arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate7-pom.xml
b/arquillian/functional-tests/jpa32-tomee-web/src/test/resources/hibernate7-pom.xml
similarity index 100%
rename from
arquillian/functional-tests/jpa32-tomee/src/test/resources/hibernate7-pom.xml
rename to
arquillian/functional-tests/jpa32-tomee-web/src/test/resources/hibernate7-pom.xml
diff --git a/arquillian/functional-tests/pom.xml
b/arquillian/functional-tests/pom.xml
index d6bc3f666d..3b90e9c666 100644
--- a/arquillian/functional-tests/pom.xml
+++ b/arquillian/functional-tests/pom.xml
@@ -30,20 +30,10 @@
<packaging>pom</packaging>
<name>TomEE :: Arquillian :: Functional Tests</name>
- <modules >
- <module>jpa32-tomee</module>
+ <modules>
+ <module>jpa32-tomee-plume</module>
+ <module>jpa32-tomee-web</module>
+ <module>spring-cxf-tomee-4332</module>
</modules>
- <profiles>
- <profile>
- <id>skip-tests-on-old-jdk</id>
- <!-- Profile activation based on JDK version -->
- <activation>
- <jdk>[17,)</jdk> <!-- Activates for JDK versions less than 17
-->
- </activation>
- <modules>
- <module>spring-cxf-tomee-4332</module>
- </modules>
- </profile>
- </profiles>
</project>
