svn commit: r566416 - in /xml/xindice/trunk/java/tests/src/org/apache/xindice: core/indexer/ValueIndexerTest.java integration/client/basic/IndexTest.java

[vgritsenko]

Author: vgritsenko
Date: Wed Aug 15 16:58:48 2007
New Revision: 566416

URL: http://svn.apache.org/viewvc?view=rev&rev=566416
Log:
cleanup

Modified:
    
xml/xindice/trunk/java/tests/src/org/apache/xindice/core/indexer/ValueIndexerTest.java
    
xml/xindice/trunk/java/tests/src/org/apache/xindice/integration/client/basic/IndexTest.java

Modified: 
xml/xindice/trunk/java/tests/src/org/apache/xindice/core/indexer/ValueIndexerTest.java
URL: 
http://svn.apache.org/viewvc/xml/xindice/trunk/java/tests/src/org/apache/xindice/core/indexer/ValueIndexerTest.java?view=diff&rev=566416&r1=566415&r2=566416
==============================================================================
--- 
xml/xindice/trunk/java/tests/src/org/apache/xindice/core/indexer/ValueIndexerTest.java
 (original)
+++ 
xml/xindice/trunk/java/tests/src/org/apache/xindice/core/indexer/ValueIndexerTest.java
 Wed Aug 15 16:58:48 2007
@@ -95,7 +95,6 @@
         collection.insertDocument("key", document);
 
         IndexMatch[] match = query(ind, "[EMAIL PROTECTED]", "ab", 
IndexQuery.SW);
-
         assertEquals(2, match.length);
     }
 

Modified: 
xml/xindice/trunk/java/tests/src/org/apache/xindice/integration/client/basic/IndexTest.java
URL: 
http://svn.apache.org/viewvc/xml/xindice/trunk/java/tests/src/org/apache/xindice/integration/client/basic/IndexTest.java?view=diff&rev=566416&r1=566415&r2=566416
==============================================================================
--- 
xml/xindice/trunk/java/tests/src/org/apache/xindice/integration/client/basic/IndexTest.java
 (original)
+++ 
xml/xindice/trunk/java/tests/src/org/apache/xindice/integration/client/basic/IndexTest.java
 Wed Aug 15 16:58:48 2007
@@ -39,8 +39,8 @@
     }
 
     private String getIndexDef(String name) {
-        return "<?xml version=\"1.0\"?>" +
-               "<index class=\"org.apache.xindice.core.indexer.ValueIndexer\" 
name=\"" + name + "\" pattern=\"pattern\" />";
+        return "<?xml version='1.0'?>" +
+               "<index class='org.apache.xindice.core.indexer.ValueIndexer' 
name='" + name + "' pattern='pattern'/>";
     }
 
     public void testCreateDuplicateIndexer() throws Exception {
@@ -55,36 +55,33 @@
         }
     }
 
-    public void testCreateIndexerEmptyName() throws Exception {
+    public void testCreateIndexerNullDefinition() throws Exception {
         try {
-            this.client.createIndexer(TEST_COLLECTION_PATH, getIndexDef(""));
+            this.client.createIndexer(TEST_COLLECTION_PATH, (Document) null);
+            fail();
         } catch (XMLDBException e) {
             // assertTrue( e.getMessage().lastIndexOf( "No name specified" ) > 
0 );
-            return;
         }
-        fail();
     }
 
-    public void testCreateIndexerNullDefinition() throws Exception {
+    public void testCreateIndexerEmptyName() throws Exception {
         try {
-            this.client.createIndexer(TEST_COLLECTION_PATH, (Document)null);
+            this.client.createIndexer(TEST_COLLECTION_PATH, getIndexDef(""));
+            fail();
         } catch (XMLDBException e) {
             // assertTrue( e.getMessage().lastIndexOf( "No name specified" ) > 
0 );
-            return;
         }
-        fail();
     }
 
-    public void testCreateIndexerInvalidDefinition() throws Exception {
+    public void testCreateIndexerInvalidClass() throws Exception {
         try {
             this.client.createIndexer(TEST_COLLECTION_PATH,
-                    "<?xml version=\"1.0\"?>" +
-                    "<index 
class=\"org.apache.xindice.core.indexer.BlahIndexer\" name=\"blah\" 
pattern=\"blah\" />");
+                    "<?xml version='1.0'?>" +
+                    "<index 
class='org.apache.xindice.core.indexer.BlahIndexer' name='blah' 
pattern='blah'/>");
+            fail();
         } catch (XMLDBException e) {
             // assertTrue( e.getMessage().lastIndexOf( "No name specified" ) > 
0 );
-            return;
         }
-        fail();
     }
 
     public void testDropIndexerTwice() throws Exception {
@@ -94,31 +91,28 @@
         // drop the newly created index
         try {
             this.client.dropIndexer(TEST_COLLECTION_PATH, "droptwice");
+            fail();
         } catch (XMLDBException e) {
             //assertTrue( e.getMessage().lastIndexOf( "Index Value Null" ) > 0 
);
-            return;
         }
-        fail();
     }
 
     public void testDropIndexerInvalidName() throws Exception {
         try {
             this.client.dropIndexer(TEST_COLLECTION_PATH, "");
+            fail();
         } catch (XMLDBException e) {
             //assertTrue( e.getMessage().lastIndexOf( "Index Value Null" ) > 0 
);
-            return;
         }
-        fail();
     }
 
     public void testDropIndexerNullName() throws Exception {
         try {
             this.client.dropIndexer(TEST_COLLECTION_PATH, null);
+            fail();
         } catch (XMLDBException e) {
             //assertTrue( e.getMessage().lastIndexOf( "Index Value Null" ) > 0 
);
-            return;
         }
-        fail();
     }
 
     public void testListIndexers() throws Exception {