Merge pull request javaee-samples#307 from rhanus/master

fixed test of both cdi/instance and cdi/instance-qualifiers in accord…

Author: arun-gupta

cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/AnyGreetingTest.java

@@ -0,0 +1,61 @@
+package org.javaee7.cdi.instance;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Default;
+import javax.enterprise.inject.Instance;
+import javax.enterprise.util.AnnotationLiteral;
+import javax.inject.Inject;
+
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.junit.Assert.*;
+
+/**
+ * @author Radim Hanus
+ */
+@RunWith(Arquillian.class)
+public class AnyGreetingTest {
+	@Deployment
+	public static Archive<?> deploy() {
+		return ShrinkWrap.create(JavaArchive.class)
+				.addClasses(Greeting.class, SimpleGreeting.class, FormalGreeting.class, Business.class, Personal.class)
+				.addAsManifestResource("beans.xml");
+	}
+
+	/**
+	 * Built-in qualifier @Any is assumed on each bean regardless other qualifiers specified.
+	 */
+	@Inject @Any
+	private Instance<Greeting> instance;
+
+	/**
+	 * Both bean instances of Greeting interface should be available.<br/>
+	 *
+	 * When dependent scoped bean is retrieved via an instance then explicit destroy action should be taken.
+	 * This is a known memory leak in CDI 1.0 fixed in CDI 1.1 see the link bellow for details.
+	 *
+	 * @see  <a href="https://issues.jboss.org/browse/CDI-139">CDI-139</a>
+	 */
+	@Test
+	public void test() throws Exception {
+		assertFalse(instance.isUnsatisfied());
+		assertTrue(instance.isAmbiguous());
+
+		// use Instance<T>#select()
+		Greeting businessBean = instance.select(new AnnotationLiteral<Business>() {}).get();
+		assertThat(businessBean, instanceOf(FormalGreeting.class));
+		instance.destroy(businessBean);
+
+		Greeting defaultBean = instance.select(new AnnotationLiteral<Default>() {}).get();
+		assertThat(defaultBean, instanceOf(SimpleGreeting.class));
+		instance.destroy(defaultBean);
+	}
+}
+

cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/GreetingTest.java

@@ -8,14 +8,14 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import javax.enterprise.inject.Any;
 import javax.enterprise.inject.Default;
 import javax.enterprise.inject.Instance;
 import javax.enterprise.util.AnnotationLiteral;
 import javax.inject.Inject;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
 
 /**
  * @author Radim Hanus
@@ -33,36 +33,30 @@ public static Archive<?> deploy() {
 	 * Container will assume built-in @Default qualifier here as well as for beans that don't declare a qualifier.
 	 */
 	@Inject
-	private Instance<Greeting> defaultInstance;
+	private Instance<Greeting> instance;
 
 	/**
-	 * Qualifier @Personal is not qualifying any bean.
+	 * Only instance of SimpleGreeting class should be available.<br/>
+	 *
+	 * When dependent scoped bean is retrieved via an instance then explicit destroy action should be taken.
+	 * This is a known memory leak in CDI 1.0 fixed in CDI 1.1 see the link bellow for details.
+	 *
+	 * @see  <a href="https://issues.jboss.org/browse/CDI-139">CDI-139</a>
 	 */
