[tomee] branch master updated: Fix BVal test failures

[jlmonteiro]

This is an automated email from the ASF dual-hosted git repository.

jlmonteiro pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomee.git


The following commit(s) were added to refs/heads/master by this push:
     new 37c31c81d3 Fix BVal test failures
37c31c81d3 is described below

commit 37c31c81d3cb6dec8f2b34ac69065f1df061b249
Author: Jean-Louis Monteiro <jlmonte...@tomitribe.com>
AuthorDate: Wed Jul 6 14:31:06 2022 +0200

    Fix BVal test failures
---
 tck/bval-embedded/src/test/resources/dev.xml                   | 10 +++++-----
 .../org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java     |  6 ++----
 tck/bval-tomee/src/test/resources/arquillian.xml               |  3 +++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tck/bval-embedded/src/test/resources/dev.xml 
b/tck/bval-embedded/src/test/resources/dev.xml
index 406b887cdc..3ddcfbbd80 100644
--- a/tck/bval-embedded/src/test/resources/dev.xml
+++ b/tck/bval-embedded/src/test/resources/dev.xml
@@ -17,9 +17,9 @@
   -->
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; >
 <suite name="BVAL-TCK" verbose="1">
-    <test name="BVAL-TCK">
-      <classes>
-        <class 
name="org.hibernate.beanvalidation.tck.tests.bootstrap.customprovider.BootstrapNonAvailableValidationProviderTest"
 />
-      </classes>
-    </test>
+  <test name="BVal-TCK">
+    <classes>
+      <class 
name="org.hibernate.beanvalidation.tck.tests.valueextraction.builtin.JavaFXValueExtractorsTest"
 />
+    </classes>
+  </test>
 </suite>
diff --git 
a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
 
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
index b5a805c64a..f632b0a3a2 100644
--- 
a/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
+++ 
b/tck/bval-tomee/src/test/java/org/apache/tomee/bval/tck/BValTCKArchiveProcessor.java
@@ -18,20 +18,18 @@
 
 package org.apache.tomee.bval.tck;
 
-import com.sun.javafx.PlatformUtil;
 import 
org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor;
 import org.jboss.arquillian.test.spi.TestClass;
 import org.jboss.shrinkwrap.api.Archive;
-import org.jboss.shrinkwrap.api.spec.WebArchive;
-
-import static org.apache.openejb.loader.JarLocation.jarLocation;
 
 public class BValTCKArchiveProcessor implements ApplicationArchiveProcessor {
     @Override
     public void process(final Archive<?> archive, final TestClass testClass) {
+        /*
         if (archive instanceof WebArchive) {
             
WebArchive.class.cast(archive).addAsLibrary(jarLocation(PlatformUtil.class));
         }
+        */
         System.out.println(archive.toString(true));
     }
 }
diff --git a/tck/bval-tomee/src/test/resources/arquillian.xml 
b/tck/bval-tomee/src/test/resources/arquillian.xml
index 34a6216a69..5b9a8fbae0 100644
--- a/tck/bval-tomee/src/test/resources/arquillian.xml
+++ b/tck/bval-tomee/src/test/resources/arquillian.xml
@@ -35,6 +35,9 @@
       <property name="properties">
         validation.provider = org.apache.bval.jsr.ApacheValidationProvider
       </property>
+      <property name="additionalLibs">
+        mvn:org.openjfx:javafx-base:11:jar:mac
+      </property>
     </configuration>
   </container>
 </arquillian>