Skip to content

Commit 6df9a5f

Browse files
abrokenjesterabrokenjester
authored
Merge pull request #769 from josephw/issues/#748-clean-up-tests-using-deprecated-methods
Clean up tests using deprecated methods
2 parents 9382213 + 8ee80cd commit 6df9a5f

4 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/CustomTurtleParserTest.java‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
import java.io.StringWriter;
1414
import java.util.Collections;
1515

16+
import org.eclipse.rdf4j.model.IRI;
1617
import org.eclipse.rdf4j.model.Literal;
1718
import org.eclipse.rdf4j.model.Model;
1819
import org.eclipse.rdf4j.model.Namespace;
19-
import org.eclipse.rdf4j.model.URI;
2020
import org.eclipse.rdf4j.model.ValueFactory;
2121
import org.eclipse.rdf4j.model.impl.LinkedHashModel;
2222
import org.eclipse.rdf4j.model.impl.NamespaceImpl;
@@ -40,13 +40,13 @@
4040

4141
/**
4242
* Custom tests for Turtle Parser
43-
*
43+
*
4444
* @author Peter Ansell
4545
*/
4646
public class CustomTurtleParserTest {
4747

4848
@Rule
49-
public Timeout timeout = new Timeout(1000000);
49+
public Timeout timeout = Timeout.millis(1000000);
5050

5151
private ValueFactory vf;
5252

@@ -183,8 +183,8 @@ public void testLiteralWithNewlines()
183183
String okLiteralString = "Literal \n without \n new line at the beginning. \n ";
184184
String errLiteralString = "\n Literal \n with \n new line at the beginning. \n ";
185185

186-
URI mySubject = vf.createURI(namespace, "Subject");
187-
URI myPredicate = vf.createURI(namespace, "Predicate");
186+
IRI mySubject = vf.createIRI(namespace, "Subject");
187+
IRI myPredicate = vf.createIRI(namespace, "Predicate");
188188
Literal myOkObject = vf.createLiteral(okLiteralString);
189189
Literal myErrObject = vf.createLiteral(errLiteralString);
190190

@@ -301,7 +301,7 @@ public void testSES2013BlankNodeSemiColonBNodeSpaceURI()
301301
Model model = Rio.parse(new StringReader("<urn:a> a _:c2; <urn:b> <urn:c> ."), "", RDFFormat.TURTLE);
302302

303303
assertEquals(2, model.size());
304-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:b"), vf.createURI("urn:c")));
304+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:b"), vf.createIRI("urn:c")));
305305
}
306306

307307
@Test
@@ -311,7 +311,7 @@ public void testSES2013BlankNodeSemiColonBNodeURI()
311311
Model model = Rio.parse(new StringReader("<urn:a> a _:c2;<urn:b> <urn:c> ."), "", RDFFormat.TURTLE);
312312

313313
assertEquals(2, model.size());
314-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:b"), vf.createURI("urn:c")));
314+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:b"), vf.createIRI("urn:c")));
315315
}
316316

317317
@Test
@@ -411,8 +411,8 @@ public void testSES2165LiteralSpaceDatatypeNewline()
411411
RDFFormat.TURTLE);
412412

413413
assertEquals(1, model.size());
414-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:b"),
415-
vf.createLiteral("testliteral", vf.createURI("urn:datatype"))));
414+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:b"),
415+
vf.createLiteral("testliteral", vf.createIRI("urn:datatype"))));
416416
}
417417

418418
@Test
@@ -423,8 +423,8 @@ public void testSES2165LiteralSpaceDatatypeTab()
423423
RDFFormat.TURTLE);
424424

425425
assertEquals(1, model.size());
426-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:b"),
427-
vf.createLiteral("testliteral", vf.createURI("urn:datatype"))));
426+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:b"),
427+
vf.createLiteral("testliteral", vf.createIRI("urn:datatype"))));
428428
}
429429

