remove name conflicts

weld · Jun 13, 2010 · f678b17 · f678b17
1 parent 3368bcb
commit f678b17
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Alternatives2Test.java
@@ -24,6 +24,7 @@
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
 import org.junit.Assert;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
@@ -37,7 +38,7 @@ public static Archive<?> deploy()
          .as(JavaArchive.class);
    }
 
-   @org.junit.Test
+   @Test
    public void testAlternativesOnProducers(Consumer consumer)
    {
       Assert.assertEquals("Normal", consumer.getFoo().getName());

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/AlternativesTest.java
@@ -22,6 +22,7 @@
 import org.jboss.shrinkwrap.api.BeanArchive;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.junit.Assert;
+import org.junit.Test;
 import org.junit.runner.RunWith;
 
 @RunWith(Arquillian.class)
@@ -31,11 +32,11 @@ public class AlternativesTest
    public static Archive<?> deploy() 
    {
       return ShrinkWrap.create("test.jar", BeanArchive.class)
-         .stereotype(Test.class)
+         .stereotype(TestAlternative.class)
          .addPackage(Alternatives2Test.class.getPackage());
    }
 
-   @org.junit.Test
+   @Test
    public void testAlternativesOnProducers(Consumer consumer)
    {
       Assert.assertEquals("Test", consumer.getFoo().getName());

diff --git a/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Producer.java b/tests-arquillian/src/test/java/org/jboss/weld/tests/alternatives/Producer.java
@@ -21,7 +21,7 @@
 public class Producer
 {
 
-   @Produces @Test 
+   @Produces @TestAlternative 
    public Foo getFoo() 
    {
       return new Foo("Test");

diff --git a/...g/jboss/weld/tests/alternatives/Test.java → ...d/tests/alternatives/TestAlternative.java b/...g/jboss/weld/tests/alternatives/Test.java → ...d/tests/alternatives/TestAlternative.java
@@ -28,4 +28,4 @@
 @Alternative
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-public @interface Test {}
+public @interface TestAlternative {}