[weld-commits] Weld SVN: r6232 - in java-se/trunk/src: test/java/org/jboss/weld/environment/se/test and 1 other directory.

Author: peteroyle Date: 2010-05-14 08:49:32 -0400 (Fri, 14 May 2010) New Revision: 6232 Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/util/WeldManagerUtils.java java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java Log: WeldManagerUtils is still useful within Weld.class, but I have removed it from all of the tests, replaced by Weld.instance() Modified: java-se/trunk/src/main/java/org/jboss/weld/environment/se/util/WeldManagerUtils.java =================================================================== --- java-se/trunk/src/main/java/org/jboss/weld/environment/se/util/WeldManagerUtils.java 2010-05-14 12:25:01 UTC (rev 6231) +++ java-se/trunk/src/main/java/org/jboss/weld/environment/se/util/WeldManagerUtils.java 2010-05-14 12:49:32 UTC (rev 6232) @@ -25,7 +25,6 @@ /** * * @author Peter Royle - * @deprecated This should be replaced with usages of Weld.instance() */ public class WeldManagerUtils { Modified: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java =================================================================== --- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java 2010-05-14 12:25:01 UTC (rev 6231) +++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/DecoratorsTest.java 2010-05-14 12:49:32 UTC (rev 6232) @@ -25,7 +25,6 @@ import org.jboss.weld.environment.se.test.decorators.AbstractDoor; import org.jboss.weld.environment.se.test.decorators.CarDoorAlarm; import org.jboss.weld.environment.se.test.decorators.HouseDoor; -import org.jboss.weld.environment.se.util.WeldManagerUtils; import org.testng.Assert; import org.testng.annotations.Test; @@ -46,7 +45,7 @@ WeldContainer weld = new Weld().initialize(); BeanManager manager = weld.getBeanManager(); - CarDoor carDoor = WeldManagerUtils.getInstanceByType(manager, CarDoor.class); + CarDoor carDoor = weld.instance().select(CarDoor.class).get(); Assert.assertNotNull(carDoor); // the car door is alarmed @@ -55,7 +54,7 @@ testDoor(carDoor); Assert.assertTrue(CarDoorAlarm.alarmActivated); - HouseDoor houseDoor = WeldManagerUtils.getInstanceByType(manager, HouseDoor.class); + HouseDoor houseDoor = weld.instance().select(HouseDoor.class).get(); Assert.assertNotNull(carDoor); // the house door is not alarmed Modified: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java =================================================================== --- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2010-05-14 12:25:01 UTC (rev 6231) +++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/InterceptorsTest.java 2010-05-14 12:49:32 UTC (rev 6232) @@ -24,7 +24,6 @@ import org.jboss.weld.environment.se.test.beans.InterceptorTestBean; import org.jboss.weld.environment.se.test.interceptors.AggregatingInterceptor; import org.jboss.weld.environment.se.test.interceptors.RecordingInterceptor; -import org.jboss.weld.environment.se.util.WeldManagerUtils; import org.testng.Assert; import org.testng.annotations.Test; @@ -44,7 +43,7 @@ WeldContainer weld = new Weld().initialize(); BeanManager manager = weld.getBeanManager(); - InterceptorTestBean intTestBean = WeldManagerUtils.getInstanceByType(manager, InterceptorTestBean.class); + InterceptorTestBean intTestBean = weld.instance().select(InterceptorTestBean.class).get(); Assert.assertNotNull(intTestBean); intTestBean.doSomethingRecorded(); Modified: java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java =================================================================== --- java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java 2010-05-14 12:25:01 UTC (rev 6231) +++ java-se/trunk/src/test/java/org/jboss/weld/environment/se/test/StartMainTest.java 2010-05-14 12:49:32 UTC (rev 6232) @@ -26,7 +26,6 @@ import org.jboss.weld.environment.se.test.beans.MainTestBean; import org.jboss.weld.environment.se.test.beans.ObserverTestBean; import org.jboss.weld.environment.se.test.beans.ParametersTestBean; -import org.jboss.weld.environment.se.util.WeldManagerUtils; import org.testng.Assert; import org.testng.annotations.Test; @@ -53,7 +52,7 @@ WeldContainer weld = new StartMain(args).go(); BeanManager manager = weld.getBeanManager(); - MainTestBean mainTestBean = WeldManagerUtils.getInstanceByType(manager, MainTestBean.class); + MainTestBean mainTestBean = weld.instance().select(MainTestBean.class).get(); Assert.assertNotNull(mainTestBean); ParametersTestBean paramsBean = mainTestBean.getParametersTestBean(); @@ -79,7 +78,7 @@ WeldContainer weld = new StartMain(ARGS_EMPTY).go(); BeanManager manager = weld.getBeanManager(); - MainTestBean mainTestBean = WeldManagerUtils.getInstanceByType(manager, MainTestBean.class); + MainTestBean mainTestBean = weld.instance().select(MainTestBean.class).get(); Assert.assertNotNull(mainTestBean); ParametersTestBean paramsBean = mainTestBean.getParametersTestBean();