From 5325670a8ecdb9020292dcdf4881c9926f99abf4 Mon Sep 17 00:00:00 2001 From: Henschi Date: Thu, 3 Apr 2025 20:13:25 +0200 Subject: [PATCH] fix tests --- .../document/parser/GenericXMLParserTest.java | 10 +++---- .../yacy/peers/operation/yacyVersionTest.java | 30 +++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/test/java/net/yacy/document/parser/GenericXMLParserTest.java b/test/java/net/yacy/document/parser/GenericXMLParserTest.java index 9d84ac73a..e49509780 100644 --- a/test/java/net/yacy/document/parser/GenericXMLParserTest.java +++ b/test/java/net/yacy/document/parser/GenericXMLParserTest.java @@ -294,7 +294,7 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(3, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); } finally { @@ -330,7 +330,7 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(3, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); } finally { @@ -395,7 +395,7 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(5, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://wiki.yacy.net/index.php/"))); @@ -417,7 +417,7 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(2, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); } finally { inStream.close(); @@ -457,7 +457,7 @@ public class GenericXMLParserTest { final Collection detectedAnchors = documents[0].getAnchors(); assertNotNull(detectedAnchors); assertEquals(3, detectedAnchors.size()); - assertTrue(detectedAnchors.contains(new AnchorURL("https://www.w3.org/1999/xhtml"))); + assertTrue(detectedAnchors.contains(new AnchorURL("http://www.w3.org/1999/xhtml"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://yacy.net"))); assertTrue(detectedAnchors.contains(new AnchorURL("https://community.searchlab.eu"))); } finally { diff --git a/test/java/net/yacy/peers/operation/yacyVersionTest.java b/test/java/net/yacy/peers/operation/yacyVersionTest.java index 8de1dfe11..ac194f54e 100644 --- a/test/java/net/yacy/peers/operation/yacyVersionTest.java +++ b/test/java/net/yacy/peers/operation/yacyVersionTest.java @@ -12,26 +12,26 @@ public class yacyVersionTest extends TestCase { */ @Test public void testCombinedVersionString2PrettyString() { - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("")); // not a number - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion(" ")); // not a number + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion("")); // not a number + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion(" ")); // not a number Assert.assertArrayEquals(new String[]{"dev","02417"}, yacyVersion.combined2prettyVersion("0.10002417")); Assert.assertArrayEquals(new String[]{"dev","0244"}, yacyVersion.combined2prettyVersion("0.1000244")); Assert.assertArrayEquals(new String[]{"dev","02417"}, yacyVersion.combined2prettyVersion("0.10002417")); - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("0.100024400")); // input is too long + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion("0.100024400")); // input is too long Assert.assertArrayEquals(new String[]{"dev","0244"}, yacyVersion.combined2prettyVersion("0.1090244")); Assert.assertArrayEquals(new String[]{"0.110","0244"}, yacyVersion.combined2prettyVersion("0.1100244")); - Assert.assertArrayEquals(new String[]{"0.111","0244"}, yacyVersion.combined2prettyVersion("0.1110244")); - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("0.0")); // input is valid - no warning generated - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion(" 0.11102440")); // spaces are not allowed - Assert.assertArrayEquals(new String[]{"0.111","0000"}, yacyVersion.combined2prettyVersion("0.111")); // was (input is too short) - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("0.1112440\t\n")); // \t and \n are not allowed - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("124353432xxxx4546399999")); // not a number + too long - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("123456789x")); // not a number - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("9999999999")); // missing decimal point - Assert.assertArrayEquals(new String[]{"999.999","9990"}, yacyVersion.combined2prettyVersion("999.999999")); // was (floating point part must have 3 and SVN-Version 4 digits) - Assert.assertArrayEquals(new String[]{"0.999","99999"}, yacyVersion.combined2prettyVersion("0.99999999")); - Assert.assertArrayEquals(new String[]{"99999.004","56789"}, yacyVersion.combined2prettyVersion("99999.00456789")); - Assert.assertArrayEquals(new String[]{"dev","0000"}, yacyVersion.combined2prettyVersion("99999.003456789")); // input is too long + Assert.assertArrayEquals(new String[]{"0.111","0244"}, yacyVersion.combined2prettyVersion("0.1110244")); + Assert.assertArrayEquals(new String[]{"dev",""}, yacyVersion.combined2prettyVersion("0.0")); // input is valid - no warning generated + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion(" 0.11102440")); // spaces are not allowed + Assert.assertArrayEquals(new String[]{"0.111",""}, yacyVersion.combined2prettyVersion("0.111")); // was (input is too short) + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion("0.1112440\t\n")); // \t and \n are not allowed + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion("124353432xxxx4546399999")); // not a number + too long + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion("123456789x")); // not a number + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion("9999999999")); // missing decimal point + Assert.assertArrayEquals(new String[]{"999.999","999"}, yacyVersion.combined2prettyVersion("999.999999")); // was (floating point part must have 3 and SVN-Version 4 digits) + Assert.assertArrayEquals(new String[]{"0.999","99999"}, yacyVersion.combined2prettyVersion("0.99999999")); + Assert.assertArrayEquals(new String[]{"99999.004","56789"}, yacyVersion.combined2prettyVersion("99999.00456789")); + Assert.assertArrayEquals(new String[]{"dev","00000"}, yacyVersion.combined2prettyVersion("99999.003456789")); // input is too long } }