kevinross 2003/07/15 08:21:17
Modified: java/tests/src/org/apache/xindice/core/filer
FilerTestCase.java FilerTestSetup.java
Log:
perusing code...formatting
Revision Changes Path
1.6 +211 -224
xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestCase.java
Index: FilerTestCase.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestCase.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FilerTestCase.java 6 Feb 2003 04:56:39 -0000 1.5
+++ FilerTestCase.java 15 Jul 2003 15:21:17 -0000 1.6
@@ -56,7 +56,6 @@
*
* $Id$
*/
-
package org.apache.xindice.core.filer;
import org.apache.xindice.core.data.Key;
@@ -74,228 +73,216 @@
* @author Kimbro Staken <[EMAIL PROTECTED]>
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
-public class FilerTestCase
- extends TestCase {
+public class FilerTestCase extends TestCase {
- static public final String TEST_COLLECTION_NAME = "tests";
- static public final Value TEST_VALUE = new
Value("<test><test></test><test>Just a test</test></test>");
- static public final Value TEST_VALUE_2 = new
Value("<test><test></test><test>Just a test 2</test></test>");
- static public final Value TEST_VALUE_3 = new
Value("<test><test></test><test>Just a test 3</test></test>");
- static public final Key TEST_KEY = new Key("test.xml");
-
- protected Filer filer;
-
- public void setFiler(Filer filer) {
- this.filer = filer;
- }
-
- public void setUp()
- throws Exception {
- RecordSet set = filer.getRecordSet();
- while (set.hasMoreRecords()) {
- Key key = set.getNextKey();
- filer.deleteRecord(key);
- }
- assertEquals(0, filer.getRecordCount());
- }
-
- public String getName() {
- return this.filer.getName();
- }
-
- public void testSuccessWriteRecord()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- Record result = filer.readRecord(TEST_KEY);
- assertEquals(TEST_VALUE, result.getValue());
-
- RecordSet set = filer.getRecordSet();
- assertEquals(result.getValue(), set.getNextRecord().getValue());
- assertTrue(set.hasMoreRecords() == false);
-
- filer.deleteRecord(TEST_KEY);
- assertEquals(0, filer.getRecordCount());
- }
-
- public void testFailReadDeletedRecord() throws Exception {
- Record result = filer.readRecord(TEST_KEY);
- assertNull(result);
- }
-
- public void testFailWriteRecordNullKey()
- throws Exception {
- try {
- filer.writeRecord(null, TEST_VALUE);
- } catch (FilerException e) {
- return;
- }
- fail("Expecting FilerException");
- }
-
- public void testFailWriteRecordNullValue()
- throws Exception {
- try {
- filer.writeRecord(TEST_KEY, null);
- } catch (FilerException e) {
- return;
- }
- fail("Expecting FilerException");
- }
-
- public void testFailWriteRecordNullValueKey()
- throws Exception {
- try {
- filer.writeRecord(null, null);
- } catch (FilerException e) {
- return;
- }
- fail("Expecting FilerException");
- }
-
- public void testReadRecord()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // Valid key
- Record result = filer.readRecord(TEST_KEY);
- assertEquals(TEST_VALUE, result.getValue());
- }
-
- public void testFailReadRecordNullKey() throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // Null key
- Record result = filer.readRecord(null);
- assertNull(result);
- }
-
- public void testFailReadRecordEmptyKey()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // Empty key
- Record result = filer.readRecord(new Key(""));
- assertNull(result);
- }
-
- public void testFailReadRecordUnknownKey()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // Non-existant key
- Record result = filer.readRecord(new Key("non-existant-key"));
- assertNull(result);
- }
-
- public void testDeleteRecord()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // Valid key
- filer.deleteRecord(TEST_KEY);
- assertEquals(0, filer.getRecordCount());
- Record result = filer.readRecord(TEST_KEY);
- assertNull(result);
- }
-
- public void testDeleteRecordNullKey()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // These should all just fail silently.
- assertTrue(false == filer.deleteRecord(null));
- assertEquals(1, filer.getRecordCount());
- }
-
- public void testDeleteRecordEmptyKey()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // These should all just fail silently.
- assertTrue(false == filer.deleteRecord(new Key("")));
- assertEquals(1, filer.getRecordCount());
- }
-
- public void testDeleteRecordWrongKey()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertEquals(1, filer.getRecordCount());
-
- // These should all just fail silently.
- assertTrue(false == filer.deleteRecord(new Key("non-existant-key")));
- assertEquals(1, filer.getRecordCount());
- }
-
- public void testGetRecordCount()
- throws Exception {
- assertEquals(0, filer.getRecordCount());
-
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertTrue(filer.writeRecord(new Key("test1"), TEST_VALUE));
- assertTrue(filer.writeRecord(new Key("test2"), TEST_VALUE));
- assertEquals(3, filer.getRecordCount());
-
- assertTrue(filer.writeRecord(new Key("test3"), TEST_VALUE));
- assertEquals(4, filer.getRecordCount());
-
- assertTrue(filer.deleteRecord(new Key("test3")));
- assertEquals(3, filer.getRecordCount());
-
- assertTrue(filer.deleteRecord(TEST_KEY));
- assertTrue(filer.deleteRecord(new Key("test1")));
- assertTrue(filer.deleteRecord(new Key("test2")));
-
- assertEquals(0, filer.getRecordCount());
- }
-
- public void testGetRecordSet()
- throws Exception {
- assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
- assertTrue(filer.writeRecord(new Key("test2"), TEST_VALUE_2));
- assertTrue(filer.writeRecord(new Key("test3"), TEST_VALUE_3));
-
- RecordSet result = filer.getRecordSet();
- assertNotNull(result);
-
- List results = new Vector();
- while (result.hasMoreRecords()) {
- results.add(result.getNextRecord().getValue());
- }
- assertEquals(3, results.size());
- assertTrue(results.contains(TEST_VALUE));
- assertTrue(results.contains(TEST_VALUE_2));
- assertTrue(results.contains(TEST_VALUE_3));
-
- assertTrue(filer.deleteRecord(TEST_KEY));
- assertTrue(filer.deleteRecord(new Key("test2")));
- assertTrue(filer.deleteRecord(new Key("test3")));
-
- result = filer.getRecordSet();
- assertTrue(!result.hasMoreRecords());
- }
-
- public void testInsertManyDocuments() throws Exception {
- int iterations = 1000;
- for (int i = 0; i < iterations; i++) {
- assertTrue(filer.writeRecord(new Key("key" + i), TEST_VALUE));
- }
-
- assertTrue(filer.getRecordCount() == iterations);
-
- for (int i = 0; i < iterations; i++) {
- assertTrue(filer.deleteRecord(new Key("key" + i)));
- }
+ static public final String TEST_COLLECTION_NAME = "tests";
+ static public final Value TEST_VALUE = new
Value("<test><test></test><test>Just a test</test></test>");
+ static public final Value TEST_VALUE_2 = new
Value("<test><test></test><test>Just a test 2</test></test>");
+ static public final Value TEST_VALUE_3 = new
Value("<test><test></test><test>Just a test 3</test></test>");
+ static public final Key TEST_KEY = new Key("test.xml");
+
+ protected Filer filer;
+
+ public void setFiler(Filer filer) {
+ this.filer = filer;
+ }
+
+ public void setUp() throws Exception {
+ RecordSet set = filer.getRecordSet();
+ while (set.hasMoreRecords()) {
+ Key key = set.getNextKey();
+ filer.deleteRecord(key);
+ }
+ assertEquals(0, filer.getRecordCount());
+ }
+
+ public String getName() {
+ return this.filer.getName();
+ }
+
+ public void testSuccessWriteRecord() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ Record result = filer.readRecord(TEST_KEY);
+ assertEquals(TEST_VALUE, result.getValue());
+
+ RecordSet set = filer.getRecordSet();
+ assertEquals(result.getValue(), set.getNextRecord().getValue());
+ assertTrue(set.hasMoreRecords() == false);
+
+ filer.deleteRecord(TEST_KEY);
+ assertEquals(0, filer.getRecordCount());
+ }
+
+ public void testFailReadDeletedRecord() throws Exception {
+ Record result = filer.readRecord(TEST_KEY);
+ assertNull(result);
+ }
+
+ public void testFailWriteRecordNullKey() throws Exception {
+ try {
+ filer.writeRecord(null, TEST_VALUE);
+ }
+ catch (FilerException e) {
+ return;
+ }
+ fail("Expecting FilerException");
+ }
+
+ public void testFailWriteRecordNullValue() throws Exception {
+ try {
+ filer.writeRecord(TEST_KEY, null);
+ }
+ catch (FilerException e) {
+ return;
+ }
+ fail("Expecting FilerException");
+ }
+
+ public void testFailWriteRecordNullValueKey() throws Exception {
+ try {
+ filer.writeRecord(null, null);
+ }
+ catch (FilerException e) {
+ return;
+ }
+ fail("Expecting FilerException");
+ }
+
+ public void testReadRecord() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // Valid key
+ Record result = filer.readRecord(TEST_KEY);
+ assertEquals(TEST_VALUE, result.getValue());
+ }
+
+ public void testFailReadRecordNullKey() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // Null key
+ Record result = filer.readRecord(null);
+ assertNull(result);
+ }
+
+ public void testFailReadRecordEmptyKey() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // Empty key
+ Record result = filer.readRecord(new Key(""));
+ assertNull(result);
+ }
+
+ public void testFailReadRecordUnknownKey() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // Non-existant key
+ Record result = filer.readRecord(new Key("non-existant-key"));
+ assertNull(result);
+ }
+
+ public void testDeleteRecord() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // Valid key
+ filer.deleteRecord(TEST_KEY);
+ assertEquals(0, filer.getRecordCount());
+ Record result = filer.readRecord(TEST_KEY);
+ assertNull(result);
+ }
+
+ public void testDeleteRecordNullKey() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // These should all just fail silently.
+ assertTrue(false == filer.deleteRecord(null));
+ assertEquals(1, filer.getRecordCount());
+ }
+
+ public void testDeleteRecordEmptyKey() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // These should all just fail silently.
+ assertTrue(false == filer.deleteRecord(new Key("")));
+ assertEquals(1, filer.getRecordCount());
+ }
+
+ public void testDeleteRecordWrongKey() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertEquals(1, filer.getRecordCount());
+
+ // These should all just fail silently.
+ assertTrue(false == filer.deleteRecord(new Key("non-existant-key")));
+ assertEquals(1, filer.getRecordCount());
+ }
+
+ public void testGetRecordCount() throws Exception {
+ assertEquals(0, filer.getRecordCount());
+
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertTrue(filer.writeRecord(new Key("test1"), TEST_VALUE));
+ assertTrue(filer.writeRecord(new Key("test2"), TEST_VALUE));
+ assertEquals(3, filer.getRecordCount());
+
+ assertTrue(filer.writeRecord(new Key("test3"), TEST_VALUE));
+ assertEquals(4, filer.getRecordCount());
+
+ assertTrue(filer.deleteRecord(new Key("test3")));
+ assertEquals(3, filer.getRecordCount());
+
+ assertTrue(filer.deleteRecord(TEST_KEY));
+ assertTrue(filer.deleteRecord(new Key("test1")));
+ assertTrue(filer.deleteRecord(new Key("test2")));
+
+ assertEquals(0, filer.getRecordCount());
+ }
+
+ public void testGetRecordSet() throws Exception {
+ assertTrue(filer.writeRecord(TEST_KEY, TEST_VALUE));
+ assertTrue(filer.writeRecord(new Key("test2"), TEST_VALUE_2));
+ assertTrue(filer.writeRecord(new Key("test3"), TEST_VALUE_3));
+
+ RecordSet result = filer.getRecordSet();
+ assertNotNull(result);
+
+ List results = new Vector();
+ while (result.hasMoreRecords()) {
+ results.add(result.getNextRecord().getValue());
+ }
+ assertEquals(3, results.size());
+ assertTrue(results.contains(TEST_VALUE));
+ assertTrue(results.contains(TEST_VALUE_2));
+ assertTrue(results.contains(TEST_VALUE_3));
+
+ assertTrue(filer.deleteRecord(TEST_KEY));
+ assertTrue(filer.deleteRecord(new Key("test2")));
+ assertTrue(filer.deleteRecord(new Key("test3")));
+
+ result = filer.getRecordSet();
+ assertTrue(!result.hasMoreRecords());
+ }
+
+ public void testInsertManyDocuments() throws Exception {
+ int iterations = 1000;
+ for (int i = 0; i < iterations; i++) {
+ assertTrue(filer.writeRecord(new Key("key" + i), TEST_VALUE));
+ }
+
+ assertTrue(filer.getRecordCount() == iterations);
+
+ for (int i = 0; i < iterations; i++) {
+ assertTrue(filer.deleteRecord(new Key("key" + i)));
+ }
- assertTrue(filer.getRecordCount() == 0);
- }
+ assertTrue(filer.getRecordCount() == 0);
+ }
}
1.3 +40 -47
xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestSetup.java
Index: FilerTestSetup.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/tests/src/org/apache/xindice/core/filer/FilerTestSetup.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FilerTestSetup.java 28 Oct 2002 08:39:20 -0000 1.2
+++ FilerTestSetup.java 15 Jul 2003 15:21:17 -0000 1.3
@@ -56,64 +56,57 @@
*
* $Id$
*/
-
package org.apache.xindice.core.filer;
-import org.apache.xindice.util.Configuration;
-import org.apache.xindice.xml.dom.DOMParser;
+import java.io.File;
import junit.framework.Test;
import junit.framework.TestSuite;
-
import junitx.extensions.TestSetup;
-import java.io.File;
+import org.apache.xindice.util.Configuration;
+import org.apache.xindice.xml.dom.DOMParser;
/**
* @version $Revision$, $Date$
* @author Vladimir R. Bossicard <[EMAIL PROTECTED]>
*/
-public class FilerTestSetup
- extends TestSetup {
+public class FilerTestSetup extends TestSetup {
- protected Filer filer;
+ protected Filer filer;
- public FilerTestSetup(Test test,
- Filer filer) {
- super(test);
- this.filer = filer;
- }
-
- protected void initFiler()
- throws Exception {
- filer.setLocation(new File(FilerTestCase.TEST_COLLECTION_NAME),
FilerTestCase.TEST_COLLECTION_NAME);
- filer.setConfig(new Configuration(DOMParser.toDocument("<filer
location=\"tests\"/>")));
- if (!filer.exists()) {
- filer.create();
- }
-
- filer.open();
- }
-
- protected void initTests(TestSuite suite) {
- // TestSuite suite = ( TestSuite ) this.fTest;
- for (int ii = 0; ii < suite.testCount(); ii++) {
- FilerTestCase test = (FilerTestCase) suite.testAt(ii);
- test.setFiler(filer);
- }
- }
-
- public void setUp()
- throws Exception {
- initFiler();
- initTests((TestSuite) this.fTest);
- }
-
- public void tearDown()
- throws Exception {
- if (filer != null) {
- filer.close();
- }
- }
+ public FilerTestSetup(Test test, Filer filer) {
+ super(test);
+ this.filer = filer;
+ }
+
+ protected void initFiler() throws Exception {
+ filer.setLocation(new File(FilerTestCase.TEST_COLLECTION_NAME),
FilerTestCase.TEST_COLLECTION_NAME);
+ filer.setConfig(new Configuration(DOMParser.toDocument("<filer
location=\"tests\"/>")));
+ if (!filer.exists()) {
+ filer.create();
+ }
+
+ filer.open();
+ }
+
+ protected void initTests(TestSuite suite) {
+ // TestSuite suite = ( TestSuite ) this.fTest;
+ for (int ii = 0; ii < suite.testCount(); ii++) {
+ FilerTestCase test = (FilerTestCase) suite.testAt(ii);
+ test.setFiler(filer);
+ }
+ }
+
+ public void setUp() throws Exception {
+ initFiler();
+ initTests((TestSuite) this.fTest);
+ }
+
+ public void tearDown() throws Exception {
+ if (filer != null) {
+ filer.close();
+ }
+ }
}