430430
@Test
@@ -435,8 +435,8 @@ public void testSES2165LiteralSpaceDatatypeCarriageReturn()
435435
RDFFormat.TURTLE);
436436

437437
assertEquals(1, model.size());
438-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:b"),
439-
vf.createLiteral("testliteral", vf.createURI("urn:datatype"))));
438+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:b"),
439+
vf.createLiteral("testliteral", vf.createIRI("urn:datatype"))));
440440
}
441441

442442
@Test
@@ -447,8 +447,8 @@ public void testSES2165LiteralSpaceDatatypeSpace()
447447
RDFFormat.TURTLE);
448448

449449
assertEquals(1, model.size());
450-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:b"),
451-
vf.createLiteral("testliteral", vf.createURI("urn:datatype"))));
450+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:b"),
451+
vf.createLiteral("testliteral", vf.createIRI("urn:datatype"))));
452452
}
453453

454454
@Test
@@ -460,8 +460,8 @@ public void testSES2165LiteralSpaceDatatypeComment()
460460
RDFFormat.TURTLE);
461461

462462
assertEquals(1, model.size());
463-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:b"),
464-
vf.createLiteral("testliteral", vf.createURI("urn:datatype"))));
463+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:b"),
464+
vf.createLiteral("testliteral", vf.createIRI("urn:datatype"))));
465465
}
466466

467467
@Test
@@ -504,7 +504,7 @@ public void testParsingNamespacesWithOverride()
504504
RDFFormat.TURTLE, aConfig, vf, new ParseErrorLogger());
505505

506506
assertEquals(1, model.size());
507-
assertTrue(model.contains(vf.createURI("urn:a"), vf.createURI("urn:not_skos:broader"),
508-
vf.createURI("urn:b")));
507+
assertTrue(model.contains(vf.createIRI("urn:a"), vf.createIRI("urn:not_skos:broader"),
508+
vf.createIRI("urn:b")));
509509
}
510510
}

‎core/model/src/test/java/org/eclipse/rdf4j/model/AbstractModelTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
public abstract class AbstractModelTest {
3434

3535
@Rule
36-
public Timeout timeout = new Timeout(10000);
36+
public Timeout timeout = Timeout.millis(10000);
3737

3838
@Rule
3939
public ExpectedException thrown = ExpectedException.none();

‎core/util/src/test/java/org/eclipse/rdf4j/common/net/ParsedURITest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ public void jarUriWithHttpStringifiesToOriginalForm() {
6161
@Test
6262
public void jarUriWithFileStringifiesToOriginalForm() {
6363
ParsedURI uri = new ParsedURI("jar:file:///some-file.jar!/another-file");
64-
System.out.println(uri.getScheme());
6564
assertEquals("jar:file:///some-file.jar!/another-file", uri.toString());
6665
}
6766

‎testsuites/rio/src/main/java/org/eclipse/rdf4j/rio/ntriples/AbstractNTriplesParserUnitTest.java‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212

1313
import java.io.InputStream;
1414
import java.io.StringReader;
15+
import java.util.Collections;
1516

1617
import org.eclipse.rdf4j.model.Model;
1718
import org.eclipse.rdf4j.model.impl.LinkedHashModel;
19+
import org.eclipse.rdf4j.model.util.Models;
1820
import org.eclipse.rdf4j.repository.Repository;
1921
import org.eclipse.rdf4j.repository.RepositoryConnection;
2022
import org.eclipse.rdf4j.repository.sail.SailRepository;
@@ -24,12 +26,11 @@
2426
import org.eclipse.rdf4j.rio.helpers.NTriplesParserSettings;
2527
import org.eclipse.rdf4j.rio.helpers.StatementCollector;
2628
import org.eclipse.rdf4j.sail.memory.MemoryStore;
27-
import org.junit.Ignore;
2829
import org.junit.Test;
2930

3031
/**
3132
* Unit tests for N-Triples Parser.
32-
*
33+
*
3334
* @author Peter Ansell
3435
*/
3536
public abstract class AbstractNTriplesParserUnitTest {
@@ -189,7 +190,7 @@ public void testEscapes()
189190
"<urn:test:subject> <urn:test:predicate> \" \\t \\b \\n \\r \\f \\\" \\' \\\\ \" . "),
190191
"http://example/");
191192
assertEquals(1, model.size());
192-
assertEquals(" \t \b \n \r \f \" \' \\ ", model.objectLiteral().get().getLabel());
193+
assertEquals(" \t \b \n \r \f \" \' \\ ", Models.objectLiteral(model).get().getLabel());
193194
}
194195