-	@Inject @Personal
-	private Instance<Greeting> personalInstance;
-
-	/**
-	 * Built-in qualifier @Any is assumed on each bean regardless other qualifiers specified.
-	 */
-	@Inject @Any
-	private Instance<Greeting> anyInstance;
-
 	@Test
 	public void test() throws Exception {
-		// only SimpleGreeting instance should be available
-		assertFalse(defaultInstance.isUnsatisfied());
-		assertFalse(defaultInstance.isAmbiguous());
-		assertThat(defaultInstance.get(), instanceOf(SimpleGreeting.class));
-		assertThat(defaultInstance.select(new AnnotationLiteral<Default>() {}).get(), instanceOf(SimpleGreeting.class));
-
-		// no instance should be available
-		assertTrue(personalInstance.isUnsatisfied());
-
-		// both Greeting instances should be available
-		assertFalse(anyInstance.isUnsatisfied());
-		assertTrue(anyInstance.isAmbiguous());
-		assertThat(anyInstance.select(new AnnotationLiteral<Business>() {}).get(), instanceOf(FormalGreeting.class));
-		assertThat(anyInstance.select(new AnnotationLiteral<Default>() {}).get(), instanceOf(SimpleGreeting.class));
+		assertFalse(instance.isUnsatisfied());
+		assertFalse(instance.isAmbiguous());
+
+		// use Instance<T>#get()
+		Greeting bean = instance.get();
+		assertThat(bean, instanceOf(SimpleGreeting.class));
+		instance.destroy(bean);
+
+		// use Instance<T>#select()
+		Greeting anotherBean = instance.select(new AnnotationLiteral<Default>() {}).get();
+		assertThat(anotherBean, instanceOf(SimpleGreeting.class));
+		instance.destroy(anotherBean);
 	}
 }
 

cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/PersonalGreetingTest.java

@@ -0,0 +1,40 @@
+package org.javaee7.cdi.instance;
+
+import org.jboss.arquillian.container.test.api.Deployment;
+import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.shrinkwrap.api.Archive;
+import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.spec.JavaArchive;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+
+import static org.junit.Assert.assertTrue;
+
+/**
+ * @author Radim Hanus
+ */
+@RunWith(Arquillian.class)
+public class PersonalGreetingTest {
+	@Deployment
+	public static Archive<?> deploy() {
+		return ShrinkWrap.create(JavaArchive.class)
+				.addClasses(Greeting.class, SimpleGreeting.class, FormalGreeting.class, Business.class, Personal.class)
+				.addAsManifestResource("beans.xml");
+	}
+
+	/**
+	 * Qualifier @Personal is not qualifying any bean.
+	 */
+	@Inject @Personal
+	private Instance<Greeting> instance;
+
+	@Test
+	public void test() throws Exception {
+		// no instance should be available
+		assertTrue(instance.isUnsatisfied());
+	}
+}
+

cdi/instance/src/main/java/org/javaee7/cdi/instance/FancyGreeting.java

@@ -1,9 +1,12 @@
 package org.javaee7.cdi.instance;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * @author Arun Gupta
  * @author Radim Hanus
  */
+@RequestScoped
 public class FancyGreeting implements Greeting {
 	@Override
 	public String greet(String name) {

cdi/instance/src/main/java/org/javaee7/cdi/instance/SimpleGreeting.java

@@ -1,9 +1,12 @@
 package org.javaee7.cdi.instance;
 
+import javax.enterprise.context.RequestScoped;
+
 /**
  * @author Arun Gupta
  * @author Radim Hanus
  */
+@RequestScoped
 public class SimpleGreeting implements Greeting {
 	@Override
 	public String greet(String name) {

cdi/instance/src/test/java/org/javaee7/cdi/instance/GreetingTest.java

@@ -11,9 +11,8 @@
 import javax.enterprise.inject.Instance;
 import javax.inject.Inject;
 
-import static org.hamcrest.CoreMatchers.either;
 import static org.hamcrest.CoreMatchers.instanceOf;
-import static org.junit.Assert.assertEquals;
+import static org.hamcrest.Matchers.containsInAnyOrder;
 import static org.junit.Assert.assertThat;
 
 /**
@@ -33,12 +32,8 @@ public static Archive<?> deploy() {
 
 	@Test
 	public void test() throws Exception {
-		int instanceCount = 0;
-		for (Greeting greeting : instance) {
-			assertThat(greeting, either(instanceOf(SimpleGreeting.class)).or(instanceOf(FancyGreeting.class)));
-			instanceCount++;
-		}
-		assertEquals(instanceCount, 2);
+		// there should be both request scoped bean instances available
+		assertThat(instance, containsInAnyOrder(instanceOf(SimpleGreeting.class), instanceOf(FancyGreeting.class)));
 	}
 }