donaldp 2002/11/15 23:53:01
Modified: info/src/test/org/apache/avalon/framework/tools/infobuilder/test
InfoAssert.java
Log:
Fix unit tests so that infos with different schemas
are marked as not being identical
Revision Changes Path
1.6 +21 -1
jakarta-avalon-excalibur/info/src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoAssert.java
Index: InfoAssert.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/info/src/test/org/apache/avalon/framework/tools/infobuilder/test/InfoAssert.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InfoAssert.java 15 Nov 2002 22:31:14 -0000 1.5
+++ InfoAssert.java 16 Nov 2002 07:53:01 -0000 1.6
@@ -16,6 +16,7 @@
import org.apache.avalon.framework.info.EntryDescriptor;
import org.apache.avalon.framework.info.LoggerDescriptor;
import org.apache.avalon.framework.info.ServiceDescriptor;
+import org.apache.avalon.framework.info.SchemaDescriptor;
/**
* A set of utilities for asserting facts about info objects.
@@ -59,6 +60,10 @@
final LoggerDescriptor[] actualLoggers = actual.getLoggers();
assertEqualLoggers( message, expectedLoggers, actualLoggers );
+ final SchemaDescriptor expectedSchema = expected.getSchema();
+ final SchemaDescriptor actualSchema = actual.getSchema();
+ assertEqualSchema( message, expectedSchema, actualSchema );
+
final ContextDescriptor expectedContext = expected.getContext();
final ContextDescriptor actualContext = actual.getContext();
assertEqualContext( message, expectedContext, actualContext );
@@ -70,6 +75,21 @@
final DependencyDescriptor[] expectedDeps =
expected.getDependencies();
final DependencyDescriptor[] actualDeps = actual.getDependencies();
assertEqualDeps( message, expectedDeps, actualDeps );
+ }
+
+ private static void assertEqualSchema( final String message,
+ final SchemaDescriptor expected,
+ final SchemaDescriptor actual )
+ {
+ Assert.assertEquals( message + ": Schema.type",
+ expected.getType(),
+ actual.getType() );
+ Assert.assertEquals( message + ": Schema.category",
+ expected.getCategory(),
+ actual.getCategory() );
+ Assert.assertEquals( message + ": Schema.location",
+ expected.getLocation(),
+ actual.getLocation() );
}
public static void assertEqualDeps( final String message,
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
