simplify testing registration of AddressRepository, DirectoryRepository

tck/src/main/java/ee/jakarta/tck/data/common/cdi/AddressRepository.java

@@ -15,6 +15,8 @@
  */
 package ee.jakarta.tck.data.common.cdi;
 
+import jakarta.enterprise.context.Dependent;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -25,6 +27,7 @@
  * An implementation of the AddressBook repository interface.
  * Implementation is backed by an in-memory HashMap.
  */
+@Dependent
 public class AddressRepository implements AddressBook {
 
     private Map<UUID, AddressRecord> data = new HashMap<UUID, AddressRecord>();

tck/src/main/java/ee/jakarta/tck/data/common/cdi/DirectoryRepository.java

@@ -15,6 +15,8 @@
  */
 package ee.jakarta.tck.data.common.cdi;
 
+import jakarta.enterprise.context.Dependent;
+
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -25,6 +27,7 @@
  * An implementation of the Directory repository interface.
  * Implementation is backed by an in-memory HashMap and has one function.
  */
+@Dependent
 public class DirectoryRepository implements Directory {
 
     private Map<Long, Person> data = new HashMap<Long, Person>();

tck/src/main/java/ee/jakarta/tck/data/core/cdi/ExtensionTests.java

@@ -23,19 +23,16 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 
 import ee.jakarta.tck.data.common.cdi.AddressBook;
 import ee.jakarta.tck.data.common.cdi.AddressRecord;
 import ee.jakarta.tck.data.common.cdi.Directory;
 import ee.jakarta.tck.data.common.cdi.Person;
-import ee.jakarta.tck.data.core.cdi.provider.BuildCompatibleExtensionImpl;
 import ee.jakarta.tck.data.framework.junit.anno.AnyEntity;
 import ee.jakarta.tck.data.framework.junit.anno.Assertion;
 import ee.jakarta.tck.data.framework.junit.anno.CDI;
 import ee.jakarta.tck.data.framework.junit.anno.Core;
-import jakarta.enterprise.inject.build.compatible.spi.BuildCompatibleExtension;
 import jakarta.inject.Inject;
 
 @Core
@@ -44,16 +41,9 @@
 public class ExtensionTests {
     @Deployment
     public static WebArchive createDeployment() {
-        JavaArchive provider = ShrinkWrap.create(JavaArchive.class)
-                .addPackage(BuildCompatibleExtensionImpl.class.getPackage())
-                .addAsServiceProvider(BuildCompatibleExtension.class, BuildCompatibleExtensionImpl.class);
-
-
         return ShrinkWrap.create(WebArchive.class)
                 .addPackage(ExtensionTests.class.getPackage())
-                .addPackage(Person.class.getPackage())
-                .addAsLibraries(provider);
-
+                .addPackage(Person.class.getPackage());
     }
 
     @Inject

tck/src/main/java/ee/jakarta/tck/data/web/cdi/ExtensionTests.java

@@ -23,7 +23,6 @@
 
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 
 import ee.jakarta.tck.data.common.cdi.AddressBook;
@@ -34,8 +33,6 @@
 import ee.jakarta.tck.data.framework.junit.anno.Assertion;
 import ee.jakarta.tck.data.framework.junit.anno.CDI;
 import ee.jakarta.tck.data.framework.junit.anno.Web;
-import ee.jakarta.tck.data.web.cdi.provider.ExtensionImpl;
-import jakarta.enterprise.inject.spi.Extension;
 import jakarta.inject.Inject;
 
 @Web
@@ -44,15 +41,9 @@
 public class ExtensionTests { 
     @Deployment
     public static WebArchive createDeployment() {
-        JavaArchive provider = ShrinkWrap.create(JavaArchive.class)
-                .addPackage(ExtensionImpl.class.getPackage())
-                .addAsServiceProvider(Extension.class, ExtensionImpl.class);
-
-
         return ShrinkWrap.create(WebArchive.class)
                 .addPackage(ExtensionTests.class.getPackage())
-                .addPackage(Person.class.getPackage())
-                .addAsLibraries(provider);
+                .addPackage(Person.class.getPackage());
 
     }