jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject [01/14] jena git commit: Small cleanups in test code
Date Sun, 30 Oct 2016 18:36:13 GMT
Repository: jena
Updated Branches:
  refs/heads/master 488257beb -> 9915310d7


Small cleanups in test code


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/63a78bfa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/63a78bfa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/63a78bfa

Branch: refs/heads/master
Commit: 63a78bfa212c02ad96c8e45c47a9bdbe5e5ee175
Parents: 00f7dda
Author: ajs6f <ajs6f@virginia.edu>
Authored: Sat Oct 8 15:12:26 2016 -0400
Committer: ajs6f <ajs6f@virginia.edu>
Committed: Sun Oct 30 14:12:30 2016 -0400

----------------------------------------------------------------------
 .../org/apache/jena/atlas/lib/ReverseComparator.java     |  8 +++++++-
 .../jena/atlas/io/AbstractTestPeekInputStream.java       | 11 +++++------
 .../org/apache/jena/atlas/io/AbstractTestPeekReader.java | 11 +++++------
 .../java/org/apache/jena/atlas/io/TestBlockUTF8.java     |  1 -
 .../java/org/apache/jena/atlas/iterator/TestIter.java    |  2 +-
 .../org/apache/jena/atlas/iterator/TestIteratorPeek.java |  2 +-
 .../jena/atlas/iterator/TestIteratorWithBuffer.java      |  2 +-
 .../jena/atlas/iterator/TestIteratorWithHistory.java     |  2 +-
 .../test/java/org/apache/jena/atlas/lib/TestBitsInt.java | 11 ++---------
 .../java/org/apache/jena/atlas/lib/TestBitsLong.java     | 11 ++---------
 .../java/org/apache/jena/atlas/lib/TestEscapeStr.java    |  2 +-
 .../src/test/java/org/apache/jena/atlas/lib/TestHex.java |  2 +-
 .../java/org/apache/jena/atlas/lib/TestListUtils.java    |  3 +--
 .../java/org/apache/jena/atlas/lib/TestSetUtils.java     |  2 +-
 .../org/apache/jena/atlas/lib/cache/TestCacheSimple.java |  1 -
 .../java/org/apache/jena/atlas/lib/tuple/TestTuple.java  |  2 +-
 .../org/apache/jena/atlas/lib/tuple/TestTupleMap.java    |  4 +---
 17 files changed, 31 insertions(+), 46 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/main/java/org/apache/jena/atlas/lib/ReverseComparator.java
----------------------------------------------------------------------
diff --git a/jena-base/src/main/java/org/apache/jena/atlas/lib/ReverseComparator.java b/jena-base/src/main/java/org/apache/jena/atlas/lib/ReverseComparator.java
index 7019b68..0dd6f8d 100644
--- a/jena-base/src/main/java/org/apache/jena/atlas/lib/ReverseComparator.java
+++ b/jena-base/src/main/java/org/apache/jena/atlas/lib/ReverseComparator.java
@@ -20,7 +20,13 @@ package org.apache.jena.atlas.lib;
 
 import java.util.Comparator ;
 
