Skip to content

Commit abc3434

Browse files
committed
GH-5327 testsuite formatting fixes
1 parent 8183dc0 commit abc3434

File tree

6 files changed

+25
-18
lines changed

6 files changed

+25
-18
lines changed

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/nquads/NQuadsParserTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.rio.nquads;
1212

13-
import junit.framework.Test;
14-
import junit.framework.TestSuite;
1513
import org.eclipse.rdf4j.rio.RDFFormat;
1614
import org.eclipse.rdf4j.rio.RDFParser;
1715
import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
1816

17+
import junit.framework.Test;
18+
import junit.framework.TestSuite;
19+
1920
public class NQuadsParserTest {
2021

2122
public static Test suite() throws Exception {

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/ntriples/NTriplesParserTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,13 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.rio.ntriples;
1212

13-
import junit.framework.Test;
14-
import junit.framework.TestSuite;
1513
import org.eclipse.rdf4j.rio.RDFFormat;
1614
import org.eclipse.rdf4j.rio.RDFParser;
1715
import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
1816

17+
import junit.framework.Test;
18+
import junit.framework.TestSuite;
19+
1920
public class NTriplesParserTest {
2021

2122
public static Test suite() throws Exception {
@@ -28,7 +29,8 @@ public static Test suite() throws Exception {
2829
static class NTriples11ParserTest extends AbstractParserTestSuite {
2930

3031
private NTriples11ParserTest() {
31-
super("/testcases/ntriples/rdf11/", "http://www.w3.org/2013/N-TriplesTests/", RDFFormat.NTRIPLES, "NTriples");
32+
super("/testcases/ntriples/rdf11/", "http://www.w3.org/2013/N-TriplesTests/", RDFFormat.NTRIPLES,
33+
"NTriples");
3234
}
3335

3436
public static Test suite() throws Exception {
@@ -44,7 +46,8 @@ protected RDFParser createRDFParser() {
4446
static class NTriples12ParserTest extends AbstractParserTestSuite {
4547

4648
private NTriples12ParserTest() {
47-
super("/testcases/ntriples/rdf12/", "http://www.w3.org/2013/N-TriplesTests/", RDFFormat.NTRIPLES, "NTriples");
49+
super("/testcases/ntriples/rdf12/", "http://www.w3.org/2013/N-TriplesTests/", RDFFormat.NTRIPLES,
50+
"NTriples");
4851
}
4952

5053
public static Test suite() throws Exception {

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/trig/TriGParserTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,15 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.rio.trig;
1212

13-
import junit.framework.Test;
14-
import junit.framework.TestSuite;
1513
import org.eclipse.rdf4j.rio.RDFFormat;
1614
import org.eclipse.rdf4j.rio.RDFParser;
1715
import org.eclipse.rdf4j.rio.helpers.BasicParserSettings;
1816
import org.eclipse.rdf4j.rio.nquads.NQuadsParser;
1917
import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
2018

19+
import junit.framework.Test;
20+
import junit.framework.TestSuite;
21+
2122
public class TriGParserTest {
2223

2324
public static Test suite() throws Exception {
@@ -73,4 +74,3 @@ protected RDFParser createRDFBaseParser() {
7374
}
7475
}
7576
}
76-

compliance/rio/src/test/java/org/eclipse/rdf4j/rio/turtle/TurtleParserTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,14 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.rio.turtle;
1212

13-
import junit.framework.Test;
14-
import junit.framework.TestSuite;
1513
import org.eclipse.rdf4j.rio.RDFFormat;
1614
import org.eclipse.rdf4j.rio.RDFParser;
1715
import org.eclipse.rdf4j.rio.ntriples.NTriplesParser;
1816
import org.eclipse.rdf4j.testsuite.rio.AbstractParserTestSuite;
1917

18+
import junit.framework.Test;
19+
import junit.framework.TestSuite;
20+
2021
public class TurtleParserTest {
2122

2223
public static Test suite() throws Exception {

testsuites/rio/src/main/java/org/eclipse/rdf4j/testsuite/rio/AbstractParserTestSuite.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
import org.eclipse.rdf4j.rio.RDFFormat;
2525
import org.eclipse.rdf4j.rio.RDFParser;
2626
import org.eclipse.rdf4j.sail.memory.MemoryStore;
27-
28-
import junit.framework.TestSuite;
2927
import org.slf4j.Logger;
3028
import org.slf4j.LoggerFactory;
3129

30+
import junit.framework.TestSuite;
31+
3232
public abstract class AbstractParserTestSuite {
3333

3434
/*-----------*
@@ -86,7 +86,7 @@ public TestSuite createTestSuite() throws Exception {
8686
return suite;
8787
}
8888

89-
private void parseSubManifests (RepositoryConnection con) throws IOException {
89+
private void parseSubManifests(RepositoryConnection con) throws IOException {
9090
final String manifestQuery = "PREFIX mf: <http://www.w3.org/2001/sw/DataAccess/tests/test-manifest#> "
9191
+ "SELECT DISTINCT ?manifestFile "
9292
+ "WHERE { [] mf:include [ rdf:rest*/rdf:first ?manifestFile ] . } ";
@@ -185,7 +185,8 @@ private void parseCanonicalizationTests(TestSuite suite, RepositoryConnection co
185185
canonicalizationQuery.append(" ?test mf:result ?outputURL . ");
186186
canonicalizationQuery.append(" }");
187187

188-
TupleQueryResult queryResult = con.prepareTupleQuery(QueryLanguage.SPARQL, canonicalizationQuery.toString()).evaluate();
188+
TupleQueryResult queryResult = con.prepareTupleQuery(QueryLanguage.SPARQL, canonicalizationQuery.toString())
189+
.evaluate();
189190

190191
// Add all canonicalization tests to the test suite
191192
while (queryResult.hasNext()) {

testsuites/rio/src/main/java/org/eclipse/rdf4j/testsuite/rio/CanonicalizationTest.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
*******************************************************************************/
1111
package org.eclipse.rdf4j.testsuite.rio;
1212

13+
import static org.junit.jupiter.api.Assertions.assertTrue;
14+
1315
import java.io.InputStream;
1416
import java.io.StringWriter;
1517
import java.nio.file.Files;
@@ -34,8 +36,6 @@
3436

3537
import junit.framework.TestCase;
3638

37-
import static org.junit.jupiter.api.Assertions.assertTrue;
38-
3939
public class CanonicalizationTest extends TestCase {
4040

4141
/*-----------*
@@ -61,7 +61,8 @@ public class CanonicalizationTest extends TestCase {
6161
*--------------*/
6262

6363
public CanonicalizationTest(
64-
final IRI testUri, final String testName, final String inputURL, final String outputURL, final String baseURL,
64+
final IRI testUri, final String testName, final String inputURL, final String outputURL,
65+
final String baseURL,
6566
final RDFParser parser, final RDFFormat format) {
6667
super(testName);
6768
this.testUri = testUri;

0 commit comments

Comments
 (0)