This is an automated email from the ASF dual-hosted git repository. andy pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/jena.git
commit 45a949e4d5f8abda93c627fd6eaf3183af71cbc7 Author: Andy Seaborne <[email protected]> AuthorDate: Thu Sep 26 16:17:15 2024 +0100 Fix AbstractTestIRIx to use the IRIProvider of the test --- .../org/apache/jena/irix/AbstractTestIRIx.java | 8 ++++++- .../java/org/apache/jena/irix/TestIRIxOps.java | 15 ++++-------- .../java/org/apache/jena/irix/TestIRIxSyntax.java | 4 ++-- .../java/org/apache/jena/irix/TestNormalize.java | 2 +- .../java/org/apache/jena/irix/TestRFC3986.java | 28 ++++++++++------------ .../java/org/apache/jena/irix/TestRelative.java | 4 ++-- .../java/org/apache/jena/irix/TestResolve.java | 4 ++-- 7 files changed, 32 insertions(+), 33 deletions(-) diff --git a/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx.java b/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx.java index 3fdc63586e..cee11a8d97 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx.java +++ b/jena-core/src/test/java/org/apache/jena/irix/AbstractTestIRIx.java @@ -27,7 +27,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.runners.Parameterized.Parameters; -/** Test suite driver for IRIx. +/** + * Test suite driver for IRIx. * The test execution environment is set to be "strict". * Tests can change this; it is reset after each test. */ @@ -100,4 +101,9 @@ public class AbstractTestIRIx { protected AbstractTestIRIx(String name, IRIProvider provider) { this.provider = provider; } + + /** Create an IRIx using the test' provider. */ + protected IRIx test_create(String iriStr) { + return provider.create(iriStr); + } } diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOps.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOps.java index b91e2d7a37..6eee42f9d4 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOps.java +++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxOps.java @@ -123,8 +123,8 @@ public class TestIRIxOps extends AbstractTestIRIx { @Test public void misc_01() { reference("wm:/abc", true); } private void relative(String baseUriStr, String otherStr, String expected) { - IRIx base = IRIx.create(baseUriStr); - IRIx relInput = IRIx.create(otherStr); + IRIx base = test_create(baseUriStr); + IRIx relInput = test_create(otherStr); IRIx relativized = base.relativize(relInput); String result = (relativized==null) ? null : relativized.str(); assertEquals("Base=<"+baseUriStr+"> IRI=<"+otherStr+">", expected, result); @@ -137,24 +137,19 @@ public class TestIRIxOps extends AbstractTestIRIx { // Create - is it suitable for an RDF reference? private void test_abs_rel(String uriStr, boolean isAbsolute, boolean isRelative) { - IRIx iri = IRIx.create(uriStr); + IRIx iri = test_create(uriStr); assertEquals("Absolute test: IRI = "+uriStr, isAbsolute, iri.isAbsolute()); assertEquals("Relative test: IRI = "+uriStr, isRelative, iri.isRelative()); } // Create - is it suitable for an RDF reference? private void reference(String uriStr) { - IRIx iri = IRIx.create(uriStr); + IRIx iri = test_create(uriStr); assertTrue("IRI = "+uriStr, iri.isReference()); } private void reference(String uriStr, boolean expected) { - IRIx iri = IRIx.create(uriStr); + IRIx iri = test_create(uriStr); assertEquals("IRI = "+uriStr, expected, iri.isReference()); } - - // Parse, only collect violations from scheme-specific rules. - private void parse(String string) { - IRIx iri = IRIx.create(string); - } } diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntax.java b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntax.java index ae51671fe9..1b4ee02a9a 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntax.java +++ b/jena-core/src/test/java/org/apache/jena/irix/TestIRIxSyntax.java @@ -124,7 +124,7 @@ public class TestIRIxSyntax extends AbstractTestIRIx { @Test public void file_06() { parse("file:///c:/~user/file"); } // Parse, only collect violations from scheme-specific rules. - private void parse(String string) { - IRIx iri = IRIx.create(string); + private void parse(String iriStr) { + test_create(iriStr); } } diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestNormalize.java b/jena-core/src/test/java/org/apache/jena/irix/TestNormalize.java index 212f0a907a..c693fdf007 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/TestNormalize.java +++ b/jena-core/src/test/java/org/apache/jena/irix/TestNormalize.java @@ -112,7 +112,7 @@ public class TestNormalize extends AbstractTestIRIx { assumeFalse("jena-iri does not implement normalization", SystemIRIx.getProvider() instanceof IRIProviderJenaIRI ); // if ( SystemIRIx.getProvider() instanceof IRIProviderJenaIRI ) // return; - IRIx iri = IRIx.create(input); + IRIx iri = test_create(input); IRIx iri2 = iri.normalize(); String s = iri2.toString(); assertEquals(expected, s); diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestRFC3986.java b/jena-core/src/test/java/org/apache/jena/irix/TestRFC3986.java index 474ac7a82d..ee1c6736ef 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/TestRFC3986.java +++ b/jena-core/src/test/java/org/apache/jena/irix/TestRFC3986.java @@ -152,8 +152,8 @@ public class TestRFC3986 extends AbstractTestIRIx { @Test public void equality_01() { String s = "https://jena.apache.org/";; - IRIx iri1 = IRIx.create(s); - IRIx iri2 = IRIx.create(s); + IRIx iri1 = test_create(s); + IRIx iri2 = test_create(s); assertEquals(iri1, iri2); assertEquals(iri1.hashCode(), iri2.hashCode()); } @@ -216,7 +216,7 @@ public class TestRFC3986 extends AbstractTestIRIx { */ // XXX Not ASCII in the NSS part, or components. private static boolean I_URN = true; - private static void parse_internation_urn(String string) { + private void parse_internation_urn(String string) { if ( I_URN ) good(string); else @@ -249,7 +249,7 @@ public class TestRFC3986 extends AbstractTestIRIx { // Allow r-component, q-component and f-component private static final boolean UUID_8141 = true; - private static void parse_uuid_8141(String string) { + private void parse_uuid_8141(String string) { if ( UUID_8141 ) good(string); else @@ -356,8 +356,8 @@ public class TestRFC3986 extends AbstractTestIRIx { @Test public void parse_urn_uuid_bad_13() { badSpecific("urn:uuid:" + testUUID + "?=αβγ"); } @Test public void parse_urn_uuid_bad_14() { badSpecific("urn:uuid:" + testUUID + "?+αβγ"); } - private static void good(String string) { - IRIx iri = IRIx.create(string); + private void good(String string) { + IRIx iri = test_create(string); assertNotNull(iri); if ( true ) { // Run against checking mode. @@ -373,22 +373,20 @@ public class TestRFC3986 extends AbstractTestIRIx { } // Where jena-iri odes not get the right answer. - private static void goodNoIRICheck(String string) { - IRIx iri = IRIx.create(string); + private void goodNoIRICheck(String string) { + IRIx iri = test_create(string); java.net.URI javaURI = java.net.URI.create(string); } // Expect an IRIParseException - private static void bad(String string) { + private void bad(String string) { try { - IRIs.checkEx(string); - IRIs.reference(string); - //RFC3986.check(string); - fail("Did not fail: "+string); + IRIx iri = test_create(string); + if ( ! iri.isReference()) + fail("Did not fail: "+string); } catch (IRIException ex) {} } - - private static void badSpecific(String string) { + private void badSpecific(String string) { bad(string); } } diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestRelative.java b/jena-core/src/test/java/org/apache/jena/irix/TestRelative.java index ea831f30a4..aad04eca41 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/TestRelative.java +++ b/jena-core/src/test/java/org/apache/jena/irix/TestRelative.java @@ -65,8 +65,8 @@ public class TestRelative extends AbstractTestIRIx { public void relative_11() { testRelative("http://example/ns#";, "http://example/ns#x";, "#x") ; } private void testRelative(String baseStr, String pathStr, String expected) { - IRIx base = IRIx.create(baseStr); - IRIx path = IRIx.create(pathStr); + IRIx base = test_create(baseStr); + IRIx path = test_create(pathStr); IRIx rel = base.relativize(path); String result = (rel==null)?null:rel.str(); assertEquals(expected, result); diff --git a/jena-core/src/test/java/org/apache/jena/irix/TestResolve.java b/jena-core/src/test/java/org/apache/jena/irix/TestResolve.java index cdf670a767..5e12aa17ca 100644 --- a/jena-core/src/test/java/org/apache/jena/irix/TestResolve.java +++ b/jena-core/src/test/java/org/apache/jena/irix/TestResolve.java @@ -203,8 +203,8 @@ public class TestResolve extends AbstractTestIRIx { } private void testResolve(String base, String rel, String expected) { - IRIx baseIRI = IRIx.create(base); - IRIx relIRI = IRIx.create(rel); + IRIx baseIRI = test_create(base); + IRIx relIRI = test_create(rel); IRIx iri2 = baseIRI.resolve(relIRI); String s1 = iri2.str(); assertEquals(expected, s1);
