[bvalid-codewatch] SF.net SVN: bvalid: [28] trunk
Status: Beta
Brought to you by:
cwilper
Menu
▾
▴
[bvalid-codewatch] SF.net SVN: bvalid: [28] trunk
|
From: <cw...@us...> - 2006-05-04 17:57:22
|
Revision: 28 Author: cwilper Date: 2006-05-04 10:57:09 -0700 (Thu, 04 May 2006) ViewCVS: http://svn.sourceforge.net/bvalid/?rev=28&view=rev Log Message: ----------- more tests Modified Paths: -------------- trunk/build.xml trunk/src/doc/style.css trunk/src/java/net/sf/bvalid/ValidatorOption.java trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java Added Paths: ----------- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java trunk/src/test/net/sf/bvalid/catalog/ trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java Removed Paths: ------------- trunk/src/test/net/sf/bvalid/BValidTestSuite.java Modified: trunk/build.xml =================================================================== --- trunk/build.xml 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/build.xml 2006-05-04 17:57:09 UTC (rev 28) @@ -21,6 +21,7 @@ <path refid="compile.path"/> <pathelement location="build/classes"/> <pathelement location="build/testclasses"/> + <pathelement location="src/config"/> </path> <target name="classes" @@ -110,18 +111,26 @@ </target> <target name="test" description="Run tests" depends="testclasses"> - <!-- - For this task to run, prior to running ant, set CLASSPATH=lib\junit.jar - --> <junit printsummary="yes" haltonfailure="yes" showoutput="true"> <formatter type="plain" usefile="false"/> <classpath refid="test.path"/> <sysproperty key="propname" value="propvalue"/> - <test name="net.sf.bvalid.SchemaLanguageTest"/> - <test name="net.sf.bvalid.ValidatorFactoryTest"/> + <test name="net.sf.bvalid.BValidPackageTestSuite"/> </junit> </target> + <target name="itest" description="Run tests interactively" depends="testclasses"> + <java classname="net.sf.bvalid.BValidPackageTestSuite" + fork="yes"> + <classpath refid="test.path"/> + <sysproperty key="org.apache.commons.logging.LogFactory" + value="org.apache.commons.logging.impl.Log4jFactory"/> + <sysproperty key="org.apache.commons.logging.Log" + value="org.apache.commons.logging.impl.Log4JLogger"/> + <sysproperty key="log4j.ignoreTCL" value="true"/> + </java> + </target> + <target name="prep" description="prepare for a build"> <mkdir dir="build"/> Modified: trunk/src/doc/style.css =================================================================== --- trunk/src/doc/style.css 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/doc/style.css 2006-05-04 17:57:09 UTC (rev 28) @@ -152,7 +152,7 @@ min-width: 600px; padding: 5px; white-space: pre; - font-size: 10pt; + font-size: 12pt; } .reference { Modified: trunk/src/java/net/sf/bvalid/ValidatorOption.java =================================================================== --- trunk/src/java/net/sf/bvalid/ValidatorOption.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/java/net/sf/bvalid/ValidatorOption.java 2006-05-04 17:57:09 UTC (rev 28) @@ -100,6 +100,7 @@ if (_validValues == null) { return true; } else { + if (value == null) return false; for (int i = 0; i < _validValues.length; i++) { if (value.equals(_validValues[i])) { return true; Copied: trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java (from rev 27, trunk/src/test/net/sf/bvalid/BValidTestSuite.java) =================================================================== --- trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java (rev 0) +++ trunk/src/test/net/sf/bvalid/BValidPackageTestSuite.java 2006-05-04 17:57:09 UTC (rev 28) @@ -0,0 +1,29 @@ +package net.sf.bvalid; + +import junit.framework.Test; +import junit.framework.TestSuite; +import junit.swingui.TestRunner; + +import net.sf.bvalid.catalog.CatalogPackageTestSuite; + +public class BValidPackageTestSuite { + + public static Test suite() { + + TestSuite suite = new TestSuite(BValidPackageTestSuite.class.getName()); + + // classes in this package + suite.addTestSuite(SchemaLanguageTest.class); + suite.addTestSuite(ValidatorFactoryTest.class); + suite.addTestSuite(ValidatorOptionTest.class); + + // sub-packages + suite.addTest(CatalogPackageTestSuite.suite()); + + return suite; + } + + public static void main(String[] args) { + TestRunner.run(BValidPackageTestSuite.class); + } +} Deleted: trunk/src/test/net/sf/bvalid/BValidTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/BValidTestSuite.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/BValidTestSuite.java 2006-05-04 17:57:09 UTC (rev 28) @@ -1,27 +0,0 @@ -package net.sf.bvalid; - -import junit.framework.Test; -import junit.framework.TestSuite; - -public class BValidTestSuite { - - public static Test suite() { - - TestSuite suite = new TestSuite(); - - suite.addTestSuite(SchemaLanguageTest.class); - suite.addTestSuite(ValidatorFactoryTest.class); - suite.addTestSuite(ValidatorOptionTest.class); - - // - // Another example test suite of tests. - // -// suite.addTest(CreditCardTestSuite.suite()); - - return suite; - } - - public static void main(String[] args) { - junit.textui.TestRunner.run(suite()); - } -} Modified: trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/SchemaLanguageTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -1,7 +1,7 @@ package net.sf.bvalid; import junit.framework.TestCase; -import junit.textui.TestRunner; +import junit.swingui.TestRunner; public class SchemaLanguageTest extends TestCase { Modified: trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/ValidatorFactoryTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -3,7 +3,7 @@ import java.util.*; import junit.framework.TestCase; -import junit.textui.TestRunner; +import junit.swingui.TestRunner; import net.sf.bvalid.locator.URLSchemaLocator; Modified: trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java 2006-05-04 16:08:44 UTC (rev 27) +++ trunk/src/test/net/sf/bvalid/ValidatorOptionTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -1,7 +1,7 @@ package net.sf.bvalid; import junit.framework.TestCase; -import junit.textui.TestRunner; +import junit.swingui.TestRunner; public class ValidatorOptionTest extends TestCase { Added: trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java =================================================================== --- trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java (rev 0) +++ trunk/src/test/net/sf/bvalid/catalog/CatalogPackageTestSuite.java 2006-05-04 17:57:09 UTC (rev 28) @@ -0,0 +1,21 @@ +package net.sf.bvalid.catalog; + +import junit.framework.Test; +import junit.framework.TestSuite; +import junit.swingui.TestRunner; + +public class CatalogPackageTestSuite { + + public static Test suite() { + + TestSuite suite = new TestSuite(CatalogPackageTestSuite.class.getName()); + + suite.addTestSuite(FileSchemaIndexTest.class); + + return suite; + } + + public static void main(String[] args) { + TestRunner.run(CatalogPackageTestSuite.class); + } +} Added: trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java =================================================================== --- trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java (rev 0) +++ trunk/src/test/net/sf/bvalid/catalog/FileSchemaIndexTest.java 2006-05-04 17:57:09 UTC (rev 28) @@ -0,0 +1,60 @@ +package net.sf.bvalid.catalog; + +import java.io.*; +import java.util.*; + +import junit.framework.TestCase; +import junit.swingui.TestRunner; + +import net.sf.bvalid.ValidatorException; + +public class FileSchemaIndexTest extends TestCase { + + private File _file; + private FileSchemaIndex _index; + + public FileSchemaIndexTest(String name) { super (name); } + + public void setUp() throws Exception { + + _file = File.createTempFile("bvalid-test", ".dat"); + _index = new FileSchemaIndex(_file); + } + + public void tearDown() { + + _file.delete(); + } + + //---------------------------------------------------------[ Test methods ] + + public void testPutFilename() throws ValidatorException { + + _index.putFilename("urn:example:1", "file1"); + + Set uris = _index.getURISet(); + assertEquals("After putting, URI set had size " + uris.size() + ", not 1 as expected", + uris.size(), + 1); + + assertEquals("Set did not contain expected uri", uris.contains("urn:example:1"), true); + + String filename = _index.getFilename("urn:example:1"); + assertEquals("Got wrong filename", filename, "file1"); + } + + public void testRemoveMapping() throws ValidatorException { + + testPutFilename(); + + _index.removeMapping("urn:example:1"); + + int size = _index.getURISet().size(); + assertEquals("After removal, set was not empty as expected", size, 0); + } + + public static void main(String[] args) { + TestRunner.run(FileSchemaIndexTest.class); + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
