From c0d5b15f4f6f167e73b0c1c8b431b77438bd1fd7 Mon Sep 17 00:00:00 2001 From: Kyle Aure Date: Thu, 23 May 2024 10:54:01 -0500 Subject: [PATCH] Swap full > platform --- .../src/main/asciidoc/sections/01preface.adoc | 6 +++--- .../src/main/asciidoc/sections/05inventory.adoc | 2 +- .../src/main/asciidoc/sections/07.1se-mode.adoc | 2 +- .../src/main/asciidoc/sections/07.2ee-mode.adoc | 2 +- .../src/main/asciidoc/sections/09running.adoc | 2 +- .../tck/data/metadata/CollectMetaData.java | 16 ++++++++-------- tck-dist/src/main/starter/ee-pom.xml | 2 +- .../extensions/TCKArchiveProcessor.java | 8 ++++---- .../tck/data/framework/junit/anno/Core.java | 2 +- .../junit/anno/{Full.java => Platform.java} | 6 +++--- .../data/framework/junit/anno/Standalone.java | 4 ++-- .../tck/data/framework/junit/anno/Web.java | 2 +- .../junit/extensions/StandaloneExtension.java | 2 +- 13 files changed, 28 insertions(+), 28 deletions(-) rename tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/{Full.java => Platform.java} (92%) diff --git a/tck-dist/src/main/asciidoc/sections/01preface.adoc b/tck-dist/src/main/asciidoc/sections/01preface.adoc index 347584629..4ab5881ef 100644 --- a/tck-dist/src/main/asciidoc/sections/01preface.adoc +++ b/tck-dist/src/main/asciidoc/sections/01preface.adoc @@ -34,9 +34,9 @@ When running in EE mode the {APILongName} TCK acts as a `Test Client` that will The Platform Server will act as a `Test Server` and run tests based on incoming requests from the `Test Client`. Assertions will occur both on the client and server sides. -=== Terminology - "Core Profile" vs "Web Profile" vs "Full Profile" +=== Terminology - "Core Profile" vs "Web Profile" vs "Platform" -The Jakarta EE platform defines sets of specifications that create the core, web, and full profiles. +The Jakarta EE working group defines sets of specifications that create the core profile, web profile, and platform. // TODO update this if Jakarta Data ends up being in something other than core profile The {APILongName} TCK can run against each of these profiles since {APILongName} is a Core Profile specification. @@ -44,7 +44,7 @@ References: * Core profile: https://jakarta.ee/specifications/coreprofile/ * Web profile: https://jakarta.ee/specifications/webprofile/ -* Full profile: https://jakarta.ee/specifications/platform/ +* Platform: https://jakarta.ee/specifications/platform/ === Before You Read This Guide diff --git a/tck-dist/src/main/asciidoc/sections/05inventory.adoc b/tck-dist/src/main/asciidoc/sections/05inventory.adoc index 159ad74ce..057437735 100644 --- a/tck-dist/src/main/asciidoc/sections/05inventory.adoc +++ b/tck-dist/src/main/asciidoc/sections/05inventory.adoc @@ -41,7 +41,7 @@ The {APILongName} TCK is a test library that includes four types of packages: - `ee.jakarta.tck.data.standalone.\*` these are basic API tests, or SPI tests that can run in SE Mode or EE mode. - `ee.jakarta.tck.data.core.\*` these are more complex integration tests that must run against at least Core Profile. - `ee.jakarta.tck.data.web.\*` these are more complex integration tests that must run against at least Web Profile. -- `ee.jakarta.tck.data.full.\*` these are more complex integration tests that must run against at least Full Profile. +- `ee.jakarta.tck.data.platform.\*` these are more complex integration tests that must run against at least Platform. - `ee.jakarta.tck.data.framework.\*` these are utility packages that help support the development and execution of the TCK. Tests that exist at a lower level will run on any level above, for example, all core profile tests will run against web profile. diff --git a/tck-dist/src/main/asciidoc/sections/07.1se-mode.adoc b/tck-dist/src/main/asciidoc/sections/07.1se-mode.adoc index 3ce20a71a..8d47b8d27 100644 --- a/tck-dist/src/main/asciidoc/sections/07.1se-mode.adoc +++ b/tck-dist/src/main/asciidoc/sections/07.1se-mode.adoc @@ -32,7 +32,7 @@ include::{starterLoc}/se-pom.xml[tags=configJunit5;!logging;!signature;!entity] All test classes that support running in standalone mode are annotated with the `@Standalone` annotation. When running in standalone mode, include the group `standalone`. -This will ensure that none of the core/web/full profile tests are run. +This will ensure that none of the core/web/platform profile tests are run. When running in standalone mode, include the system property `true`. This will ensure that no Arquillian deployments are created and that all tests are run on the client JVM. diff --git a/tck-dist/src/main/asciidoc/sections/07.2ee-mode.adoc b/tck-dist/src/main/asciidoc/sections/07.2ee-mode.adoc index 37122ff3a..219b56eba 100644 --- a/tck-dist/src/main/asciidoc/sections/07.2ee-mode.adoc +++ b/tck-dist/src/main/asciidoc/sections/07.2ee-mode.adoc @@ -34,7 +34,7 @@ include::{starterLoc}/ee-pom.xml[tags=configJunit5;!arquillian;!logging;!entity] ==== Profile Mode -All test classes that require running on a Jakarta profile are annotated with the `@Core`, `@Web`, or `@Full` annotation. +All test classes that require running on a Jakarta profile are annotated with the `@Core`, `@Web`, or `@Platform` annotation. When running against a Jakarta profile, include the group that matches your supported profile. For example: `core`. diff --git a/tck-dist/src/main/asciidoc/sections/09running.adoc b/tck-dist/src/main/asciidoc/sections/09running.adoc index 31f0921d0..9312306e3 100644 --- a/tck-dist/src/main/asciidoc/sections/09running.adoc +++ b/tck-dist/src/main/asciidoc/sections/09running.adoc @@ -10,6 +10,6 @@ $ mvn clean test === Expected Output -Here is example output when successfully running (full profile + persistence entity) the starter project: +Here is example output when successfully running (platform + persistence entity) the starter project: include::generated/expected-output.adoc[] diff --git a/tck-dist/src/main/java/ee/jakarta/tck/data/metadata/CollectMetaData.java b/tck-dist/src/main/java/ee/jakarta/tck/data/metadata/CollectMetaData.java index f19bd7f07..c471ea757 100644 --- a/tck-dist/src/main/java/ee/jakarta/tck/data/metadata/CollectMetaData.java +++ b/tck-dist/src/main/java/ee/jakarta/tck/data/metadata/CollectMetaData.java @@ -300,11 +300,11 @@ private static void writeTestCounts(List testMetaData, File output String output = """ |=== - |entity type |standalone |core |web |full |skipped + |entity type |standalone |core |web |platform |skipped - |persistence |%d |%d |%d |%d |%d + |persistence |%d |%d |%d |%d |%d - |nosql |%d |%d |%d |%d |%d + |nosql |%d |%d |%d |%d |%d |===""".formatted(getTestCounts(testMetaData)); try (BufferedWriter writer = new BufferedWriter(new FileWriter(outputLocation))) { @@ -318,7 +318,7 @@ private static Object[] getTestCounts(List testMetaData) { List standalone = runnableTestMetaData.stream().filter(TestMetaData::isStandalone).collect(Collectors.toList()); List core = runnableTestMetaData.stream().filter(TestMetaData::isCore).collect(Collectors.toList()); List web = runnableTestMetaData.stream().filter(TestMetaData::isWeb).collect(Collectors.toList()); - List full = runnableTestMetaData.stream().filter(TestMetaData::isFull).collect(Collectors.toList()); + List platform = runnableTestMetaData.stream().filter(TestMetaData::isPlatform).collect(Collectors.toList()); List results = new ArrayList<>(); @@ -326,14 +326,14 @@ private static Object[] getTestCounts(List testMetaData) { results.add(standalone.stream().filter(TestMetaData::isPersistence).count()); results.add(core.stream().filter(TestMetaData::isPersistence).count()); results.add(web.stream().filter(TestMetaData::isPersistence).count()); - results.add(full.stream().filter(TestMetaData::isPersistence).count()); + results.add(platform.stream().filter(TestMetaData::isPersistence).count()); results.add(testMetaData.stream().filter(Predicate.not(TestMetaData::isRunnable)).filter(TestMetaData::isPersistence).count()); //NoSQL results.add(standalone.stream().filter(TestMetaData::isNoSQL).count()); results.add(core.stream().filter(TestMetaData::isNoSQL).count()); results.add(web.stream().filter(TestMetaData::isNoSQL).count()); - results.add(full.stream().filter(TestMetaData::isNoSQL).count()); + results.add(platform.stream().filter(TestMetaData::isNoSQL).count()); results.add(testMetaData.stream().filter(Predicate.not(TestMetaData::isRunnable)).filter(TestMetaData::isNoSQL).count()); return results.toArray(); @@ -503,8 +503,8 @@ boolean isWeb() { return tags.contains("web"); } - boolean isFull() { - return tags.contains("full"); + boolean isPlatform() { + return tags.contains("platform"); } boolean isPersistence() { diff --git a/tck-dist/src/main/starter/ee-pom.xml b/tck-dist/src/main/starter/ee-pom.xml index 3432fa228..d6d00f376 100644 --- a/tck-dist/src/main/starter/ee-pom.xml +++ b/tck-dist/src/main/starter/ee-pom.xml @@ -177,7 +177,7 @@ [TODO] diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java b/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java index 47e56e7f3..6a7d3306e 100644 --- a/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java +++ b/tck/src/main/java/ee/jakarta/tck/data/framework/arquillian/extensions/TCKArchiveProcessor.java @@ -27,7 +27,7 @@ import org.jboss.shrinkwrap.api.container.ResourceContainer; import org.jboss.shrinkwrap.resolver.api.maven.Maven; -import ee.jakarta.tck.data.framework.junit.anno.Full; +import ee.jakarta.tck.data.framework.junit.anno.Platform; import ee.jakarta.tck.data.framework.junit.anno.Signature; import ee.jakarta.tck.data.framework.junit.anno.Web; import ee.jakarta.tck.data.framework.junit.anno.ReadOnlyTest; @@ -42,7 +42,7 @@ * *

