You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2017/04/04 19:35:09 UTC
[2/5] jena git commit: Reformat
Reformat
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2429ebfa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2429ebfa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2429ebfa
Branch: refs/heads/master
Commit: 2429ebfad510f2c79aeb706228a9350b8de7ea70
Parents: ecf579a
Author: Andy Seaborne <an...@apache.org>
Authored: Sun Apr 2 15:30:45 2017 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Sun Apr 2 15:30:45 2017 +0100
----------------------------------------------------------------------
.../apache/jena/riot/lang/TestLangNTuples.java | 223 +++++++++----------
1 file changed, 111 insertions(+), 112 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2429ebfa/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
----------------------------------------------------------------------
diff --git a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
index 3c095b6..1db9fc4 100644
--- a/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
+++ b/jena-arq/src/test/java/org/apache/jena/riot/lang/TestLangNTuples.java
@@ -46,162 +46,161 @@ abstract public class TestLangNTuples extends BaseTest
{
// Test streaming interface.
- private static ErrorHandler errorhandler = null ;
- @BeforeClass public static void beforeClass()
- {
- errorhandler = getDefaultErrorHandler() ;
- setDefaultErrorHandler(errorHandlerNoLogging) ;
+ private static ErrorHandler errorhandler = null;
+
+ @BeforeClass
+ public static void beforeClass() {
+ errorhandler = getDefaultErrorHandler();
+ setDefaultErrorHandler(errorHandlerNoLogging);
}
- @AfterClass public static void afterClass()
- {
- setDefaultErrorHandler(errorhandler) ;
+ @AfterClass
+ public static void afterClass() {
+ setDefaultErrorHandler(errorhandler);
}
-
- @Test public void tuple_0()
- {
- long count = parseCount("") ;
- assertEquals(0, count) ;
+
+ @Test
+ public void tuple_0() {
+ long count = parseCount("");
+ assertEquals(0, count);
}
-
- @Test public void tuple_1()
- {
- long count = parseCount("<x> <y> <z>.") ;
- assertEquals(1, count) ;
+
+ @Test
+ public void tuple_1() {
+ long count = parseCount("<x> <y> <z>.");
+ assertEquals(1, count);
}
-
- @Test public void tuple_2()
- {
- long count = parseCount("<x> <y> \"z\".") ;
- assertEquals(1, count) ;
+
+ @Test
+ public void tuple_2() {
+ long count = parseCount("<x> <y> \"z\".");
+ assertEquals(1, count);
}
-
- @Test public void tuple_3()
- {
- long count = parseCount("<x> <y> <z>. <x> <y> <z>.") ;
- assertEquals(2, count) ;
+
+ @Test
+ public void tuple_3() {
+ long count = parseCount("<x> <y> <z>. <x> <y> <z>.");
+ assertEquals(2, count);
}
- @Test public void tuple_4()
- {
- long count = parseCount("<x> <y> \"123\"^^<int>.") ;
- assertEquals(1, count) ;
+ @Test
+ public void tuple_4() {
+ long count = parseCount("<x> <y> \"123\"^^<int>.");
+ assertEquals(1, count);
}
- @Test public void tuple_5()
- {
- long count = parseCount("<x> <y> \"123\"@lang.") ;
- assertEquals(1,count) ;
+ @Test
+ public void tuple_5() {
+ long count = parseCount("<x> <y> \"123\"@lang.");
+ assertEquals(1, count);
}
- // Test iterator interface.
-
// Test parse errors interface.
- @Test(expected=ExFatal.class)
- public void tuple_bad_01()
- {
- parseCount("<x> <y> <z>") ; // No DOT
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_01() {
+ parseCount("<x> <y> <z>"); // No DOT
}
- @Test(expected=ExFatal.class)
- public void tuple_bad_02()
- {
- parseCount("<x> _:a <z> .") ; // Bad predicate
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_02() {
+ parseCount("<x> _:a <z> ."); // Bad predicate
}
- @Test(expected=ExFatal.class)
- public void tuple_bad_03()
- {
- parseCount("<x> \"p\" <z> .") ; // Bad predicate
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_03() {
+ parseCount("<x> \"p\" <z> ."); // Bad predicate
}
- @Test(expected=ExFatal.class)
- public void tuple_bad_4()
- {
- parseCount("\"x\" <p> <z> .") ; // Bad subject
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_4() {
+ parseCount("\"x\" <p> <z> ."); // Bad subject
}
- @Test(expected=ExFatal.class)
- public void tuple_bad_5()
- {
- parseCount("<x> <p> ?var .") ; // No variables
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_5() {
+ parseCount("<x> <p> ?var ."); // No variables
}
-
- @Test(expected=ExFatal.class)
- public void tuple_bad_6()
- {
- parseCount("<x> <p> 123 .") ; // No abbreviations.
+
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_6() {
+ parseCount("<x> <p> 123 ."); // No abbreviations.
}
- @Test(expected=ExFatal.class)
- public void tuple_bad_7()
- {
- parseCount("<x> <p> x:y .") ; // No prefixed names
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_7() {
+ parseCount("<x> <p> x:y ."); // No prefixed names
}
-
+
// Bad terms - but accepted by default.
- @Test(expected=ExFatal.class)
- public void tuple_bad_10() { parseCount("<x> <p> <bad uri> .") ; }
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_10() {
+ parseCount("<x> <p> <bad uri> .");
+ }
- // Bad terms (value range) - but legal syntax
- @Test
- public void tuple_bad_11() { parseCount("<x> <p> \"9000\"^^<http://www.w3.org/2001/XMLSchema#byte> .") ; }
+ // Bad terms (value range) - but legal syntax
+ @Test
+ public void tuple_bad_11() {
+ parseCount("<x> <p> \"9000\"^^<http://www.w3.org/2001/XMLSchema#byte> .");
+ }
// Bad - relative URI.
- @Test(expected=ExError.class)
- public void tuple_bad_21() { parseCheck("<x> <p> <z> .") ; }
+ @Test(expected = ExError.class)
+ public void tuple_bad_21() {
+ parseCheck("<x> <p> <z> .");
+ }
// Bad terms
- @Test(expected=ExFatal.class)
- public void tuple_bad_22() { parseCheck("<http://example/x> <http://example/p> \"abc\"^^<http://example/bad uri> .") ; }
+ @Test(expected = ExFatal.class)
+ public void tuple_bad_22() {
+ parseCheck("<http://example/x> <http://example/p> \"abc\"^^<http://example/bad uri> .");
+ }
+
+ @Test(expected = ExWarning.class)
+ public void tuple_bad_23() {
+ parseCheck("<http://example/x> <http://example/p> \"9000\"^^<http://www.w3.org/2001/XMLSchema#byte> .");
+ }
- @Test(expected=ExWarning.class)
- public void tuple_bad_23() { parseCheck("<http://example/x> <http://example/p> \"9000\"^^<http://www.w3.org/2001/XMLSchema#byte> .") ; }
-
// ASCII vs UTF-8
@Test
- public void tuple_charset_1()
- {
+ public void tuple_charset_1() {
// E9 is e-acute
- parseCheck("<http://example/x\\u00E9> <http://example/p> <http://example/s> .") ;
+ parseCheck("<http://example/x\\u00E9> <http://example/p> <http://example/s> .");
}
@Test
- public void tuple_charset_2()
- {
- parseCheck("<http://example/�> <http://example/p> \"�\" .") ;
+ public void tuple_charset_2() {
+ parseCheck("<http://example/�> <http://example/p> \"�\" .");
}
-
- static protected Tokenizer tokenizer(CharSpace charSpace, String string)
- {
- byte b[] = StrUtils.asUTF8bytes(string) ;
- ByteArrayInputStream in = new ByteArrayInputStream(b) ;
- Tokenizer tokenizer = charSpace == CharSpace.ASCII ? TokenizerFactory.makeTokenizerASCII(in) : TokenizerFactory.makeTokenizerUTF8(in) ;
- return tokenizer ;
+
+ static protected Tokenizer tokenizer(CharSpace charSpace, String string) {
+ byte b[] = StrUtils.asUTF8bytes(string);
+ ByteArrayInputStream in = new ByteArrayInputStream(b);
+ Tokenizer tokenizer = charSpace == CharSpace.ASCII
+ ? TokenizerFactory.makeTokenizerASCII(in) : TokenizerFactory.makeTokenizerUTF8(in);
+ return tokenizer;
}
-
- static protected Tokenizer tokenizer(String string)
- {
+
+ static protected Tokenizer tokenizer(String string) {
// UTF-8
- byte b[] = StrUtils.asUTF8bytes(string) ;
- ByteArrayInputStream in = new ByteArrayInputStream(b) ;
- Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(in) ;
- return tokenizer ;
+ byte b[] = StrUtils.asUTF8bytes(string);
+ ByteArrayInputStream in = new ByteArrayInputStream(b);
+ Tokenizer tokenizer = TokenizerFactory.makeTokenizerUTF8(in);
+ return tokenizer;
}
- final protected void parseCheck(String... strings)
- {
- String string = String.join("\n", strings) ;
- Tokenizer tokenizer = tokenizer(string) ;
- StreamRDFCounting sink = StreamRDFLib.count() ;
- LangRIOT x = RiotParsers.createParserNQuads(tokenizer, sink) ;
- x.setProfile(RiotLib.profile(null, false, true, new ErrorHandlerEx())) ;
- x.parse() ;
+ @SuppressWarnings("deprecation")
+ final protected void parseCheck(String... strings) {
+ String string = String.join("\n", strings);
+ Tokenizer tokenizer = tokenizer(string);
+ StreamRDFCounting sink = StreamRDFLib.count();
+ LangRIOT x = RiotParsers.createParserNQuads(tokenizer, sink);
+ x.setProfile(RiotLib.profile(null, false, true, new ErrorHandlerEx()));
+ x.parse();
}
-
- protected abstract Lang getLang() ;
-
+
+ protected abstract Lang getLang();
+
protected long parseCount(String... strings) {
- return ParserTestBaseLib.parseCount(getLang(), strings) ;
+ return ParserTestBaseLib.parseCount(getLang(), strings);
}
}