Author: jharting Date: 2009-07-22 06:37:56 -0400 (Wed, 22 Jul 2009) New Revision: 3126 Removed: tck/trunk/impl/src/main/resources/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java Log: Minor Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-22 08:59:04 UTC (rev 3125) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/injectionpoint/InjectionPointTest.java 2009-07-22 10:37:56 UTC (rev 3126) @@ -314,4 +314,10 @@ } }.run(); } + + @Test(groups = { "ri-broken", "resolution" }) + @SpecAssertion(section = "5.3", id = "h") + public void testDecoratorNotResolved() { + assert getInstanceByType(Cat.class) != null; + } } Modified: tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java =================================================================== --- tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-22 08:59:04 UTC (rev 3125) +++ tck/trunk/impl/src/main/java/org/jboss/jsr299/tck/tests/lookup/typesafe/resolution/ResolutionByTypeTest.java 2009-07-22 10:37:56 UTC (rev 3126) @@ -147,26 +147,20 @@ @SpecAssertions( { @SpecAssertion(section = "5.3", id = "i"), @SpecAssertion(section = "5.3.4", id = "aa"), - @SpecAssertion(section = "5.3.4", id = "ab")}) - public void testResolveByTypeWithPrimitives() throws Exception + @SpecAssertion(section = "5.3.4", id = "ab"), + @SpecAssertion(section = "5.3.6", id = "b"), + @SpecAssertion(section = "5.3.6", id = "c") }) + public void testResolveByTypeWithPrimitives() { - new RunInDependentContext() - { - @Override - protected void execute() throws Exception - { - assert getBeans(Double.class).size() == 2; - assert getBeans(double.class).size() == 2; + assert getBeans(Double.class).size() == 2; + assert getBeans(double.class).size() == 2; - Double min = getInstanceByType(Double.class, new AnnotationLiteral<Min>(){}); - double max = getInstanceByType(double.class, new AnnotationLiteral<Max>(){}); + Double min = getInstanceByType(Double.class, new AnnotationLiteral<Min>(){}); + double max = getInstanceByType(double.class, new AnnotationLiteral<Max>(){}); - assert min.equals(NumberProducer.min); - assert NumberProducer.max.equals(max); - } - }.run(); + assert min.equals(NumberProducer.min); + assert NumberProducer.max.equals(max); } - @Test(groups = "resolution") @SpecAssertions( { @SpecAssertion(section = "5.3", id = "l"), @@ -206,25 +200,19 @@ assert classes.contains(RoundWhitefish.class); } - @Test(groups = { "ri-broken", "policy"}) + @Test(groups = { "ri-broken", "policy" }) @SpecAssertion(section = "5.2", id = "a") public void testPolicyNotAvailableInNonDeploymentArchive() throws Exception { - new RunInDependentContext() + Set<Bean<Spider>> spiders = getBeans(Spider.class, new CurrentLiteral()); + Set<Type> types = new HashSet<Type>(); + for (Bean<Spider> spider : spiders) { - @Override - protected void execute() throws Exception - { - Set<Bean<Spider>> spiders = getBeans(Spider.class, new CurrentLiteral()); - Set<Type> types = new HashSet<Type>(); - for (Bean<Spider> spider : spiders) { - types.addAll(spider.getTypes()); - } - assert !types.contains(CrabSpider.class); - assert !types.contains(DaddyLongLegs.class); - - assert getCurrentManager().getBeans("crabSpider").size() == 0; - } - }.run(); + types.addAll(spider.getTypes()); + } + assert !types.contains(CrabSpider.class); + assert !types.contains(DaddyLongLegs.class); + + assert getCurrentManager().getBeans("crabSpider").size() == 0; } }