The read-only tests require the ee.jakarta.tck.data.framework.read.only package in the container.

* - *

The web/full profile tests require the ee.jakarta.tck.data.framework.servlet package in the container.

+ *

The web/platform profile tests require the ee.jakarta.tck.data.framework.servlet package in the container.

* *

The signature tests require the ee.jakarta.tck.data.framework.signature package in the container.

*/ @@ -67,8 +67,8 @@ public void process(Archive applicationArchive, TestClass testClass) { ((ClassContainer) applicationArchive).addPackage(readOnlyPackage); } - // Add servlet packages to web/full profile tests - if(testClass.isAnnotationPresent(Web.class) || testClass.isAnnotationPresent(Full.class)) { + // Add servlet packages to web/platform profile tests + if(testClass.isAnnotationPresent(Web.class) || testClass.isAnnotationPresent(Platform.class)) { log.info("Application Archive [" + applicationName + "] is being appended with packages [" + servletPackage +"]"); ((ClassContainer) applicationArchive).addPackage(servletPackage); } diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Core.java b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Core.java index ee871c1bb..98c123d7e 100644 --- a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Core.java +++ b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Core.java @@ -38,7 +38,7 @@ @Retention(RetentionPolicy.RUNTIME) @Tag("core") @Tag("web") -@Tag("full") +@Tag("platform") @ExtendWith({ ArquillianExtension.class, AssertionExtension.class }) public @interface Core { } diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Full.java b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Platform.java similarity index 92% rename from tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Full.java rename to tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Platform.java index 4e577d3df..e339bf61f 100644 --- a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Full.java +++ b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Platform.java @@ -27,7 +27,7 @@ import ee.jakarta.tck.data.framework.junit.extensions.AssertionExtension; /** - *

