CVS: jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier AccessorWithDependencyMetaData.java,1.1,1.2 BadServiceAccessor.java,1.1,1.2 ComponentVerifierTestCase.java,1.8,1.9 NullAccessor.java,1.1,1.2 RegistrationMetaClassAccessor.java,1.1,1.2 SimpleAccessor.java,1.2,1.3
Peter Donald <pdonald-yCVjj/[email protected]> Wed, 26 Nov 2003 21:52:34 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier
In directory hogshead.codehaus.org:/tmp/cvs-serv530/tools/src/test/org/jcontainer/dna/tools/verifier
Modified Files:
AccessorWithDependencyMetaData.java BadServiceAccessor.java
ComponentVerifierTestCase.java NullAccessor.java
RegistrationMetaClassAccessor.java SimpleAccessor.java
Log Message:
Updated to use latest MetaClass and remove specialized dna metaclass generation task in favour of using generic task.
Index: AccessorWithDependencyMetaData.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier/AccessorWithDependencyMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- AccessorWithDependencyMetaData.java 26 Oct 2003 06:07:44 -0000 1.1
+++ AccessorWithDependencyMetaData.java 27 Nov 2003 03:51:59 -0000 1.2
@@ -27,7 +27,8 @@
implements MetaClassAccessor
{
public ClassDescriptor getClassDescriptor( final String classname,
- final ClassLoader classLoader )
+ final ClassLoader classLoader,
+ final MetaClassAccessor accessor )
throws MetaClassException
{
final Properties parameters = new Properties();
@@ -40,9 +41,9 @@
new ParameterDescriptor("locator", ResourceLocator.class.getName());
final ParameterDescriptor[] params = new ParameterDescriptor[]{param};
final MethodDescriptor descriptor =
- new MethodDescriptor("compose","", 0, params, attributes );
+ new MethodDescriptor("compose","", params, attributes, attributes );
return new ClassDescriptor( classname,
- 0,
+ Attribute.EMPTY_SET,
Attribute.EMPTY_SET,
FieldDescriptor.EMPTY_SET,
new MethodDescriptor[]{descriptor} );
Index: BadServiceAccessor.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier/BadServiceAccessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- BadServiceAccessor.java 25 Oct 2003 15:03:06 -0000 1.1
+++ BadServiceAccessor.java 27 Nov 2003 03:51:59 -0000 1.2
@@ -27,7 +27,8 @@
static final String BAD_SERVICE = "I-No-Exist!";
public ClassDescriptor getClassDescriptor( final String classname,
- final ClassLoader classLoader )
+ final ClassLoader classLoader,
+ final MetaClassAccessor accessor )
throws MetaClassException
{
final Properties bad = new Properties();
@@ -42,7 +43,7 @@
new Attribute( "dna.service", good )
};
return new ClassDescriptor( classname,
- 0,
+ attributes,
attributes,
FieldDescriptor.EMPTY_SET,
MethodDescriptor.EMPTY_SET );
Index: ComponentVerifierTestCase.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier/ComponentVerifierTestCase.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- ComponentVerifierTestCase.java 29 Oct 2003 22:36:21 -0000 1.8
+++ ComponentVerifierTestCase.java 27 Nov 2003 03:51:59 -0000 1.9
@@ -11,6 +11,7 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
+import java.util.Arrays;
import java.awt.event.ActionListener;
import org.jcontainer.dna.Configurable;
import org.jcontainer.dna.Configuration;
@@ -20,6 +21,7 @@
import org.realityforge.metaclass.model.FieldDescriptor;
import org.realityforge.metaclass.model.MethodDescriptor;
import org.realityforge.metaclass.model.ParameterDescriptor;
+import org.realityforge.metaclass.Attributes;
/**
*
@@ -244,7 +246,7 @@
MetaClassIntrospector.setAccessor( new SimpleAccessor() );
MetaClassIntrospector.clearCompleteCache();
final List issues = new ArrayList();
- verifier.verifyMetaData( Object.class, issues );
+ verifier.verifyMetaData( ComponentVerifierTestCase.class, issues );
assertNoIssues( issues );
}
@@ -291,7 +293,7 @@
};
final ClassDescriptor descriptor =
new ClassDescriptor( BasicComponent.class.getName(),
- 0,
+ attributes,
attributes,
FieldDescriptor.EMPTY_SET,
MethodDescriptor.EMPTY_SET );
@@ -520,10 +522,10 @@
new ParameterDescriptor( "X", Configuration.class.getName() );
final ParameterDescriptor[] params = new ParameterDescriptor[]{param};
final MethodDescriptor method =
- new MethodDescriptor( "configure", "", 0, params, attributes );
+ new MethodDescriptor( "configure", "", params, attributes, attributes );
final ClassDescriptor descriptor =
new ClassDescriptor( BasicComponent.class.getName(),
- 0,
+ Attribute.EMPTY_SET,
Attribute.EMPTY_SET,
FieldDescriptor.EMPTY_SET,
new MethodDescriptor[]{method} );
@@ -550,10 +552,10 @@
new ParameterDescriptor( "X", Configuration.class.getName() );
final ParameterDescriptor[] params = new ParameterDescriptor[]{param};
final MethodDescriptor method =
- new MethodDescriptor( "configure", "", 0, params, attributes );
+ new MethodDescriptor( "configure", "", params, attributes, attributes );
final ClassDescriptor descriptor =
new ClassDescriptor( BasicComponent.class.getName(),
- 0,
+ Attribute.EMPTY_SET,
Attribute.EMPTY_SET,
FieldDescriptor.EMPTY_SET,
new MethodDescriptor[]{method} );
@@ -600,6 +602,16 @@
private void assertNoIssues( final List issues )
{
+ if( 0 != issues.size() )
+ {
+ final int count = issues.size();
+ for( int i = 0; i < count; i++ )
+ {
+ final VerifyIssue issue = (VerifyIssue)issues.get( i );
+ System.out.println(
+ "issue.getDescription() = " + issue.getDescription() );
+ }
+ }
assertEquals( "issues.length", 0, issues.size() );
}
Index: NullAccessor.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier/NullAccessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- NullAccessor.java 25 Oct 2003 15:03:06 -0000 1.1
+++ NullAccessor.java 27 Nov 2003 03:51:59 -0000 1.2
@@ -19,8 +19,9 @@
class NullAccessor
implements MetaClassAccessor
{
- public ClassDescriptor getClassDescriptor( String classname,
- ClassLoader classLoader )
+ public ClassDescriptor getClassDescriptor( final String classname,
+ final ClassLoader classLoader,
+ final MetaClassAccessor accessor )
throws MetaClassException
{
return null;
Index: RegistrationMetaClassAccessor.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier/RegistrationMetaClassAccessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- RegistrationMetaClassAccessor.java 26 Oct 2003 06:27:40 -0000 1.1
+++ RegistrationMetaClassAccessor.java 27 Nov 2003 03:51:59 -0000 1.2
@@ -24,7 +24,8 @@
private final Map m_descriptors = new HashMap();
public ClassDescriptor getClassDescriptor( final String classname,
- final ClassLoader classLoader )
+ final ClassLoader classLoader,
+ final MetaClassAccessor accessor )
throws MetaClassException
{
final ClassDescriptor descriptor = (ClassDescriptor)m_descriptors.get( classname );
Index: SimpleAccessor.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/dna/tools/src/test/org/jcontainer/dna/tools/verifier/SimpleAccessor.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- SimpleAccessor.java 26 Oct 2003 05:59:34 -0000 1.2
+++ SimpleAccessor.java 27 Nov 2003 03:51:59 -0000 1.3
@@ -23,7 +23,8 @@
implements MetaClassAccessor
{
public ClassDescriptor getClassDescriptor( final String classname,
- final ClassLoader classLoader )
+ final ClassLoader classLoader,
+ final MetaClassAccessor accessor )
throws MetaClassException
{
final Attribute[] attributes = new Attribute[]
@@ -31,7 +32,7 @@
new Attribute( "dna.component" ),
};
return new ClassDescriptor( classname,
- 0,
+ attributes,
attributes,
FieldDescriptor.EMPTY_SET,
MethodDescriptor.EMPTY_SET );