Author: pete.muir(a)jboss.org
Date: 2010-05-21 18:47:38 -0400 (Fri, 21 May 2010)
New Revision: 6286
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java
Log:
CDITCK-145
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java 2010-05-21
22:39:14 UTC (rev 6285)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Car.java 2010-05-21
22:47:38 UTC (rev 6286)
@@ -16,7 +16,6 @@
*/
package org.jboss.jsr299.tck.tests.lookup.circular;
-import javax.annotation.PostConstruct;
import javax.inject.Inject;
class Car
@@ -31,18 +30,14 @@
success = false;
}
- @PostConstruct
- public void postConstruct()
+ public String getName()
{
- if (petrol.getName().equals("petrol"))
- {
- success = true;
- }
+ return "herbie";
}
- public String getName()
+ public String getNameOfPetrol()
{
- return "herbie";
+ return petrol.getName();
}
}
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2010-05-21
22:39:14 UTC (rev 6285)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/CircularDependencyTest.java 2010-05-21
22:47:38 UTC (rev 6286)
@@ -41,22 +41,13 @@
@SpecAssertion(section="5", id="b")
public void testCircularInjectionOnOneNormalAndOneDependentBean() throws Exception
{
-
- getInstanceByType(Car.class).getName();
- assert Petrol.success;
- assert Car.success;
+ Petrol petrol = getInstanceByType(Petrol.class);
+ Car car = getInstanceByType(Car.class);
+ assert petrol.getNameOfCar().equals(car.getName());
+ assert car.getNameOfPetrol().equals(petrol.getName());
}
- @Test
- @SpecAssertion(section="5", id="b")
- public void testCircularInjectionOnOneDependentAndOneNormalBean() throws Exception
- {
- getInstanceByType(Petrol.class).getName();
- assert Petrol.success;
- assert Car.success;
- }
-
@Test
@SpecAssertion(section="5", id="b")
public void testNormalProducerMethodDeclaredOnNormalBeanWhichInjectsProducedBean()
throws Exception
Modified:
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java
===================================================================
---
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java 2010-05-21
22:39:14 UTC (rev 6285)
+++
cdi-tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/circular/Petrol.java 2010-05-21
22:47:38 UTC (rev 6286)
@@ -16,7 +16,6 @@
*/
package org.jboss.jsr299.tck.tests.lookup.circular;
-import javax.annotation.PostConstruct;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Inject;
@@ -33,18 +32,14 @@
success = false;
}
- @PostConstruct
- public void postConstruct()
+ public String getName()
{
- if (car.getName().equals("herbie"))
- {
- success = true;
- }
+ return "petrol";
}
- public String getName()
+ public String getNameOfCar()
{
- return "petrol";
+ return car.getName();
}
}
Show replies by date