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 2013/03/22 20:27:25 UTC
svn commit: r1459942 - in /jena/trunk/jena-arq/src: main/java/arq/cmdline/
main/java/org/apache/jena/atlas/lib/ main/java/org/apache/jena/riot/stream/
test/java/arq/ test/java/com/hp/hpl/jena/sparql/
test/java/org/apache/jena/riot/stream/
Author: andy
Date: Fri Mar 22 19:27:25 2013
New Revision: 1459942
URL: http://svn.apache.org/r1459942
Log:
Convert ArgDecl to use varargs
Fix comments
Put command line tests in ARQ test suite.
Added:
jena/trunk/jena-arq/src/test/java/arq/TS_Cmd.java
Modified:
jena/trunk/jena-arq/src/main/java/arq/cmdline/ArgDecl.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/IRILib.java
jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java
jena/trunk/jena-arq/src/test/java/arq/TestCmdLine.java
jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
Modified: jena/trunk/jena-arq/src/main/java/arq/cmdline/ArgDecl.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/arq/cmdline/ArgDecl.java?rev=1459942&r1=1459941&r2=1459942&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/arq/cmdline/ArgDecl.java (original)
+++ jena/trunk/jena-arq/src/main/java/arq/cmdline/ArgDecl.java Fri Mar 22 19:27:25 2013
@@ -34,111 +34,24 @@ public class ArgDecl
private void init(boolean hasValue, String name)
{
takesValue = hasValue ;
- firstName = name ;
+ firstName = canonicalForm(name) ;
}
/** Create a declaration for a command argument.
*
* @param hasValue Does it take a value or not?
* @param name Name of argument
+ * @param names Alternative names
*/
- public ArgDecl(boolean hasValue, String name)
+ public ArgDecl(boolean hasValue, String name, String...names)
{
init(hasValue, name) ;
addName(name) ;
+ for ( String n : names )
+ addName(n) ;
}
- /** Create a declaration for a command argument.
- *
- * @param hasValue Does it take a value or not?
- * @param name1 Name of argument
- * @param name2 Name of argument
- */
-
- public ArgDecl(boolean hasValue, String name1, String name2)
- {
- init(hasValue, name1) ;
- addName(name1) ;
- addName(name2) ;
- }
-
- /** Create a declaration for a command argument.
- *
- * @param hasValue Does it take a value or not?
- * @param name1 Name of argument
- * @param name2 Name of argument
- * @param name3 Name of argument
- */
-
- public ArgDecl(boolean hasValue, String name1, String name2, String name3)
- {
- init(hasValue, name1) ;
- addName(name1) ;
- addName(name2) ;
- addName(name3) ;
- }
-
- /** Create a declaration for a command argument.
- *
- * @param hasValue Does it take a value or not?
- * @param name1 Name of argument
- * @param name2 Name of argument
- * @param name3 Name of argument
- * @param name4 Name of argument
- */
-
- public ArgDecl(boolean hasValue, String name1, String name2, String name3, String name4)
- {
- init(hasValue, name1) ;
- addName(name1) ;
- addName(name2) ;
- addName(name3) ;
- addName(name4) ;
- }
-
- /** Create a declaration for a command argument.
- *
- * @param hasValue Does it take a value or not?
- * @param name1 Name of argument
- * @param name2 Name of argument
- * @param name3 Name of argument
- * @param name4 Name of argument
- * @param name5 Name of argument
- */
-
- public ArgDecl(boolean hasValue, String name1, String name2, String name3, String name4, String name5)
- {
- init(hasValue, name1) ;
- addName(name1) ;
- addName(name2) ;
- addName(name3) ;
- addName(name4) ;
- addName(name5) ;
- }
-
- /** Create a declaration for a command argument.
- *
- * @param hasValue Does it take a value or not?
- * @param name1 Name of argument
- * @param name2 Name of argument
- * @param name3 Name of argument
- * @param name4 Name of argument
- * @param name5 Name of argument
- * @param name6 Name of argument
- */
-
- public ArgDecl(boolean hasValue, String name1, String name2, String name3, String name4, String name5, String name6)
- {
- init(hasValue, name1) ;
- addName(name1) ;
- addName(name2) ;
- addName(name3) ;
- addName(name4) ;
- addName(name5) ;
- addName(name6) ;
- }
-
public void addName(String name)
{
name = canonicalForm(name) ;
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/IRILib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/IRILib.java?rev=1459942&r1=1459941&r2=1459942&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/IRILib.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/atlas/lib/IRILib.java Fri Mar 22 19:27:25 2013
@@ -149,7 +149,6 @@ public class IRILib
if ( fn.startsWith("file:") )
return normalizeFilenameURI(fn) ;
return plainFilenameToURL(fn) ;
- // Also: String fn2 = "file://" + new File(fn).toURI().toString().substring(5);
}
/** Convert an IRI to a filename */
@@ -179,10 +178,9 @@ public class IRILib
if ( trailingSlash && ! fn.endsWith("/") )
fn = fn + "/" ;
- // Temporary
if ( isWindows )
{
- // Char 2,
+ // C:\ => file:///C:/...
if ( fn.length() >= 2 && fn.charAt(1) == ':' )
// Windows drive letter - already absolute path.
// Make "URI" absolute path
Modified: jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java?rev=1459942&r1=1459941&r2=1459942&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java (original)
+++ jena/trunk/jena-arq/src/main/java/org/apache/jena/riot/stream/LocatorFile.java Fri Mar 22 19:27:25 2013
@@ -75,12 +75,15 @@ public class LocatorFile implements Loca
String scheme = FileUtils.getScheme(filenameIRI) ;
String fn = filenameIRI ;
// Windows : C:\\ is not a scheme name!
- if ( scheme != null && scheme.length() > 1 )
+ if ( scheme != null )
{
- if ( ! scheme.equalsIgnoreCase("file") )
- // Not filename or a file: IRI
- return null ;
- fn = IRILib.IRIToFilename(filenameIRI) ;
+ if ( scheme.length() > 1 )
+ {
+ if ( ! scheme.equalsIgnoreCase("file") )
+ // Not filename or a file: IRI
+ return null ;
+ fn = IRILib.IRIToFilename(filenameIRI) ;
+ }
}
// fn is the file name to use.
// If it is relative, and we have a different working directory, prepend that.
Added: jena/trunk/jena-arq/src/test/java/arq/TS_Cmd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/arq/TS_Cmd.java?rev=1459942&view=auto
==============================================================================
--- jena/trunk/jena-arq/src/test/java/arq/TS_Cmd.java (added)
+++ jena/trunk/jena-arq/src/test/java/arq/TS_Cmd.java Fri Mar 22 19:27:25 2013
@@ -0,0 +1,31 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package arq;
+
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+import org.junit.runners.Suite.SuiteClasses ;
+
+@RunWith(Suite.class)
+@SuiteClasses( {
+ TestCmdLine.class
+})
+
+public class TS_Cmd
+{}
Modified: jena/trunk/jena-arq/src/test/java/arq/TestCmdLine.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/arq/TestCmdLine.java?rev=1459942&r1=1459941&r2=1459942&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/arq/TestCmdLine.java (original)
+++ jena/trunk/jena-arq/src/test/java/arq/TestCmdLine.java Fri Mar 22 19:27:25 2013
@@ -19,20 +19,21 @@
package arq;
import java.util.Iterator ;
-import junit.framework.TestCase ;
+import org.apache.jena.atlas.junit.BaseTest ;
+import org.junit.Test ;
import arq.cmdline.ArgDecl ;
import arq.cmdline.CmdLineArgs ;
-public class TestCmdLine extends TestCase
+public class TestCmdLine extends BaseTest
{
- public void test_Simple1()
+ @Test public void test_Simple1()
{
- String args[] = new String[]{ ""} ;
+ String args[] = new String[]{""} ;
CmdLineArgs cl = new CmdLineArgs(args) ;
cl.process() ;
}
- public void test_Flag1()
+ @Test public void test_Flag1()
{
String args[] = new String[]{ ""} ;
CmdLineArgs cl = new CmdLineArgs(args) ;
@@ -42,7 +43,7 @@ public class TestCmdLine extends TestCas
assertTrue("-a argument found" , ! cl.contains(argA) ) ;
}
- public void test_Flag2()
+ @Test public void test_Flag2()
{
String args[] = new String[]{ "-a"} ;
CmdLineArgs cl = new CmdLineArgs(args) ;
@@ -52,7 +53,7 @@ public class TestCmdLine extends TestCas
assertTrue("No -a argument found" , cl.contains(argA) ) ;
}
- public void test_Flag3()
+ @Test public void test_Flag3()
{
String args[] = new String[]{ "-a", "filename"} ;
CmdLineArgs cl = new CmdLineArgs(args) ;
@@ -62,7 +63,7 @@ public class TestCmdLine extends TestCas
assertTrue("No -a argument found" , cl.contains(argA) ) ;
}
- public void test_Arg1()
+ @Test public void test_Arg1()
{
String args[] = new String[]{ ""} ;
CmdLineArgs cl = new CmdLineArgs(args) ;
@@ -72,11 +73,11 @@ public class TestCmdLine extends TestCas
assertTrue("-arg argument found" , ! cl.contains(argA) ) ;
}
- public void test_Arg2()
+ @Test public void test_Arg2()
{
String args[] = new String[]{ "-arg=ARG", "filename"} ;
CmdLineArgs cl = new CmdLineArgs(args) ;
- ArgDecl argA = new ArgDecl(true, "-arg") ;
+ ArgDecl argA = new ArgDecl(true, "arg") ;
cl.add(argA) ;
cl.process() ;
assertTrue("No -arg= argument found" , cl.contains(argA) ) ;
@@ -84,7 +85,7 @@ public class TestCmdLine extends TestCas
assertEquals("", cl.getArg("arg").getValue() , "ARG") ;
}
- public void test_nArg1()
+ @Test public void test_nArg1()
{
String args[] = new String[]{ "-arg=V1", "--arg=V2", "-v"} ;
CmdLineArgs cl = new CmdLineArgs(args) ;
Modified: jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java?rev=1459942&r1=1459941&r2=1459942&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java (original)
+++ jena/trunk/jena-arq/src/test/java/com/hp/hpl/jena/sparql/ARQTestSuite.java Fri Mar 22 19:27:25 2013
@@ -23,6 +23,7 @@ import junit.framework.TestSuite ;
import org.apache.jena.atlas.TC_Atlas ;
import org.apache.jena.atlas.junit.BaseTest ;
import org.apache.jena.riot.TC_Riot ;
+import arq.TS_Cmd ;
import com.hp.hpl.jena.query.ARQ ;
import com.hp.hpl.jena.sparql.engine.main.QueryEngineMain ;
@@ -54,6 +55,8 @@ public class ARQTestSuite extends TestSu
ts.addTest(new JUnit4TestAdapter(TC_Atlas.class)) ;
ts.addTest(new JUnit4TestAdapter(TC_Riot.class)) ;
+ ts.addTest(new JUnit4TestAdapter(TS_Cmd.class)) ;
+
// Main ARQ internal test suite.
ts.addTest(new JUnit4TestAdapter(TC_General.class)) ;
Modified: jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java?rev=1459942&r1=1459941&r2=1459942&view=diff
==============================================================================
--- jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java (original)
+++ jena/trunk/jena-arq/src/test/java/org/apache/jena/riot/stream/TestStreamManager.java Fri Mar 22 19:27:25 2013
@@ -37,8 +37,6 @@ public class TestStreamManager extends B
{
private static final String directory = "testing/RIOT/StreamManager" ;
private static final String absDirectory = new File(directory).getAbsolutePath() ;
-
-
private static StreamManager streamMgrDir ;
private static StreamManager streamMgrHere ;