vgritsenko 2003/08/08 15:44:25
Modified: java/tests/src/org/apache/xindice/integration/client
XmlDbClient.java XmlDbClientSetup.java
java/tests/src/org/apache/xindice/integration/client/basic
CollectionTest.java
java/tests/src/org/apache/xindice/integration/client/services
MetaTest.java
Log:
Fix CollectionsTest: With meta on, 3 collections will be returned.
Revision Changes Path
1.9 +2 -3
xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClient.java
Index: XmlDbClient.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClient.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XmlDbClient.java 8 Aug 2003 13:45:32 -0000 1.8
+++ XmlDbClient.java 8 Aug 2003 22:44:25 -0000 1.9
@@ -245,5 +245,4 @@
col.removeResource(document);
}
-
}
1.5 +6 -10
xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClientSetup.java
Index: XmlDbClientSetup.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/XmlDbClientSetup.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XmlDbClientSetup.java 7 Aug 2003 20:13:26 -0000 1.4
+++ XmlDbClientSetup.java 8 Aug 2003 22:44:25 -0000 1.5
@@ -68,8 +68,7 @@
* @version CVS $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
-public class XmlDbClientSetup
- extends TestSetup {
+public class XmlDbClientSetup extends TestSetup {
static public final String INSTANCE_NAME = "db";
static public final String TEST_COLLECTION_NAME = "testing";
@@ -82,8 +81,7 @@
this.client = client;
}
- public void setUp()
- throws Exception {
+ public void setUp() throws Exception {
this.client.createCollection(INSTANCE_NAME, TEST_COLLECTION_NAME);
@@ -102,9 +100,7 @@
}
}
- public void tearDown()
- throws Exception {
- this.client.dropCollection(INSTANCE_NAME, TEST_COLLECTION_NAME);
+ public void tearDown() throws Exception {
+ this.client.dropCollection(INSTANCE_NAME, TEST_COLLECTION_NAME);
}
-
}
1.9 +12 -5
xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/CollectionTest.java
Index: CollectionTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/basic/CollectionTest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- CollectionTest.java 7 Aug 2003 20:13:26 -0000 1.8
+++ CollectionTest.java 8 Aug 2003 22:44:25 -0000 1.9
@@ -78,10 +78,17 @@
/* This is just to make sure that the system is up and running. */
public void testListInitialCollections() throws Exception {
String[] collections =
this.client.listCollections(XmlDbClientSetup.INSTANCE_NAME);
- assertEquals(2, collections.length);
List col = new Vector(Arrays.asList(collections));
- assertTrue(col.contains(XmlDbClientSetup.TEST_COLLECTION_NAME));
- assertTrue(col.contains("system"));
+ if (collections.length == 2) {
+ assertTrue(col.contains(XmlDbClientSetup.TEST_COLLECTION_NAME));
+ assertTrue(col.contains("system"));
+ } else if (collections.length == 3) {
+ assertTrue(col.contains(XmlDbClientSetup.TEST_COLLECTION_NAME));
+ assertTrue(col.contains("system"));
+ assertTrue(col.contains("meta"));
+ } else {
+ fail("Initial number of collections should be 2, or 3 with
meta");
+ }
}
public void testCreateNestedCollection() throws Exception {
1.2 +2 -3
xml-xindice/java/tests/src/org/apache/xindice/integration/client/services/MetaTest.java
Index: MetaTest.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/integration/client/services/MetaTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MetaTest.java 8 Aug 2003 13:48:35 -0000 1.1
+++ MetaTest.java 8 Aug 2003 22:44:25 -0000 1.2
@@ -132,7 +132,6 @@
long modified2 = data.getLastModifiedTime();
assertEquals("Created time changed on update (diff: "+ (created2 -
created1) +")!", created1, created2);
assertTrue("Modified time has not changed on update", modified1 !=
modified2);
- System.out.println("End!");
}
}
