From 056b90fa04829afbe9ac82c7c5c87f4cb7456b05 Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Tue, 4 Jun 2024 08:53:02 -0500 Subject: [PATCH 1/3] More fixes for TCK --- jnosql-data-tck-runner/logging.properties | 4 +-- jnosql-data-tck-runner/pom.xml | 18 +++++----- .../MyApplicationArchiveProcessor.java | 34 ------------------ .../extension/MyLoadableExtension.java | 27 -------------- ...boss.arquillian.core.spi.LoadableExtension | 1 - .../org/eclipse/jnosql/tck/MyEntityTests.java | 36 +++++++++++++++++++ .../jnosql/tck/MyNoSQLEntityTests.java | 36 +++++++++++++++++++ .../src/test/resources/arquillian.xml | 31 ---------------- 8 files changed, 82 insertions(+), 105 deletions(-) delete mode 100644 jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyApplicationArchiveProcessor.java delete mode 100644 jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyLoadableExtension.java delete mode 100644 jnosql-data-tck-runner/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension create mode 100644 jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyEntityTests.java create mode 100644 jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyNoSQLEntityTests.java delete mode 100644 jnosql-data-tck-runner/src/test/resources/arquillian.xml diff --git a/jnosql-data-tck-runner/logging.properties b/jnosql-data-tck-runner/logging.properties index 4b473527..14c8ba20 100644 --- a/jnosql-data-tck-runner/logging.properties +++ b/jnosql-data-tck-runner/logging.properties @@ -8,8 +8,8 @@ handlers=java.util.logging.FileHandler,java.util.logging.ConsoleHandler ee.jakarta.tck.data.level=ALL # Arquillian and JNoSQL - By default log everything, might reduce after development is complete. -org.jbossl=ALL -org.eclipse.jnosql=all +org.jboss.level=ALL +org.eclipse.jnosql.level=ALL #Formatting for the simple formatter java.util.logging.SimpleFormatter.class.log=true diff --git a/jnosql-data-tck-runner/pom.xml b/jnosql-data-tck-runner/pom.xml index 78fda9b9..6b345575 100644 --- a/jnosql-data-tck-runner/pom.xml +++ b/jnosql-data-tck-runner/pom.xml @@ -57,10 +57,12 @@ 5.10.2 1.2.6 2.3 + 4.0.3.Final ${project.basedir}/logging.properties + jdk @@ -109,13 +111,12 @@ sigtest-maven-plugin ${sigtest.version} - - - org.jboss.weld.se - weld-se-core - 5.1.0.Final - test - + + + org.jboss.weld + weld-junit5 + ${weld.junit5.version} + org.jboss.shrinkwrap @@ -160,7 +161,6 @@ false true - jakarta.data:jakarta.data-tck true @@ -176,8 +176,6 @@ ${included.groups} standalone - - ${basedir}${file.separarator}src${file.separarator}main${file.separarator}java${file.separarator} diff --git a/jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyApplicationArchiveProcessor.java b/jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyApplicationArchiveProcessor.java deleted file mode 100644 index ee1cd5e1..00000000 --- a/jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyApplicationArchiveProcessor.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (c) 2022 Contributors to the Eclipse Foundation - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. - * - * You may elect to redistribute this code under either of these licenses. - * - * Contributors: - * - * Maximillian Arruda - */ -package ee.jakarta.tck.data.example.extension; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.test.spi.TestClass; -import org.jboss.shrinkwrap.api.Archive; - -//tag::applicationProcessor[] -public class MyApplicationArchiveProcessor implements ApplicationArchiveProcessor { - - //List of test classes that deploy application that you need to customize -// List testClasses; - - @Override - public void process(Archive archive, TestClass testClass) { -// if(testClasses.contains(testClass.getClass().getCanonicalName())){ -// ((WebArchive) archive).addAsWebInfResource("my-custom-sun-web.xml", "sun-web.xml"); -// } - } -} -//end::applicationProcessor[] diff --git a/jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyLoadableExtension.java b/jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyLoadableExtension.java deleted file mode 100644 index 914c0210..00000000 --- a/jnosql-data-tck-runner/src/main/java/ee/jakarta/tck/data/example/extension/MyLoadableExtension.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2022 Contributors to the Eclipse Foundation - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * and Apache License v2.0 which accompanies this distribution. - * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html - * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. - * - * You may elect to redistribute this code under either of these licenses. - * - * Contributors: - * - * Maximillian Arruda - */ -package ee.jakarta.tck.data.example.extension; - -import org.jboss.arquillian.container.test.spi.client.deployment.ApplicationArchiveProcessor; -import org.jboss.arquillian.core.spi.LoadableExtension; - -//tag::loadableExtension[] -public class MyLoadableExtension implements LoadableExtension { - @Override - public void register(ExtensionBuilder extensionBuilder) { - extensionBuilder.service(ApplicationArchiveProcessor.class, MyApplicationArchiveProcessor.class); - } -} -//end::loadableExtension[] diff --git a/jnosql-data-tck-runner/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension b/jnosql-data-tck-runner/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension deleted file mode 100644 index 94f4ca5c..00000000 --- a/jnosql-data-tck-runner/src/main/resources/META-INF/services/org.jboss.arquillian.core.spi.LoadableExtension +++ /dev/null @@ -1 +0,0 @@ -ee.jakarta.tck.data.example.extension.MyLoadableExtension \ No newline at end of file diff --git a/jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyEntityTests.java b/jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyEntityTests.java new file mode 100644 index 00000000..e1e13efd --- /dev/null +++ b/jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyEntityTests.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024 Contributors to the Eclipse Foundation + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Apache License v2.0 which accompanies this distribution. + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. + * + * You may elect to redistribute this code under either of these licenses. + * + * Contributors: + * + * Kyle Aure + */ +package org.eclipse.jnosql.tck; + +import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; +import org.eclipse.jnosql.mapping.core.Converters; +import org.eclipse.jnosql.mapping.document.DocumentTemplate; +import org.eclipse.jnosql.mapping.document.DocumentTemplateProducer; +import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; +import org.eclipse.jnosql.mapping.reflection.Reflections; +import org.eclipse.jnosql.mapping.semistructured.EntityConverter; +import org.jboss.weld.junit5.auto.AddExtensions; +import org.jboss.weld.junit5.auto.AddPackages; +import org.jboss.weld.junit5.auto.EnableAutoWeld; + +import ee.jakarta.tck.data.standalone.entity.EntityTests; + +@EnableAutoWeld +@AddPackages(value = {Converters.class, EntityConverter.class, DocumentTemplate.class}) +@AddPackages(DocumentTemplateProducer.class) +@AddPackages(Reflections.class) +@AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) +public class MyEntityTests extends EntityTests { +} diff --git a/jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyNoSQLEntityTests.java b/jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyNoSQLEntityTests.java new file mode 100644 index 00000000..4bd92663 --- /dev/null +++ b/jnosql-data-tck-runner/src/test/java/org/eclipse/jnosql/tck/MyNoSQLEntityTests.java @@ -0,0 +1,36 @@ +/* + * Copyright (c) 2024 Contributors to the Eclipse Foundation + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License v1.0 + * and Apache License v2.0 which accompanies this distribution. + * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html + * and the Apache License v2.0 is available at http://www.opensource.org/licenses/apache2.0.php. + * + * You may elect to redistribute this code under either of these licenses. + * + * Contributors: + * + * Kyle Aure + */ +package org.eclipse.jnosql.tck; + +import org.eclipse.jnosql.mapping.core.spi.EntityMetadataExtension; +import org.eclipse.jnosql.mapping.core.Converters; +import org.eclipse.jnosql.mapping.document.DocumentTemplate; +import org.eclipse.jnosql.mapping.document.DocumentTemplateProducer; +import org.eclipse.jnosql.mapping.document.spi.DocumentExtension; +import org.eclipse.jnosql.mapping.reflection.Reflections; +import org.eclipse.jnosql.mapping.semistructured.EntityConverter; +import org.jboss.weld.junit5.auto.AddExtensions; +import org.jboss.weld.junit5.auto.AddPackages; +import org.jboss.weld.junit5.auto.EnableAutoWeld; + +import ee.jakarta.tck.data.standalone.nosql.example.NoSQLEntityTests; + +@EnableAutoWeld +@AddPackages(value = {Converters.class, EntityConverter.class, DocumentTemplate.class}) +@AddPackages(DocumentTemplateProducer.class) +@AddPackages(Reflections.class) +@AddExtensions({EntityMetadataExtension.class, DocumentExtension.class}) +public class MyNoSQLEntityTests extends NoSQLEntityTests { +} diff --git a/jnosql-data-tck-runner/src/test/resources/arquillian.xml b/jnosql-data-tck-runner/src/test/resources/arquillian.xml deleted file mode 100644 index deef47f8..00000000 --- a/jnosql-data-tck-runner/src/test/resources/arquillian.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - target/ - - - - true - SE - - - \ No newline at end of file From d9033d70d0a82c718e0de1988a81d1004677828f Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Tue, 4 Jun 2024 09:14:19 -0500 Subject: [PATCH 2/3] Fix target directory --- jnosql-data-tck-runner/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jnosql-data-tck-runner/pom.xml b/jnosql-data-tck-runner/pom.xml index 6b345575..431339a8 100644 --- a/jnosql-data-tck-runner/pom.xml +++ b/jnosql-data-tck-runner/pom.xml @@ -142,7 +142,7 @@ - data-tck-runner/target + ${targetDirectory} maven-dependency-plugin From 0e5bbb4cb4c88d13af1291dfeb2ab7cb537c51bd Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Tue, 4 Jun 2024 09:42:49 -0500 Subject: [PATCH 3/3] Update runner --- .github/workflows/tck-runner.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tck-runner.yml b/.github/workflows/tck-runner.yml index 232f2bfc..888f7bc9 100644 --- a/.github/workflows/tck-runner.yml +++ b/.github/workflows/tck-runner.yml @@ -4,6 +4,13 @@ on: schedule: - cron: '0 0 * * 1,3,5' #Monday, Wednesday, Friday at Midnight +#TODO update to run on pull request/merge +#on: +# push: +# branches: [ main ] +# pull_request: +# branches: [ main ] + jobs: build: runs-on: ubuntu-latest @@ -18,4 +25,5 @@ jobs: java-version: ${{ matrix.java-version }} cache: maven - name: Running Jakarta Data TCK tests - run: mvn test --file jnosql-data-tck-runner/pom.xml -Djakarta.tck.profile=standalone -Djnosql.document.database=jnosql -Djnosql.mongodb.host=localhost:27017 + # TODO start and stop mongo container + run: mvn test --file jnosql-data-tck-runner/pom.xml -Djnosql.document.database=mongodb -Djnosql.mongodb.host=localhost:27017