195196
@Test
@@ -204,7 +205,7 @@ public void testEndOfLineCommentNoSpace()
204205
"<urn:test:subject> <urn:test:predicate> <urn:test:object> .#endoflinecomment\n"),
205206
"http://example/");
206207
assertEquals(1, model.size());
207-
assertEquals("urn:test:object", model.objectString().get());
208+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
208209
}
209210

210211
@Test
@@ -219,7 +220,7 @@ public void testEndOfLineCommentWithSpaceBefore()
219220
"<urn:test:subject> <urn:test:predicate> <urn:test:object> . #endoflinecomment\n"),
220221
"http://example/");
221222
assertEquals(1, model.size());
222-
assertEquals("urn:test:object", model.objectString().get());
223+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
223224
}
224225

225226
@Test
@@ -234,7 +235,7 @@ public void testEndOfLineCommentWithSpaceAfter()
234235
"<urn:test:subject> <urn:test:predicate> <urn:test:object> .# endoflinecomment\n"),
235236
"http://example/");
236237
assertEquals(1, model.size());
237-
assertEquals("urn:test:object", model.objectString().get());
238+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
238239
}
239240

240241
@Test
@@ -249,7 +250,7 @@ public void testEndOfLineCommentWithSpaceBoth()
249250
"<urn:test:subject> <urn:test:predicate> <urn:test:object> . # endoflinecomment\n"),
250251
"http://example/");
251252
assertEquals(1, model.size());
252-
assertEquals("urn:test:object", model.objectString().get());
253+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
253254
}
254255

255256
@Test
@@ -319,7 +320,7 @@ public void testEndOfLineEmptyCommentNoSpace()
319320
new StringReader("<urn:test:subject> <urn:test:predicate> <urn:test:object> .#\n"),
320321
"http://example/");
321322
assertEquals(1, model.size());
322-
assertEquals("urn:test:object", model.objectString().get());
323+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
323324
}
324325

325326
@Test
@@ -333,7 +334,7 @@ public void testEndOfLineEmptyCommentWithSpaceBefore()
333334
new StringReader("<urn:test:subject> <urn:test:predicate> <urn:test:object> . #\n"),
334335
"http://example/");
335336
assertEquals(1, model.size());
336-
assertEquals("urn:test:object", model.objectString().get());
337+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
337338
}
338339

339340
@Test
@@ -347,7 +348,7 @@ public void testEndOfLineEmptyCommentWithSpaceAfter()
347348
new StringReader("<urn:test:subject> <urn:test:predicate> <urn:test:object> .# \n"),
348349
"http://example/");
349350
assertEquals(1, model.size());
350-
assertEquals("urn:test:object", model.objectString().get());
351+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
351352
}
352353

353354
@Test
@@ -361,7 +362,7 @@ public void testEndOfLineEmptyCommentWithSpaceBoth()
361362
new StringReader("<urn:test:subject> <urn:test:predicate> <urn:test:object> . # \n"),
362363
"http://example/");
363364
assertEquals(1, model.size());
364-
assertEquals("urn:test:object", model.objectString().get());
365+
assertEquals(Collections.singleton("urn:test:object"), Models.objectStrings(model));
365366
}
366367

367368
@Test

0 commit comments

Comments
 (0)