vgritsenko 2003/08/08 19:56:02
Modified: java/tests/src/org/apache/xindice/integration/client
XmlDbClient.java
java/tests/src/org/apache/xindice/integration/client/basic
CollectionTest.java
Log:
Add test for the unknown database
Revision Changes Path
1.11 +6 -2
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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XmlDbClient.java 8 Aug 2003 22:45:28 -0000 1.10
+++ XmlDbClient.java 9 Aug 2003 02:56:02 -0000 1.11
@@ -81,6 +81,10 @@
this.driver = driver;
}
+ public String getDriver() {
+ return driver;
+ }
+
public String getName(String path) throws Exception {
Collection col = DatabaseManager.getCollection(driver + "/" + path);
if (col == null) {
1.10 +16 -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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- CollectionTest.java 8 Aug 2003 22:44:25 -0000 1.9
+++ CollectionTest.java 9 Aug 2003 02:56:02 -0000 1.10
@@ -64,6 +64,7 @@
import org.xmldb.api.base.XMLDBException;
import org.xmldb.api.base.Collection;
+import org.xmldb.api.base.ErrorCodes;
import java.util.Arrays;
import java.util.List;
@@ -75,6 +76,17 @@
*/
public class CollectionTest extends AbstractXmlDbClientTest {
+ public void testGetUnknownDatabase() throws Exception {
+ try {
+ Collection col = this.client.getCollection("doesnotexist");
+ fail("Expected ErrorCodes.NO_SUCH_DATABASE (" +
ErrorCodes.NO_SUCH_DATABASE + "), got collection: " + col);
+ } catch (XMLDBException e) {
+ if (e.errorCode != ErrorCodes.NO_SUCH_DATABASE) {
+ fail("Expected ErrorCodes.NO_SUCH_DATABASE (" +
ErrorCodes.NO_SUCH_DATABASE + "), got: " + e);
+ }
+ }
+ }
+
/* 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);
@@ -234,7 +246,7 @@
assertEquals("testing", parent.getName());
parent = parent.getParentCollection();
-
+
// is this assertion correct? The xml rpc driver exposes the "db"
collection
// the embeded doesn't. I think the xmlrpc driver is correct, and
the test
// is wrong, just looking for someone to confirm this.
@@ -242,7 +254,7 @@
this.client.dropCollection(TEST_COLLECTION_PATH, "childcol");
}
-
+
public void testGetCollectionUnknown() throws Exception {
assertNull(this.client.getCollection(TEST_COLLECTION_PATH +
"/unknown"));
}
@@ -257,5 +269,4 @@
this.client.dropCollection(TEST_COLLECTION_PATH, "colcount");
assertEquals(0, col.getChildCollectionCount());
}
-
}