-/** Comparator that compares the other way round to it's sub-comparator */  
+/**
+ *Comparator that compares the other way round to its sub-comparator
+ * @param <T>
+ * 
+ * @deprecated Prefer {@link Comparator#reversed()}
+ */
+@Deprecated
 public class ReverseComparator<T> implements Comparator<T>
 {
     private final Comparator<T> comparator ;

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java
b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java
index d127385..4b1945a 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekInputStream.java
@@ -77,7 +77,6 @@ public abstract class AbstractTestPeekInputStream extends BaseTest
         for ( int i = 0 ; i < c.length(); i++ )
         {
             checkLineCol(in, INIT_LINE, i+INIT_COL) ;
-            long z = in.getPosition() ;
             assertEquals(i, in.getPosition()) ;
             assertEquals(c.charAt(i), in.readByte()) ;
         }
@@ -140,7 +139,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest
     {
         PeekInputStream in = make("abc") ;
         checkLineCol(in, INIT_LINE, INIT_COL) ;
-        int ch = in.readByte() ;
+        in.readByte() ;
         // Pushback does not move line/col backwards.
         checkLineCol(in, INIT_LINE, INIT_COL+1) ;
         assertEquals('b', in.peekByte()) ;
@@ -153,7 +152,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest
     @Test public void unread3()
     {
         PeekInputStream in = make("") ;
-        int ch = in.readByte() ;
+        in.readByte() ;
         assertEquals(-1, in.peekByte()) ;
         in.pushbackByte('a') ;
         contains(in, "a") ;
@@ -162,7 +161,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest
     @Test public void unread4()
     {
         PeekInputStream in = make("") ;
-        int ch = in.readByte() ;
+        in.readByte() ;
         assertEquals(-1, in.peekByte()) ;
         in.pushbackByte('0') ;
         in.pushbackByte('1') ;
@@ -193,7 +192,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest
         contains(in, "320") ;
     }
 
-    private void checkLineCol(PeekInputStream in, long lineNum, long colNum)
+    private static void checkLineCol(PeekInputStream in, long lineNum, long colNum)
     {
         assertEquals("Line", lineNum, in.getLineNum()) ; 
         assertEquals("Column", colNum, in.getColNum()) ;
@@ -228,7 +227,7 @@ public abstract class AbstractTestPeekInputStream extends BaseTest
         assertTrue(in.eof()) ;
     }
     
-    private void contains(PeekInputStream in, String contents)
+    private static void contains(PeekInputStream in, String contents)
     {
         for ( int i = 0 ; i < contents.length(); i++ )
         {

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java
b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java
index 7ab67b5..faf65c2 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/io/AbstractTestPeekReader.java
@@ -77,7 +77,6 @@ public abstract class AbstractTestPeekReader extends BaseTest
         for ( int i = 0 ; i < c.length(); i++ )
         {
             checkLineCol(r, INIT_LINE, i+INIT_COL) ;
-            long z = r.getPosition() ;
             assertEquals(i, r.getPosition()) ;
             assertEquals(c.charAt(i), r.readChar()) ;
         }
@@ -140,7 +139,7 @@ public abstract class AbstractTestPeekReader extends BaseTest
     {
         PeekReader r = make("abc") ;
         checkLineCol(r, INIT_LINE, INIT_COL) ;
-        int ch = r.readChar() ;
+        r.readChar() ;
         // Pushback does not move line/col backwards.
         checkLineCol(r, INIT_LINE, INIT_COL+1) ;
         assertEquals('b', r.peekChar()) ;
@@ -153,7 +152,7 @@ public abstract class AbstractTestPeekReader extends BaseTest
     @Test public void unread3()
     {
         PeekReader r = make("") ;
-        int ch = r.readChar() ;
+        r.readChar() ;
         assertEquals(-1, r.peekChar()) ;
         r.pushbackChar('a') ;
         contains(r, "a") ;
@@ -162,7 +161,7 @@ public abstract class AbstractTestPeekReader extends BaseTest
     @Test public void unread4()
     {
         PeekReader r = make("") ;
-        int ch = r.readChar() ;
+        r.readChar() ;
         assertEquals(-1, r.peekChar()) ;
         r.pushbackChar('0') ;
         r.pushbackChar('1') ;
@@ -193,7 +192,7 @@ public abstract class AbstractTestPeekReader extends BaseTest
         contains(r, "320") ;
     }
 
-    private void checkLineCol(PeekReader r, long lineNum, long colNum)
+    private static void checkLineCol(PeekReader r, long lineNum, long colNum)
     {
         assertEquals("Line", lineNum, r.getLineNum()) ; 
         assertEquals("Column", colNum, r.getColNum()) ;
@@ -228,7 +227,7 @@ public abstract class AbstractTestPeekReader extends BaseTest
         assertTrue(r.eof()) ;
     }
     
-    private void contains(PeekReader r, String contents)
+    private static void contains(PeekReader r, String contents)
     {
         for ( int i = 0 ; i < contents.length(); i++ )
         {

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java
index e29d78a..74e6bce 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/io/TestBlockUTF8.java
@@ -185,7 +185,6 @@ public class TestBlockUTF8 extends BaseTest
         cb.flip() ;
         bytes.flip() ;
 
-        String str = cb.toString() ;
         ByteBuffer bytes2 = allocBB.allocate(bytes.capacity()) ;
         BlockUTF8.fromChars(cb, bytes2) ;
         bytes2.flip() ;

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
index 27b79c9..76929e4 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIter.java
@@ -169,7 +169,7 @@ public class TestIter
         assertEquals("x/y/z", x) ;
     }
     
-    private void test(Iterator<?> iter, Object... items)
+    private static void test(Iterator<?> iter, Object... items)
     {
         for ( Object x : items )
         {

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
index 01581d6..2f7f811 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorPeek.java
@@ -47,7 +47,7 @@ public class TestIteratorPeek extends BaseTest
         test(iter, "x", "y", "z", "x", "y", "z") ;
     }
     
-    private void test(Iter<?> iter, Object... items)
+    private static void test(Iter<?> iter, Object... items)
     {
         for ( Object x : items )
         {

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java
b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java
index 5bc70fd..a5dabfc 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithBuffer.java
@@ -87,7 +87,7 @@ public class TestIteratorWithBuffer extends BaseTest
         assertEquals("a", iter.next()) ;
     }
 
-    private IteratorWithBuffer<String> createBuffered(int N, String... strings)
+    private static IteratorWithBuffer<String> createBuffered(int N, String... strings)
     {
         List<String> data = Arrays.asList(strings) ;
         IteratorWithBuffer<String> iter = new IteratorWithBuffer<>(data.iterator(),
N) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java
b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java
index b2545b2..0be3366 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/iterator/TestIteratorWithHistory.java
@@ -77,7 +77,7 @@ public class TestIteratorWithHistory extends BaseTest
         assertEquals("b", iter.getPrevious(1)) ;
     }
 
-    private IteratorWithHistory<String> createHistory(int N, String... strings)
+    private static IteratorWithHistory<String> createHistory(int N, String... strings)
     {
         List<String> data = Arrays.asList(strings) ;
         IteratorWithHistory<String> iter = new IteratorWithHistory<>(data.iterator(),
N) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java
index 769aeb2..75e8ce0 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsInt.java
@@ -113,7 +113,6 @@ public class TestBitsInt extends BaseTest
     {
         int v = 0xF0F0 ;
         v = BitsInt.clear(v, 4, 8) ;
-        String s = Integer.toHexString(v) ;
         check(0xF000, v ) ;
     }
 
@@ -121,7 +120,6 @@ public class TestBitsInt extends BaseTest
     {
         int v = 0x80000000;
         v = BitsInt.clear(v, 31, 32) ;
-        String s = Integer.toHexString(v) ;
         check(0x0, v ) ;
     }
 
@@ -129,7 +127,6 @@ public class TestBitsInt extends BaseTest
     {
         int v = 0xC0000000;
         v = BitsInt.clear(v, 31, 32) ;
-        String s = Integer.toHexString(v) ;
         check(0x40000000, v ) ;
     }
 
@@ -137,7 +134,6 @@ public class TestBitsInt extends BaseTest
     {
         int v = -1 ;
         v = BitsInt.clear(v, 31, 32) ;
-        String s = Integer.toHexString(v) ;
         check(0x7FFFFFFF, v ) ;
     }
     
@@ -145,7 +141,6 @@ public class TestBitsInt extends BaseTest
     {
         int v = -1 ;
         v = BitsInt.clear(v, 16, 32) ;
-        String s = Integer.toHexString(v) ;
         check(0x0000FFFF, v ) ;
     }
 
@@ -153,7 +148,6 @@ public class TestBitsInt extends BaseTest
     {
         int v = -1 ;
         v = BitsInt.clear(v, 0, 16) ;
-        String s = Integer.toHexString(v) ;
         check(0xFFFF0000, v ) ;
     }
 
@@ -161,7 +155,6 @@ public class TestBitsInt extends BaseTest
     {
         int v = -1 ;
         v = BitsInt.clear(v, 0, 0) ;
-        String s = Integer.toHexString(v) ;
         check(-1, v ) ;
     }
 
@@ -452,12 +445,12 @@ public class TestBitsInt extends BaseTest
         check(0xAB, v ) ;
     }
     
-    private void check(int expected, int actual)
+    private static void check(int expected, int actual)
     {
         check(null, expected, actual) ;
     }
     
-    private void check(String msg, int expected, int actual)
+    private static void check(String msg, int expected, int actual)
     {
         if ( expected == actual ) return ;
         String s = "Expected: "+Integer.toHexString(expected)+" : Got: "+Integer.toHexString(actual)
;

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java
index 1fea546..10c81ce 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestBitsLong.java
@@ -113,7 +113,6 @@ public class TestBitsLong extends BaseTest
     {
         long v = 0xF0F0 ;
         v = BitsLong.clear(v, 4, 8) ;
-        String s = Long.toHexString(v) ;
         check(0xF000L, v ) ;
     }
 
@@ -121,7 +120,6 @@ public class TestBitsLong extends BaseTest
     {
         long v = 0x8000000000000000L;
         v = BitsLong.clear(v, 63, 64) ;
-        String s = Long.toHexString(v) ;
         check(0x0L, v ) ;
     }
 
@@ -129,7 +127,6 @@ public class TestBitsLong extends BaseTest
     {
         long v = 0xC000000000000000L;
         v = BitsLong.clear(v, 63, 64) ;
-        String s = Long.toHexString(v) ;
         check(0x4000000000000000L, v ) ;
     }
 
@@ -137,7 +134,6 @@ public class TestBitsLong extends BaseTest
     {
         long v = -1 ;
         v = BitsLong.clear(v, 63, 64) ;
-        String s = Long.toHexString(v) ;
         check(0x7FFFFFFFFFFFFFFFL, v ) ;
     }
     
@@ -145,7 +141,6 @@ public class TestBitsLong extends BaseTest
     {
         long v = -1 ;
         v = BitsLong.clear(v, 32, 64) ;
-        String s = Long.toHexString(v) ;
         check(0x00000000FFFFFFFFL, v ) ;
     }
 
@@ -153,7 +148,6 @@ public class TestBitsLong extends BaseTest
     {
         long v = -1 ;
         v = BitsLong.clear(v, 0, 32) ;
-        String s = Long.toHexString(v) ;
         check(0xFFFFFFFF00000000L, v ) ;
     }
 
@@ -161,7 +155,6 @@ public class TestBitsLong extends BaseTest
     {
         long v = -1L ;
         v = BitsLong.clear(v, 0, 0) ;
-        String s = Long.toHexString(v) ;
         check(-1L, v ) ;
     }
 
@@ -452,12 +445,12 @@ public class TestBitsLong extends BaseTest
         check(0xABL, v ) ;
     }
     
-    private void check(long expected, long actual)
+    private static void check(long expected, long actual)
     {
         check(null, expected, actual) ;
     }
     
-    private void check(String msg, long expected, long actual)
+    private static void check(String msg, long expected, long actual)
     {
         if ( expected == actual ) return ;
         String s = "Expected: "+Long.toHexString(expected)+" : Got: "+Long.toHexString(actual)
;

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java
index 7f4ab95..c2b6e8e 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestEscapeStr.java
@@ -33,7 +33,7 @@ public class TestEscapeStr {
     @Test public void escape_str_04()   { test("A\tB", "A\\tB") ; }
     @Test public void escape_str_05()   { test("\"", "\\\"") ; }
 
-    private void test(String input, String expected) {
+    private static void test(String input, String expected) {
         String output = EscapeStr.stringEsc(input) ;
         Assert.assertEquals(expected, output);
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java
index 9da0e30..e6bb895 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestHex.java
@@ -85,7 +85,7 @@ public class TestHex extends BaseTest
     }
     
     private static void testStr2Val(String str, int start, int length, int expected) {
-        int v = Hex.hexStringToInt(str, start, length) ;
+        Hex.hexStringToInt(str, start, length) ;
     }
     
     @Test public void hexValue_01()     { testStr2Val("A", 10); }

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java
index ccaa56a..6065c96 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestListUtils.java
@@ -69,10 +69,9 @@ public class TestListUtils extends BaseTest
         test(x, 1,2,3) ;
     }
 
-    private void test(List<Integer> x, int... args)
+    private static void test(List<Integer> x, int... args)
     {
         assertEquals(args.length, x.size()) ;
-        
         for ( int i = 0; i < args.length ; i++ )
             assertEquals(args[i], x.get(i).intValue()) ;
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java
index 689fb0f..d2113cc 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/TestSetUtils.java
@@ -171,7 +171,7 @@ public class TestSetUtils extends BaseTest
         return new HashSet<>(asList(values)) ;
     }
 
-    private void test(Set<Integer> x, int...values)
+    private static void test(Set<Integer> x, int...values)
     {
         List<Integer> y = asList(values) ;
         assertEquals(y.size(), x.size()) ;

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java
b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java
index 602be6c..cd94f99 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/cache/TestCacheSimple.java
@@ -43,7 +43,6 @@ public class TestCacheSimple extends BaseTest {
 	
 	@Test
 	public void testReplace() {
-	    final Integer key = 1 ;
 	    final String value1 = "A" ;
         final String value2 = "B" ;
 	    

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java
index f74de38..bd4005b 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTuple.java
@@ -197,7 +197,7 @@ public class TestTuple {
         assertArrayEquals(array1, array) ;
     }
 
-    private void check(Tuple<Integer> tuple) {
+    private static void check(Tuple<Integer> tuple) {
         int val = 9 ;
         for ( int i = 0 ; i < tuple.len() ; i++ ) {
             assertEquals(val-i, tuple.get(i).intValue()) ; 

http://git-wip-us.apache.org/repos/asf/jena/blob/63a78bfa/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java
----------------------------------------------------------------------
diff --git a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java
index d10cce5..3c6d1d0 100644
--- a/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java
+++ b/jena-base/src/test/java/org/apache/jena/atlas/lib/tuple/TestTupleMap.java
@@ -147,15 +147,13 @@ public class TestTupleMap {
 
         List<Integer> listPut = x.transformGet() ;
         List<Integer> listPutExpected = Arrays.asList(1, 2, 0) ;
-        assertEquals(listGetExpected, listGet) ;
+        assertEquals(listPutExpected, listPut) ;
         
     }
     
     @Test
     public void map_array_1() {
         TupleMap x = TupleMap.create("SPO","POS"); 
-        Tuple<Integer> t = TupleFactory.tuple(2, 0, 1);
-        Tuple<Integer> t1 = x.map(t);
 
         String[] array = {"X", "Y", "Z"};
         


Mime
View raw message