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 2014/07/27 17:37:11 UTC
svn commit: r1613806 - in /jena/trunk/jena-arq/src:
main/java/org/apache/jena/atlas/logging/
main/java/org/apache/jena/riot/out/ test/java/org/apache/jena/riot/out/
Author: andy
Date: Sun Jul 27 15:37:11 2014
New Revision: 1613806
URL: http://svn.apache.org/r1613806
Log:
Removed OutputLangUtils (used NodeFmtLib) and merge related tests
Removed:
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NQuadsWriter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/NTriplesWriter.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/out/OutputLangUtils.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestOutput.java
Modified:
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java?rev=1613806&r1=1613805&r2=1613806&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/logging/Log.java Sun Jul 27 15:37:11 2014
@@ -113,12 +113,4 @@ public class Log {
static private Logger log(String loggerName) {
return LoggerFactory.getLogger(loggerName) ;
}
-
- /** @deprecated Use {@linkplain LogCtl#setLog4j} */
- @Deprecated
- static public void setLog4j() { LogCtl.setLog4j() ; }
-
- /** @deprecated Use {@linkplain LogCtl#setCmdLogging} */
- @Deprecated
- static public void setCmdLogging() { LogCtl.setCmdLogging(); }
}
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java?rev=1613806&r1=1613805&r2=1613806&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TS_Out.java Sun Jul 27 15:37:11 2014
@@ -26,7 +26,6 @@ import org.junit.runners.Suite ;
@Suite.SuiteClasses( {
TestNodeFmt.class
, TestNodeFmtLib.class
- , TestOutput.class
})
public class TS_Out
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java?rev=1613806&r1=1613805&r2=1613806&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmt.java Sun Jul 27 15:37:11 2014
@@ -64,15 +64,29 @@ public class TestNodeFmt extends BaseTes
@Test public void nodefmt_nt_03() { test(nodeFormatterNTutf8, Var.alloc(""), "?") ; }
@Test public void nodefmt_nt_04() { test(nodeFormatterNTutf8, Var.alloc("?"), "??") ; }
- @Test public void nodefmt_nt_05() { test(nodeFormatterNTutf8, "\"abc\"") ; }
+ @Test public void nodefmt_nt_05() { test(nodeFormatterNTutf8, "'abc'", "\"abc\"") ; }
+ @Test public void nodefmt_nt_05a() { test(nodeFormatterNTutf8, "\"abc\"") ; }
@Test public void nodefmt_nt_06() { test(nodeFormatterNTutf8, "\"\"") ; }
- @Test public void nodefmt_nt_07() { test(nodeFormatterNTutf8, "\"abc\"@en") ; }
+ @Test public void nodefmt_nt_06a() { test(nodeFormatterNTutf8, "''", "\"\"") ; }
+ @Test public void nodefmt_nt_07() { test(nodeFormatterNTutf8, "'abc'@en", "\"abc\"@en") ; }
+ @Test public void nodefmt_nt_07a() { test(nodeFormatterNTutf8, "\"abc\"@en") ; }
@Test public void nodefmt_nt_08() { test(nodeFormatterNTutf8, "\"123\"^^<http://www.w3.org/2001/XMLSchema#integer>" ) ; }
@Test public void nodefmt_nt_09() { test(nodeFormatterNTutf8, Node.ANY, "ANY") ; }
@Test public void nodefmt_nt_10() { test(nodeFormatterNTutf8, "'Ω'", "\"Ω\"") ; }
@Test public void nodefmt_nt_11() { test(nodeFormatterNTascii, "'Ω'", "\"\\u03A9\"") ; }
+ @Test public void nodefmt_nt_12() { test(nodeFormatterNTascii,"<http://example/>") ; }
+ @Test public void nodefmt_nt_13() { test(nodeFormatterNTascii, "\"abc\"^^<http://example/dt>") ; }
+
+ @Test public void nodefmt_nt_14() { test(nodeFormatterNTascii, "'é'", "\"\\u00E9\"") ; }
+
+ @Test public void nodefmt_nt_15() { test(nodeFormatterNTascii, "'\\n\\t\\f'", "\"\\n\\t\\f\"") ; }
+
+
+
+
+
@Test public void nodefmt_ttl_01() { test(nodeFormatterTTL, "?x") ; }
@Test public void nodefmt_ttl_02() { test(nodeFormatterTTL, "?xyz") ; }
@Test public void nodefmt_ttl_03() { test(nodeFormatterTTL, Var.alloc(""), "?") ; }
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java?rev=1613806&r1=1613805&r2=1613806&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/out/TestNodeFmtLib.java Sun Jul 27 15:37:11 2014
@@ -46,7 +46,6 @@ public class TestNodeFmtLib extends Base
@Test public void rt_05() { testencdec("-000") ; }
@Test public void rt_06() { testencdec("X-") ; }
@Test public void rt_07() { testencdec("-123:456:xyz") ; }
-
private void testenc(String input, String expected)
{