You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by bl...@apache.org on 2003/07/10 22:31:37 UTC
cvs commit: avalon-sandbox/meta/api/src/test/org/apache/avalon/meta/info/test ContextDescriptorTestCase.java
bloritsch 2003/07/10 13:31:37
Modified: meta/api/src/test/org/apache/avalon/meta/info/test
ContextDescriptorTestCase.java
Log:
Format and optimize imports
Revision Changes Path
1.2 +18 -19 avalon-sandbox/meta/api/src/test/org/apache/avalon/meta/info/test/ContextDescriptorTestCase.java
Index: ContextDescriptorTestCase.java
===================================================================
RCS file: /home/cvs/avalon-sandbox/meta/api/src/test/org/apache/avalon/meta/info/test/ContextDescriptorTestCase.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ContextDescriptorTestCase.java 10 Jul 2003 20:30:51 -0000 1.1
+++ ContextDescriptorTestCase.java 10 Jul 2003 20:31:37 -0000 1.2
@@ -49,12 +49,11 @@
*/
package org.apache.avalon.meta.info.test;
-import junit.framework.TestCase;
-import org.apache.avalon.meta.info.Descriptor;
+import org.apache.avalon.framework.Version;
import org.apache.avalon.meta.info.ContextDescriptor;
-import org.apache.avalon.meta.info.ReferenceDescriptor;
+import org.apache.avalon.meta.info.Descriptor;
import org.apache.avalon.meta.info.EntryDescriptor;
-import org.apache.avalon.framework.Version;
+import org.apache.avalon.meta.info.ReferenceDescriptor;
/**
* ContextDescriptorTestCase does XYZ
@@ -74,7 +73,7 @@
protected Descriptor getDescriptor()
{
- return new ContextDescriptor(m_reference, m_entries, getProperties() );
+ return new ContextDescriptor( m_reference, m_entries, getProperties() );
}
protected void checkDescriptor( Descriptor desc )
@@ -87,26 +86,26 @@
EntryDescriptor[] entries = ctxd.getEntries();
- for (int i = 0; i < m_entries.length; i++)
+ for ( int i = 0; i < m_entries.length; i++ )
{
- assertEquals( m_entries[i], entries[i]);
- assertEquals( m_entries[i], ctxd.getEntry(m_entries[i].getKey()));
+ assertEquals( m_entries[i], entries[i] );
+ assertEquals( m_entries[i], ctxd.getEntry( m_entries[i].getKey() ) );
}
}
public void testJoin()
{
- ContextDescriptor desc = (ContextDescriptor)getDescriptor();
- EntryDescriptor[] good = new EntryDescriptor[] {
+ ContextDescriptor desc = (ContextDescriptor) getDescriptor();
+ EntryDescriptor[] good = new EntryDescriptor[]{
new EntryDescriptor( "key", String.class.getName() ),
new EntryDescriptor( "no conflict", String.class.getName() )
};
- EntryDescriptor[] bad = new EntryDescriptor[] {
- new EntryDescriptor("key", Integer.class.getName())
+ EntryDescriptor[] bad = new EntryDescriptor[]{
+ new EntryDescriptor( "key", Integer.class.getName() )
};
checkDescriptor( desc );
- desc.merge(good);
+ desc.merge( good );
checkDescriptor( desc );
assertEquals( m_entries[0], desc.getEntry( m_entries[0].getKey() ) );
@@ -115,10 +114,10 @@
try
{
- desc.merge(bad);
- fail("Did not throw expected IllegalArgumentException");
+ desc.merge( bad );
+ fail( "Did not throw expected IllegalArgumentException" );
}
- catch(IllegalArgumentException iae)
+ catch ( IllegalArgumentException iae )
{
// Success!!
}
@@ -126,9 +125,9 @@
public void setUp()
{
- m_reference = new ReferenceDescriptor(ContextDescriptorTestCase.class.getName(), new Version(1,0,0) );
- m_entries = new EntryDescriptor[] {
- new EntryDescriptor("key", String.class.getName())
+ m_reference = new ReferenceDescriptor( ContextDescriptorTestCase.class.getName(), new Version( 1, 0, 0 ) );
+ m_entries = new EntryDescriptor[]{
+ new EntryDescriptor( "key", String.class.getName() )
};
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org