Rest of tests to use beans.xml over empty beans.xml

eclipse · Sep 23, 2022 · 430d028 · 430d028
1 parent 344ec10
commit 430d028
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 8 deletions.
diff --git a/...src/main/java/org/eclipse/microprofile/metrics/test/optional/MPMetricBaseMetricsTest.java b/...src/main/java/org/eclipse/microprofile/metrics/test/optional/MPMetricBaseMetricsTest.java
@@ -48,7 +48,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.Assert;
 import org.junit.Assume;
@@ -117,7 +116,7 @@ static public void setup() throws MalformedURLException {
 
     @Deployment
     public static WebArchive createDeployment() {
-        WebArchive jar = ShrinkWrap.create(WebArchive.class).addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+        WebArchive jar = ShrinkWrap.create(WebArchive.class).addAsWebInfResource("META-INF/beans.xml", "beans.xml");
 
         System.out.println(jar.toString(true));
         return jar;

diff --git a/...al/src/main/java/org/eclipse/microprofile/metrics/test/optional/MpMetricOptionalTest.java b/...al/src/main/java/org/eclipse/microprofile/metrics/test/optional/MpMetricOptionalTest.java
@@ -37,7 +37,6 @@
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -172,7 +171,7 @@ public static WebArchive createDeployment() {
         WebArchive jar = ShrinkWrap.create(WebArchive.class, "optionalTCK.war")
                 .addPackage(MetricAppBeanOptional.class.getPackage())
                 .addClasses(MetricsRESTActivator.class, MetricAppBeanOptional.class, NameObject.class)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource("META-INF/beans.xml", "beans.xml");
 
         System.out.println(jar.toString(true));
         return jar;

diff --git a/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java b/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/MpMetricTest.java
@@ -35,7 +35,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -108,7 +107,7 @@ static public void setup() throws MalformedURLException {
     @Deployment
     public static WebArchive createDeployment() {
         WebArchive jar = ShrinkWrap.create(WebArchive.class).addClass(MetricAppBean.class)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource("META-INF/beans.xml", "beans.xml");
 
         System.out.println(jar.toString(true));
         return jar;

diff --git a/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/ReusedMetricsTest.java b/tck/rest/src/main/java/org/eclipse/microprofile/metrics/test/ReusedMetricsTest.java
@@ -35,7 +35,6 @@
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.EmptyAsset;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -101,7 +100,7 @@ static public void setup() throws MalformedURLException {
     @Deployment
     public static WebArchive createDeployment() {
         WebArchive jar = ShrinkWrap.create(WebArchive.class).addClass(MetricAppBean2.class)
-                .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
+                .addAsWebInfResource("META-INF/beans.xml", "beans.xml");
 
         return jar;
     }