1.7 +1 -4 jakarta-commons/attributes/site/xdocs/index.xml Index: index.xml =================================================================== RCS file: /home/cvs/jakarta-commons/attributes/site/xdocs/index.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- index.xml 15 Aug 2004 16:28:15 -0000 1.6 +++ index.xml 10 Sep 2004 20:49:38 -0000 1.7 @@ -65,10 +65,7 @@
Ant task: commons-attributes-compiler-2.1.jar
-
Commons Collections 2.1: commons-collections-2.1.jar
-
-
Xjavadoc 1.0: xjavadoc-1.0.jar
+
qDox 1.5: qdox-1.5.jar

1.6 +7 -1 jakarta-commons/attributes/unittest/project.xml Index: project.xml =================================================================== RCS file: /home/cvs/jakarta-commons/attributes/unittest/project.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- project.xml 27 Aug 2004 21:30:11 -0000 1.5 +++ project.xml 10 Sep 2004 20:49:38 -0000 1.6 @@ -41,6 +41,7 @@ 1.5 + + + + qdox + 1.5 + commons-attributes 1.2 +0 -67 jakarta-commons/attributes/unittest/src/test/org/apache/commons/attributes/test/AttributesTestCase.java Index: AttributesTestCase.java =================================================================== RCS file: /home/cvs/jakarta-commons/attributes/unittest/src/test/org/apache/commons/attributes/test/AttributesTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- AttributesTestCase.java 6 Jul 2004 20:43:35 -0000 1.1 +++ AttributesTestCase.java 10 Sep 2004 20:49:38 -0000 1.2 @@ -98,44 +98,6 @@ assertTrue (Attributes.hasParameterAttribute (c, 1, new ThreadSafe ())); } - public void testClassInheritance () throws Exception { - Class c = Sample.class; - assertEquals (5, Attributes.getAttributes (c).size ()); - assertEquals (4, Attributes.getAttributes (c, Dependency.class).size ()); - assertTrue (Attributes.hasAttributeType (c, Dependency.class)); - assertTrue (Attributes.hasAttributeType (c, ThreadSafe.class)); - assertTrue (Attributes.hasAttribute (c, new Dependency ( SampleService.class, "sample" ))); - assertTrue (Attributes.hasAttribute (c, new Dependency ( SampleService.class, "super-sample" ))); - assertTrue (Attributes.hasAttribute (c, new Dependency ( SampleService.class, "sample-if-1-c" ))); - assertTrue (Attributes.hasAttribute (c, new Dependency ( SampleService.class, "sample-if-2-c" ))); - assertTrue (Attributes.hasAttribute (c, new ThreadSafe ())); - } - - public void testMethodInheritance () throws Exception { - Method m = Sample.class.getMethod ("someMethod", new Class[]{ Integer.TYPE }); - assertEquals (4, Attributes.getAttributes (m).size ()); - assertEquals (4, Attributes.getAttributes (m, Dependency.class).size ()); - assertTrue (Attributes.hasAttributeType (m, Dependency.class)); - assertTrue (Attributes.hasAttribute (m, new Dependency ( SampleService.class, "super-some-method-sample" ))); - assertTrue (Attributes.hasAttribute (m, new Dependency ( SampleService.class, "sample-some-method2" ) )); - assertTrue (Attributes.hasAttribute (m, new Dependency ( SampleService.class, "sample-if-1" ) )); - assertTrue (Attributes.hasAttribute (m, new Dependency ( SampleService.class, "sample-if-2" ) )); - } - - public void testPrivateMethodNonInheritance () throws Exception { - Method m = Sample.class.getDeclaredMethod ("privateMethod", new Class[]{}); - assertEquals (1, Attributes.getAttributes (m).size ()); - assertEquals (1, Attributes.getAttributes (m, Dependency.class).size ()); - assertTrue (Attributes.hasAttributeType (m, Dependency.class)); - assertTrue (Attributes.hasAttribute (m, new Dependency ( SampleService.class, "sample-privateMethod" ) )); - - m = SuperSample.class.getDeclaredMethod ("privateMethod", new Class[]{}); - assertEquals (1, Attributes.getAttributes (m).size ()); - assertEquals (1, Attributes.getAttributes (m, Dependency.class).size ()); - assertTrue (Attributes.hasAttributeType (m, Dependency.class)); - assertTrue (Attributes.hasAttribute (m, new Dependency ( SampleService.class, "super-privateMethod" ) )); - } - public void testParameterAndReturnAttributes () throws Exception { Method m = Sample.class.getMethod ("methodWithAttributes", new Class[]{ Integer.TYPE, Integer.TYPE }); assertEquals (0, Attributes.getAttributes (m).size ()); @@ -147,35 +109,6 @@ assertEquals (2, Attributes.getParameterAttributes (m, 1).size ()); assertTrue (Attributes.hasParameterAttribute (m, 1, new Dependency ( SampleService.class, "sample-if-param-2" ) )); assertTrue (Attributes.hasParameterAttribute (m, 1, new ThreadSafe () )); - } - - public void testFieldNonInheritance () throws Exception { - Field f = SuperSample.class.getField ("field"); - assertEquals (2, Attributes.getAttributes (f).size ()); - assertEquals (1, Attributes.getAttributes (f, ThreadSafe.class).size ()); - assertEquals (1, Attributes.getAttributes (f, Dependency.class).size ()); - assertTrue (Attributes.hasAttributeType (f, ThreadSafe.class)); - assertTrue (Attributes.hasAttributeType (f, Dependency.class)); - assertTrue (Attributes.hasAttribute (f, new ThreadSafe ())); - assertTrue (Attributes.hasAttribute (f, new Dependency ( SampleService.class, "super-field" ))); - - f = Sample.class.getField ("field"); - assertEquals (1, Attributes.getAttributes (f).size ()); - assertEquals (1, Attributes.getAttributes (f, ThreadSafe.class).size ()); - assertTrue (Attributes.hasAttributeType (f, ThreadSafe.class)); - assertTrue (Attributes.hasAttribute (f, new ThreadSafe ())); - - f = SuperSample.class.getField ("noAttributesInSubClass"); - assertEquals (1, Attributes.getAttributes (f).size ()); - assertEquals (1, Attributes.getAttributes (f, Dependency.class).size ()); - assertTrue (Attributes.hasAttribute (f, new Dependency ( SampleService.class, "super-noattrs" ))); - assertTrue (Attributes.hasAttributeType (f, Dependency.class)); - - f = Sample.class.getField ("noAttributesInSubClass"); - assertEquals (0, Attributes.getAttributes (f).size ()); - assertEquals (0, Attributes.getAttributes (f, Dependency.class).size ()); - assertTrue (!Attributes.hasAttribute (f, new Dependency ( SampleService.class, "super-noattrs" ))); - assertTrue (!Attributes.hasAttributeType (f, Dependency.class)); } public void testNoAttributes () throws Exception { 1.2 +50 -4 jakarta-commons/attributes/unittest/src/test/org/apache/commons/attributes/test/InnerClassTestCase.java Index: InnerClassTestCase.java =================================================================== RCS file: /home/cvs/jakarta-commons/attributes/unittest/src/test/org/apache/commons/attributes/test/InnerClassTestCase.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- InnerClassTestCase.java 6 Jul 2004 20:43:38 -0000 1.1 +++ InnerClassTestCase.java 10 Sep 2004 20:49:38 -0000 1.2 @@ -24,16 +24,62 @@ import org.apache.commons.attributes.InvalidAttributeTargetError; public class InnerClassTestCase extends TestCase { + + public static class AnAttribute {} - public void testInnerClassAttributesOnMehtod () throws Exception { + public static class Internal { + } + + public static class InnerClassSample { + + public static class InternalOfSample { + } + + /** + * @@InnerClassTestCase.AnAttribute() + */ + public void method (Internal i) { + } + + /** + * @@InnerClassTestCase.AnAttribute() + */ + public void method2 (InternalOfSample i) { + } + + /** + * @@InnerClassTestCase.AnAttribute() + */ + public Internal field; + + /** + * @@InnerClassTestCase.AnAttribute() + */ + public InternalOfSample field2; + + } + + public void testInnerClassAttributesOnMethod () throws Exception { Class sample = InnerClassSample.class; - Method method = sample.getMethod ("method", new Class[]{ InnerClassSample.Internal.class }); - assertTrue (Attributes.getAttributes (method, ThreadSafe.class).size () > 0); + Method method = sample.getMethod ("method", new Class[]{ Internal.class }); + assertTrue (Attributes.getAttributes (method, AnAttribute.class).size () > 0); + } + + public void testInnerClassAttributesOnMethod2 () throws Exception { + Class sample = InnerClassSample.class; + Method method2 = sample.getMethod ("method2", new Class[]{ InnerClassSample.InternalOfSample.class }); + assertTrue (Attributes.getAttributes (method2, AnAttribute.class).size () > 0); } public void testInnerClassAttributesOnField () throws Exception { Class sample = InnerClassSample.class; Field field = sample.getField ("field"); - assertTrue (Attributes.getAttributes (field, ThreadSafe.class).size () > 0); + assertTrue (Attributes.getAttributes (field, AnAttribute.class).size () > 0); + } + + public void testInnerClassAttributesOnField2 () throws Exception { + Class sample = InnerClassSample.class; + Field field2 = sample.getField ("field2"); + assertTrue (Attributes.getAttributes (field2, AnAttribute.class).size () > 0); } } 1.3 +13 -2 jakarta-commons/attributes/unittest/src/test/org/apache/commons/attributes/test/TargetTestCase.java Index: TargetTestCase.java =================================================================== RCS file: /home/cvs/jakarta-commons/attributes/unittest/src/test/org/apache/commons/attributes/test/TargetTestCase.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- TargetTestCase.java 28 Aug 2004 21:12:19 -0000 1.2 +++ TargetTestCase.java 10 Sep 2004 20:49:38 -0000 1.3 @@ -18,10 +18,21 @@ import junit.framework.TestCase; import org.apache.commons.attributes.Attributes; +import org.apache.commons.attributes.Target; import org.apache.commons.attributes.InvalidAttributeTargetError; public class TargetTestCase extends TestCase { + /** + * @@TargetTestCase.AttributeWithTarget() + */ + public static class ClassWithInvalidDeclarations {} + + /** + * @@Target(Target.METHOD) + */ + public static class AttributeWithTarget {} + public void testMethodAttributeOnClass () throws Exception { Class clazz1 = ClassWithInvalidDeclarations.class; @@ -30,8 +41,8 @@ fail (); } catch (InvalidAttributeTargetError iate) { - assertEquals ("Attributes of type org.apache.commons.attributes.test.AttributeWithTarget " + - "can't be applied to org.apache.commons.attributes.test.ClassWithInvalidDeclarations. " + + assertEquals ("Attributes of type org.apache.commons.attributes.test.TargetTestCase$AttributeWithTarget " + + "can't be applied to org.apache.commons.attributes.test.TargetTestCase$ClassWithInvalidDeclarations. " + "They can only be applied to: METHOD", iate.getMessage ()); // OK. --------------------------------------------------------------------- To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org For additional commands, e-mail: commons-dev-help@jakarta.apache.org