These are test classes that REQUIRE full profile to be executed. For these + *

These are test classes that REQUIRE platform profile to be executed. For these * tests to run they must deploy an application to a Jakarta EE server using the * Arquillian {@code @Deployment} annotation.

* @@ -36,7 +36,7 @@ */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) -@Tag("full") +@Tag("platform") @ExtendWith({ ArquillianExtension.class, AssertionExtension.class }) -public @interface Full { +public @interface Platform { } diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Standalone.java b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Standalone.java index 63c056e5b..7472d496b 100644 --- a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Standalone.java +++ b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Standalone.java @@ -30,7 +30,7 @@ /** *

These are test classes that DO NOT depend on any Jakarta EE profile technologies.

* - *

However, when running the TCK against a core/web/full profile container these + *

However, when running the TCK against a core/web/platform profile container these * tests will be deployed and run on the container.

* *

The dynamic method in which we achieve the ability to run these tests either @@ -45,7 +45,7 @@ @Tag("standalone") @Tag("core") @Tag("web") -@Tag("full") +@Tag("platform") @ExtendWith({ StandaloneExtension.class, AssertionExtension.class }) public @interface Standalone { } diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Web.java b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Web.java index 60137c8e9..53554a3c1 100644 --- a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Web.java +++ b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/anno/Web.java @@ -37,7 +37,7 @@ @Target(ElementType.TYPE) @Retention(RetentionPolicy.RUNTIME) @Tag("web") -@Tag("full") +@Tag("platform") @ExtendWith({ ArquillianExtension.class, AssertionExtension.class }) public @interface Web { } diff --git a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/extensions/StandaloneExtension.java b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/extensions/StandaloneExtension.java index 60854a19c..1dcb37873 100644 --- a/tck/src/main/java/ee/jakarta/tck/data/framework/junit/extensions/StandaloneExtension.java +++ b/tck/src/main/java/ee/jakarta/tck/data/framework/junit/extensions/StandaloneExtension.java @@ -34,7 +34,7 @@ *

This is a Junit5 extension class that extends ArquillianExtension

* *

This extension will passthrough to the ArquillianExtension class when running - * against a Jakarta EE core/web/full profiles, but will skip Arquillian + * against a Jakarta EE core/web/platform profiles, but will skip Arquillian * processing when running against a standalone implementation.

* * @see org.jboss.arquillian.junit5.ArquillianExtension