Skip to content

Commit

Permalink
Merge pull request wildfly#17148 from bstansberry/WFLY-18332
Browse files Browse the repository at this point in the history 
[WFLY-18332] Update LayersTestBase and LayersTestCase(s)
  • Loading branch information
@bstansberry
bstansberry authored Nov 8, 2023
2 parents d14c480 + c022d39 commit a3a43c0
Show file tree
Hide file tree
Showing 6 changed files with 300 additions and 261 deletions.
2 changes: 1 addition & 1 deletion jpa/subsystem/src/main/java/org/jboss/as/jpa/subsystem/JPADefinition.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void registerAttributes(ManagementResourceRegistration registration) {
public void registerAdditionalRuntimePackages(final ManagementResourceRegistration resourceRegistration) {
resourceRegistration.registerAdditionalRuntimePackages(
// Only if annotation is in use.
RuntimePackageDependency.optional("org.hibernate.search.orm"),
RuntimePackageDependency.optional("org.hibernate.search.mapper.orm"),
RuntimePackageDependency.required("org.hibernate"),
// An alias to org.hibernate module.
RuntimePackageDependency.optional("org.hibernate.envers"));
Expand Down
25 changes: 22 additions & 3 deletions testsuite/layers-expansion/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -649,6 +649,7 @@
<layer>ejb-lite</layer>
<layer>ejb-local-cache</layer>
<layer>elytron</layer>
<layer>elytron-oidc-client</layer>
<layer>embedded-activemq</layer>
<layer>hibernate-search</layer>
<layer>h2-datasource</layer>
Expand All @@ -672,6 +673,7 @@
<layer>mail</layer>
<layer>management</layer>
<layer>messaging-activemq</layer>
<layer>micrometer</layer>
<layer>mod_cluster</layer>
<layer>naming</layer>
<layer>observability</layer>
Expand All @@ -692,7 +694,7 @@
<layer>web-server</layer>
<layer>webservices</layer>
<!--
Galleon layers defined only in the wildfly-galleon-pack
Galleon layers defined only in the wildfly feature-pack
-->
<layer>microprofile-config</layer>
<layer>microprofile-fault-tolerance</layer>
Expand Down Expand Up @@ -756,15 +758,18 @@
<layer>ejb-http-invoker</layer>
<layer>ejb-lite</layer>
<layer>elytron</layer>
<layer>elytron-oidc-client</layer>
<layer>hibernate-search</layer>
<layer>h2-datasource</layer>
<layer>h2-default-datasource</layer>
<layer>h2-driver</layer>
<layer>iiop-openjdk</layer>
<layer>infinispan</layer>
<layer>io</layer>
<layer>jaxrs</layer>
<layer>jaxrs-server</layer>
<layer>jdr</layer>
<layer>jgroups-aws</layer>
<layer>jms-activemq</layer>
<layer>jmx</layer>
<layer>jmx-remoting</layer>
Expand All @@ -776,6 +781,7 @@
<layer>mail</layer>
<layer>management</layer>
<layer>messaging-activemq</layer>
<layer>micrometer</layer>
<layer>mod_cluster</layer>
<layer>naming</layer>
<layer>observability</layer>
Expand All @@ -797,13 +803,18 @@
<layer>web-server</layer>
<layer>webservices</layer>
<!--
Galleon layers defined only in the wildfly-galleon-pack
Galleon layers defined only in the wildfly feature-pack
-->
<layer>microprofile-config</layer>
<layer>microprofile-fault-tolerance</layer>
<layer>microprofile-health</layer>
<layer>microprofile-lra-coordinator</layer>
<layer>microprofile-lra-participant</layer>
<layer>microprofile-jwt</layer>
<layer>microprofile-openapi</layer>
<layer>microprofile-reactive-streams-operators</layer>
<layer>microprofile-reactive-messaging</layer>
<layer>microprofile-reactive-messaging-kafka</layer>
<layer>microprofile-telemetry</layer>
<layer>microprofile-platform</layer>
</layers>
Expand Down Expand Up @@ -857,17 +868,21 @@
<layer>ejb-lite</layer>
<layer>ejb-local-cache</layer>
<layer>elytron</layer>
<layer>elytron-oidc-client</layer>
<layer>embedded-activemq</layer>
<layer>hibernate-search</layer>
<layer>h2-datasource</layer>
<layer>h2-default-datasource</layer>
<layer>h2-driver</layer>
<layer>health</layer>
<layer>iiop-openjdk</layer>
<layer>infinispan</layer>
<layer>io</layer>
<layer>infinispan</layer>
<layer>jaxrs</layer>
<layer>jaxrs-server</layer>
<layer>jdr</layer>
<layer>jgroups-aws</layer>
<layer>jms-activemq</layer>
<layer>jmx</layer>
<layer>jmx-remoting</layer>
Expand Down Expand Up @@ -898,9 +913,10 @@
<layer>web-server</layer>
<layer>webservices</layer>
<!--
Galleon layers defined only in the wildfly-galleon-pack
Galleon layers defined only in the wildfly feature-pack
-->
<layer>microprofile-config</layer>
<layer>microprofile-fault-tolerance</layer>
<layer>microprofile-health</layer>
<layer>microprofile-jwt</layer>
<layer>microprofile-lra-coordinator</layer>
Expand All @@ -911,6 +927,7 @@
<layer>microprofile-reactive-messaging-kafka</layer>
<layer>microprofile-rest-client</layer>
<layer>microprofile-telemetry</layer>
<layer>microprofile-platform</layer>
</layers>
</config>
</configurations>
Expand Down Expand Up @@ -964,10 +981,12 @@
<layer>h2-driver</layer>
<layer>health</layer>
<layer>iiop-openjdk</layer>
<layer>infinispan</layer>
<layer>io</layer>
<layer>jaxrs</layer>
<layer>jaxrs-server</layer>
<layer>jdr</layer>
<layer>jgroups-aws</layer>
<layer>jms-activemq</layer>
<layer>jmx</layer>
<layer>jmx-remoting</layer>
Expand Down
14 changes: 12 additions & 2 deletions ...ite/layers-expansion/src/test/java/org/jboss/as/test/layers/expansion/LayersTestCase.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,19 @@
*/
package org.jboss.as.test.layers.expansion;

import java.util.Set;
import org.jboss.as.test.shared.LayersTestBase;
import org.jboss.as.test.shared.util.AssumeTestGroupUtil;

public class LayersTestCase extends LayersTestBase {
// Currently we get all functionality from the superclass; this class is just so surefire has something to run
// in this testsuite module

protected Set<String> getExpectedUnreferenced() {
String[] extra = AssumeTestGroupUtil.isWildFlyPreview() ? NOT_REFERENCED_WILDFLY_PREVIEW : NOT_REFERENCED_WILDFLY;
return concatArrays(NO_LAYER_OR_REFERENCE_COMMON, NOT_REFERENCED_COMMON, NOT_REFERENCED_EXPANSION, extra);
}

protected Set<String> getExpectedUnusedInAllLayers() {
String[] extra = AssumeTestGroupUtil.isWildFlyPreview() ? NO_LAYER_WILDFLY_PREVIEW : NO_LAYER_WILDFLY;
return concatArrays(NO_LAYER_OR_REFERENCE_COMMON, NO_LAYER_COMMON, NO_LAYER_EXPANSION, extra);
}
}
Loading

0 comments on commit a3a43c0

Please sign in to comment.