Author: pete.muir(a)jboss.org Date: 2010-06-13 08:59:04 -0400 (Sun, 13 Jun 2010) New Revision: 6426 Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java Log: ws Modified: core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java =================================================================== --- core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java 2010-06-13 12:55:56 UTC (rev 6425) +++ core/trunk/tests-arquillian/src/test/java/org/jboss/weld/tests/annotatedType/DeclaringTypeTest.java 2010-06-13 12:59:04 UTC (rev 6426) @@ -41,16 +41,14 @@ { @Deployment - public static Archive<?> deploy() + public static Archive<?> deploy() { - return ShrinkWrap.create("test.jar", BeanArchive.class) - .addPackage(DeclaringTypeTest.class.getPackage()) - .as(JavaArchive.class); + return ShrinkWrap.create("test.jar", BeanArchive.class).addPackage(DeclaringTypeTest.class.getPackage()).as(JavaArchive.class); } @Inject private BeanManager beanManager; - + @Test public void testInheritance() { @@ -61,14 +59,8 @@ { if (field.getJavaMember().getName().equals("parent")) { - Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK - // - - // Returns - // Parent - Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL - // - - // Returns - // Child + Assert.assertEquals(Parent.class, field.getJavaMember().getDeclaringClass()); // OK - Returns Parent + Assert.assertEquals(Parent.class, field.getDeclaringType().getJavaClass()); // FAIL - Returns Child } else { @@ -81,14 +73,8 @@ { if (method.getJavaMember().getName().equals("parentMethod")) { - Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK - // - - // /Returns - // Parent - Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL - // - - // Returns - // Child + Assert.assertEquals(Parent.class, method.getJavaMember().getDeclaringClass()); // OK - Returns Parent + Assert.assertEquals(Parent.class, method.getDeclaringType().getJavaClass()); // FAIL - Returns Child } else {