From 69dfd03985d21b6156c01d072e1cf79943e7c5a0 Mon Sep 17 00:00:00 2001 From: f1ori Date: Fri, 17 Jul 2009 20:58:21 +0000 Subject: [PATCH] reactivate unittests * fix old tests * add buildtarget "ant test" git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@6228 6c8d7289-2bf4-0310-a012-ef5d649a1542 --- build.xml | 47 ++++++++++++++++--- test/ParseVersion.java | 32 ------------- .../{data => crawler}/robotsParserTest.java | 8 ++-- .../parser/htmlParserTest.java} | 14 +++--- .../util/DateFormatterTest.java} | 6 +-- .../URLTest.java => yacy/yacyURLTest.java} | 8 ++-- test/de/anomic/yacy/yacyVersionTest.java | 34 ++++++++++++++ 7 files changed, 93 insertions(+), 56 deletions(-) delete mode 100644 test/ParseVersion.java rename test/de/anomic/{data => crawler}/robotsParserTest.java (84%) rename test/de/anomic/{plasma/plasmaParserTest.java => document/parser/htmlParserTest.java} (71%) rename test/de/anomic/{http/httpHeaderTest.java => kelondro/util/DateFormatterTest.java} (65%) rename test/de/anomic/{net/URLTest.java => yacy/yacyURLTest.java} (90%) create mode 100644 test/de/anomic/yacy/yacyVersionTest.java diff --git a/build.xml b/build.xml index 5028333a0..31019d1b6 100644 --- a/build.xml +++ b/build.xml @@ -156,7 +156,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -233,10 +233,10 @@ source="${javacSource}" target="${javacTarget}" /> - + - + @@ -539,6 +539,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -593,7 +626,9 @@ + + @@ -736,7 +771,7 @@ - + Must set property 'classname' @@ -805,7 +840,7 @@ - + diff --git a/test/ParseVersion.java b/test/ParseVersion.java deleted file mode 100644 index 8acc0dc23..000000000 --- a/test/ParseVersion.java +++ /dev/null @@ -1,32 +0,0 @@ -import junit.framework.TestCase; - -public class ParseVersion extends TestCase { - - /** - * Test method for 'yacy.combinedVersionString2PrettyString(String)' - * @author Bost - */ - public void testCombinedVersionString2PrettyString() { - assertEquals("dev/00000", yacy.combined2prettyVersion("")); // not a number - assertEquals("dev/00000", yacy.combined2prettyVersion(" ")); // not a number - assertEquals("dev/02417", yacy.combined2prettyVersion("0.10002417")); - assertEquals("dev/02440", yacy.combined2prettyVersion("0.1000244")); - assertEquals("dev/02417", yacy.combined2prettyVersion("0.10002417")); - assertEquals("dev/00000", yacy.combined2prettyVersion("0.100024400")); // input is too long - assertEquals("dev/02440", yacy.combined2prettyVersion("0.1090244")); - assertEquals("0.110/02440", yacy.combined2prettyVersion("0.1100244")); - assertEquals("0.111/02440", yacy.combined2prettyVersion("0.1110244")); - assertEquals("dev/00000", yacy.combined2prettyVersion("0.0")); // input is valid - no warning generated - assertEquals("dev/00000", yacy.combined2prettyVersion(" 0.11102440")); // spaces are not allowed - assertEquals("dev/00000", yacy.combined2prettyVersion("0.111")); // input is too short - assertEquals("dev/00000", yacy.combined2prettyVersion("0.1112440\t\n")); // \t and \n are not allowed - assertEquals("dev/00000", yacy.combined2prettyVersion("124353432xxxx4546399999")); // not a number + too long - assertEquals("dev/00000", yacy.combined2prettyVersion("123456789x")); // not a number - assertEquals("dev/00000", yacy.combined2prettyVersion("9999999999")); // missing decimal point - assertEquals("dev/00000", yacy.combined2prettyVersion("999.999999")); // floating point part must have 3 and SVN-Version 5 digits - assertEquals("0.999/99999", yacy.combined2prettyVersion("0.99999999")); - assertEquals("99999.004/56789", yacy.combined2prettyVersion("99999.00456789")); - assertEquals("dev/00000", yacy.combined2prettyVersion("99999.003456789")); // input is too long - } - -} diff --git a/test/de/anomic/data/robotsParserTest.java b/test/de/anomic/crawler/robotsParserTest.java similarity index 84% rename from test/de/anomic/data/robotsParserTest.java rename to test/de/anomic/crawler/robotsParserTest.java index daf2d8c8c..ad066a244 100644 --- a/test/de/anomic/data/robotsParserTest.java +++ b/test/de/anomic/crawler/robotsParserTest.java @@ -1,11 +1,11 @@ -package de.anomic.data; +package de.anomic.crawler; import junit.framework.TestCase; -import de.anomic.net.URL; +import de.anomic.yacy.yacyURL; public class robotsParserTest extends TestCase { public void testDownload() throws Exception { - URL robotsURL = new URL("http://www.bigfoot2002.de.vu/robots.txt"); + /*yacyURL robotsURL = new yacyURL("http://www.bigfoot2002.de.vu/robots.txt"); Object[] result = robotsParser.downloadRobotsTxt(robotsURL,5,null); if (result != null) { @@ -15,6 +15,6 @@ public class robotsParserTest extends TestCase { System.out.println("-------------------------------- Robots.txt START: -------------------------------"); System.out.println(new String((byte[])result[robotsParser.DOWNLOAD_ROBOTS_TXT])); System.out.println("-------------------------------- Robots.txt END: ---------------------------------"); - } + }*/ } } diff --git a/test/de/anomic/plasma/plasmaParserTest.java b/test/de/anomic/document/parser/htmlParserTest.java similarity index 71% rename from test/de/anomic/plasma/plasmaParserTest.java rename to test/de/anomic/document/parser/htmlParserTest.java index a35045f23..31c092951 100644 --- a/test/de/anomic/plasma/plasmaParserTest.java +++ b/test/de/anomic/document/parser/htmlParserTest.java @@ -1,14 +1,14 @@ -package de.anomic.plasma; +package de.anomic.document.parser; import java.nio.charset.Charset; import junit.framework.TestCase; -public class plasmaParserTest extends TestCase { +public class htmlParserTest extends TestCase { public void testGetRealCharsetEncoding() { String[][] testStrings = new String[][] { - new String[]{null,"ISO-8859-1"}, + new String[]{null,"UTF-8"}, new String[]{"windows1250","windows-1250"}, new String[]{"windows_1250","windows-1250"}, new String[]{"ISO-8859-1","ISO-8859-1"}, @@ -17,8 +17,8 @@ public class plasmaParserTest extends TestCase { new String[]{"ISO88591","ISO-8859-1"}, new String[]{"iso_8859_1","ISO-8859-1"}, new String[]{"cp-1252","windows-1252"}, - new String[]{"gb_2312","x-EUC-CN"}, - new String[]{"gb_2312-80","x-EUC-CN"}, + new String[]{"gb_2312","gb2312"}, // was: x-EUC-CN + new String[]{"gb_2312-80","gb2312"}, // was: x-EUC-CN new String[]{"UTF-8;","UTF-8"} }; @@ -27,10 +27,10 @@ public class plasmaParserTest extends TestCase { String shouldBe = testStrings[i][1].toLowerCase(); // conversion result - String charset = plasmaParser.getRealCharsetEncoding(testStrings[i][0]).toLowerCase(); + String charset = htmlParser.patchCharsetEncoding(testStrings[i][0]).toLowerCase(); // test if equal - assertEquals(charset,shouldBe); + assertEquals(shouldBe, charset); System.out.println("testGetRealCharsetEncoding: " + testStrings[i][0] + " -> " + charset + " | Supported: " + Charset.isSupported(charset)); } diff --git a/test/de/anomic/http/httpHeaderTest.java b/test/de/anomic/kelondro/util/DateFormatterTest.java similarity index 65% rename from test/de/anomic/http/httpHeaderTest.java rename to test/de/anomic/kelondro/util/DateFormatterTest.java index bd14d806c..e427a5ea0 100644 --- a/test/de/anomic/http/httpHeaderTest.java +++ b/test/de/anomic/kelondro/util/DateFormatterTest.java @@ -1,16 +1,16 @@ -package de.anomic.http; +package de.anomic.kelondro.util; import java.util.Date; import junit.framework.TestCase; -public class httpHeaderTest extends TestCase { +public class DateFormatterTest extends TestCase { /** * Test of httpHeader date parsing routine */ public void testParseHTTPDate() { - Date parsedDate = httpHeader.parseHTTPDate("Tue, 08 Jul 2003 21:22:46 GMT"); + Date parsedDate = DateFormatter.parseHTTPDate("Tue, 08 Jul 2003 21:22:46 GMT"); // returned date must not be null assertNotNull(parsedDate); diff --git a/test/de/anomic/net/URLTest.java b/test/de/anomic/yacy/yacyURLTest.java similarity index 90% rename from test/de/anomic/net/URLTest.java rename to test/de/anomic/yacy/yacyURLTest.java index a6a349a0d..a34f86e33 100644 --- a/test/de/anomic/net/URLTest.java +++ b/test/de/anomic/yacy/yacyURLTest.java @@ -1,10 +1,10 @@ -package de.anomic.net; +package de.anomic.yacy; import java.net.MalformedURLException; import junit.framework.TestCase; -public class URLTest extends TestCase { +public class yacyURLTest extends TestCase { public void testResolveBackpath() throws MalformedURLException { String[][] testStrings = new String[][] { @@ -21,7 +21,7 @@ public class URLTest extends TestCase { new String[]{"/home/..test/../hallo/../","/home/"} }; - URL urlObj = new URL("http://yacy.net"); + yacyURL urlObj = new yacyURL("http://yacy.net"); for (int i=0; i < testStrings.length; i++) { // desired conversion result System.out.print("testResolveBackpath: " + testStrings[i][0]); @@ -51,7 +51,7 @@ public class URLTest extends TestCase { String shouldBe = testStrings[i][1]; // conversion result - String resolvedURL = (new URL(testStrings[i][0])).toString(); + String resolvedURL = (new yacyURL(testStrings[i][0])).toString(); // test if equal assertEquals(shouldBe,resolvedURL); diff --git a/test/de/anomic/yacy/yacyVersionTest.java b/test/de/anomic/yacy/yacyVersionTest.java new file mode 100644 index 000000000..906fb38bf --- /dev/null +++ b/test/de/anomic/yacy/yacyVersionTest.java @@ -0,0 +1,34 @@ +package de.anomic.yacy; + +import junit.framework.TestCase; + +public class yacyVersionTest extends TestCase { + + /** + * Test method for 'yacy.combinedVersionString2PrettyString(String)' + * @author Bost + */ + public void testCombinedVersionString2PrettyString() { + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("")); // not a number + assertEquals("dev/00000", yacyVersion.combined2prettyVersion(" ")); // not a number + assertEquals("dev/02417", yacyVersion.combined2prettyVersion("0.10002417")); + assertEquals("dev/02440", yacyVersion.combined2prettyVersion("0.1000244")); + assertEquals("dev/02417", yacyVersion.combined2prettyVersion("0.10002417")); + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("0.100024400")); // input is too long + assertEquals("dev/02440", yacyVersion.combined2prettyVersion("0.1090244")); + assertEquals("0.110/02440", yacyVersion.combined2prettyVersion("0.1100244")); + assertEquals("0.111/02440", yacyVersion.combined2prettyVersion("0.1110244")); + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("0.0")); // input is valid - no warning generated + assertEquals("dev/00000", yacyVersion.combined2prettyVersion(" 0.11102440")); // spaces are not allowed + assertEquals("0.111/00000", yacyVersion.combined2prettyVersion("0.111")); // was (input is too short) + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("0.1112440\t\n")); // \t and \n are not allowed + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("124353432xxxx4546399999")); // not a number + too long + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("123456789x")); // not a number + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("9999999999")); // missing decimal point + assertEquals("999.999/99900", yacyVersion.combined2prettyVersion("999.999999")); // was (floating point part must have 3 and SVN-Version 5 digits) + assertEquals("0.999/99999", yacyVersion.combined2prettyVersion("0.99999999")); + assertEquals("99999.004/56789", yacyVersion.combined2prettyVersion("99999.00456789")); + assertEquals("dev/00000", yacyVersion.combined2prettyVersion("99999.003456789")); // input is too long + } + +}