Merge pull request javaee-samples#351 from robertpanzer/cdi_tests_tomee

arjantijms · web-flow · commit afe04052bf4b · 2016-10-06T00:25:11.000+02:00
Use the correct instances to destroy CDI beans obtained from Instances.
diff --git a/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/AnyGreetingTest.java b/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/AnyGreetingTest.java
@@ -49,13 +49,15 @@ public void test() throws Exception {
 		assertTrue(instance.isAmbiguous());
 
 		// use Instance<T>#select()
-		Greeting businessBean = instance.select(new AnnotationLiteral<Business>() {}).get();
+		Instance<Greeting> businessInstance = instance.select(new AnnotationLiteral<Business>() {});
+		Greeting businessBean = businessInstance.get();
 		assertThat(businessBean, instanceOf(FormalGreeting.class));
-		instance.destroy(businessBean);
+		businessInstance.destroy(businessBean);
 
-		Greeting defaultBean = instance.select(new AnnotationLiteral<Default>() {}).get();
+		Instance<Greeting> defaultInstance = instance.select(new AnnotationLiteral<Default>() {});
+		Greeting defaultBean = defaultInstance.get();
 		assertThat(defaultBean, instanceOf(SimpleGreeting.class));
-		instance.destroy(defaultBean);
+		defaultInstance.destroy(defaultBean);
 	}
 }
 
diff --git a/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/GreetingTest.java b/cdi/instance-qualifiers/src/test/java/org/javaee7/cdi/instance/GreetingTest.java
@@ -54,9 +54,11 @@ public void test() throws Exception {
 		instance.destroy(bean);
 
 		// use Instance<T>#select()
-		Greeting anotherBean = instance.select(new AnnotationLiteral<Default>() {}).get();
+		Instance<Greeting> anotherInstance = instance.select(new AnnotationLiteral<Default>() {
+		});
+		Greeting anotherBean = anotherInstance.get();
 		assertThat(anotherBean, instanceOf(SimpleGreeting.class));
-		instance.destroy(anotherBean);
+		anotherInstance.destroy(anotherBean);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,11 @@ public void test() throws Exception {`
`54`	`54`	`instance.destroy(bean);`
`55`	`55`
`56`	`56`	`// use Instance<T>#select()`
`57`		`- Greeting anotherBean = instance.select(new AnnotationLiteral<Default>() {}).get();`
	`57`	`+ Instance<Greeting> anotherInstance = instance.select(new AnnotationLiteral<Default>() {`
	`58`	`+ });`
	`59`	`+ Greeting anotherBean = anotherInstance.get();`
`58`	`60`	`assertThat(anotherBean, instanceOf(SimpleGreeting.class));`
`59`		`- instance.destroy(anotherBean);`
	`61`	`+ anotherInstance.destroy(anotherBean);`
`60`	`62`	`}`
`61`	`63`	`}`
`62`	`64`