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/11/23 20:28:35 UTC
[3/4] 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/885dc774
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/885dc774
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/885dc774
Branch: refs/heads/master
Commit: 885dc7744aaefded468fdb8b7caeea441c4c9f63
Parents: e8613aa
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Nov 20 21:55:00 2017 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Nov 20 21:55:00 2017 +0000
----------------------------------------------------------------------
.../apache/jena/atlas/iterator/TestIter.java | 448 ++++++++-----------
1 file changed, 199 insertions(+), 249 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/885dc774/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 3e614cb..13ba84b 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
@@ -36,30 +36,25 @@ public class TestIter
List<String> data3 = Arrays.asList(null, "x", null, null, null, "y", "z", null);
@Test
- public void append_1()
- {
- Iterator<String> iter = Iter.append(data1.iterator(), data0.iterator()) ;
- test(iter, "a") ;
+ public void append_1() {
+ Iterator<String> iter = Iter.append(data1.iterator(), data0.iterator());
+ test(iter, "a");
}
-
-
+
@Test
- public void append_2()
- {
- Iterator<String> iter = Iter.append(data0.iterator(), data1.iterator()) ;
- test(iter, "a") ;
+ public void append_2() {
+ Iterator<String> iter = Iter.append(data0.iterator(), data1.iterator());
+ test(iter, "a");
}
@Test
- public void append_3()
- {
- Iterator<String> iter = Iter.append(data1.iterator(), data2.iterator()) ;
- test(iter, "a", "x", "y", "z") ;
+ public void append_3() {
+ Iterator<String> iter = Iter.append(data1.iterator(), data2.iterator());
+ test(iter, "a", "x", "y", "z");
}
@Test
- public void append_4()
- {
+ public void append_4() {
List<String> L = new ArrayList<>(3);
L.add("a");
L.add("b");
@@ -68,28 +63,24 @@ public class TestIter
R.add("d");
R.add("e");
R.add("f");
-
-
- Iterator<String> LR = Iter.append(L.iterator(), R.iterator()) ;
-
- while (LR.hasNext())
- {
+
+ Iterator<String> LR = Iter.append(L.iterator(), R.iterator());
+
+ while (LR.hasNext()) {
String s = LR.next();
-
- if ("c".equals(s))
- {
+
+ if ( "c".equals(s) ) {
LR.hasNext(); // test for JENA-60
LR.remove();
}
}
-
+
assertEquals("ab", Iter.asString(L, ""));
assertEquals("def", Iter.asString(R, ""));
}
-
+
@Test
- public void append_5()
- {
+ public void append_5() {
List<String> L = new ArrayList<>(3);
L.add("a");
L.add("b");
@@ -98,28 +89,24 @@ public class TestIter
R.add("d");
R.add("e");
R.add("f");
-
-
- Iterator<String> LR = Iter.append(L.iterator(), R.iterator()) ;
-
- while (LR.hasNext())
- {
+
+ Iterator<String> LR = Iter.append(L.iterator(), R.iterator());
+
+ while (LR.hasNext()) {
String s = LR.next();
-
- if ("d".equals(s))
- {
+
+ if ( "d".equals(s) ) {
LR.hasNext(); // test for JENA-60
LR.remove();
}
}
-
+
assertEquals("abc", Iter.asString(L, ""));
assertEquals("ef", Iter.asString(R, ""));
}
-
+
@Test
- public void append_6()
- {
+ public void append_6() {
List<String> L = new ArrayList<>(3);
L.add("a");
L.add("b");
@@ -128,272 +115,241 @@ public class TestIter
R.add("d");
R.add("e");
R.add("f");
-
-
- Iterator<String> LR = Iter.append(L.iterator(), R.iterator()) ;
-
- while (LR.hasNext())
- {
- LR.next() ;
+
+ Iterator<String> LR = Iter.append(L.iterator(), R.iterator());
+
+ while (LR.hasNext()) {
+ LR.next();
}
- LR.remove() ;
-
- assertEquals("abc", Iter.asString(L, "")) ;
- assertEquals("de", Iter.asString(R, "")) ;
+ LR.remove();
+
+ assertEquals("abc", Iter.asString(L, ""));
+ assertEquals("de", Iter.asString(R, ""));
}
-
+
@Test
- public void asString_1()
- {
- String x = Iter.asString(data0, "") ;
- assertEquals("", x) ;
+ public void asString_1() {
+ String x = Iter.asString(data0, "");
+ assertEquals("", x);
}
@Test
- public void asString_2()
- {
- String x = Iter.asString(data1, "") ;
- assertEquals("a", x) ;
+ public void asString_2() {
+ String x = Iter.asString(data1, "");
+ assertEquals("a", x);
}
@Test
- public void asString_3()
- {
- String x = Iter.asString(data1, "/") ;
- assertEquals("a", x) ;
+ public void asString_3() {
+ String x = Iter.asString(data1, "/");
+ assertEquals("a", x);
}
@Test
- public void asString_4()
- {
- String x = Iter.asString(data2, "/") ;
- assertEquals("x/y/z", x) ;
+ public void asString_4() {
+ String x = Iter.asString(data2, "/");
+ assertEquals("x/y/z", x);
}
-
- private static void test(Iterator<?> iter, Object... items)
- {
- for ( Object x : items )
- {
- assertTrue(iter.hasNext()) ;
- assertEquals(x, iter.next()) ;
+
+ private static void test(Iterator<? > iter, Object...items) {
+ for ( Object x : items ) {
+ assertTrue(iter.hasNext());
+ assertEquals(x, iter.next());
}
- assertFalse(iter.hasNext()) ;
+ assertFalse(iter.hasNext());
}
- static Iter.Folder<String, String> f1 = new Iter.Folder<String, String>() {
- @Override
- public String eval(String acc, String arg)
- {
- return acc + arg ;
- }
- } ;
+ static Iter.Folder<String, String> f1 = (acc, arg)->acc + arg ;
@Test
- public void fold_01()
- {
- String[] x = { "a", "b", "c" } ;
- String z = Iter.foldLeft(Arrays.asList(x), f1, "X") ;
- assertEquals("Xabc", z) ;
+ public void fold_01() {
+ String[] x = {"a", "b", "c"};
+ String z = Iter.foldLeft(Arrays.asList(x), f1, "X");
+ assertEquals("Xabc", z);
}
-
+
@Test
- public void fold_02()
- {
- String[] x = { "a", "b", "c" } ;
- String z = Iter.foldRight(Arrays.asList(x), f1, "X") ;
- assertEquals("Xcba", z) ;
+ public void fold_02() {
+ String[] x = {"a", "b", "c"};
+ String z = Iter.foldRight(Arrays.asList(x), f1, "X");
+ assertEquals("Xcba", z);
}
-
+
@Test
- public void fold_03()
- {
- String[] x = { } ;
- String z = Iter.foldLeft(Arrays.asList(x), f1, "X") ;
- assertEquals("X", z) ;
+ public void fold_03() {
+ String[] x = {};
+ String z = Iter.foldLeft(Arrays.asList(x), f1, "X");
+ assertEquals("X", z);
}
-
+
@Test
- public void fold_04()
- {
- String[] x = { } ;
- String z = Iter.foldRight(Arrays.asList(x), f1, "X") ;
- assertEquals("X", z) ;
+ public void fold_04() {
+ String[] x = {};
+ String z = Iter.foldRight(Arrays.asList(x), f1, "X");
+ assertEquals("X", z);
}
-
@Test
- public void map_01()
- {
+ public void map_01() {
Iterator<String> it = Iter.map(data2.iterator(), item -> item + item);
test(it, "xx", "yy", "zz");
}
- Predicate<String> filter = item -> item.length() == 1;
+ private Predicate<String> filter = item -> item.length() == 1;
@Test
- public void first_01()
- {
- Iter<String> iter = Iter.nullIter() ;
- assertEquals(null, Iter.first(iter, filter)) ;
+ public void first_01() {
+ Iter<String> iter = Iter.nullIter();
+ assertEquals(null, Iter.first(iter, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void first_02()
- {
- List<String> data = Arrays.asList( "11", "A", "B", "C") ;
- assertEquals("A", Iter.first(data, filter)) ;
+ public void first_02() {
+ List<String> data = Arrays.asList("11", "A", "B", "C");
+ assertEquals("A", Iter.first(data, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void first_03()
- {
- List<String> data = Arrays.asList( "11", "AA", "BB", "CC") ;
- assertEquals(null, Iter.first(data, filter)) ;
+ public void first_03() {
+ List<String> data = Arrays.asList("11", "AA", "BB", "CC");
+ assertEquals(null, Iter.first(data, filter));
}
-
+
@Test
- public void first_04()
- {
- Iter<String> iter = Iter.nullIter() ;
- assertEquals(-1, Iter.firstIndex(iter, filter)) ;
+ public void first_04() {
+ Iter<String> iter = Iter.nullIter();
+ assertEquals(-1, Iter.firstIndex(iter, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void first_05()
- {
- List<String> data = Arrays.asList( "11", "A", "B", "C") ;
- assertEquals(1, Iter.firstIndex(data, filter)) ;
+ public void first_05() {
+ List<String> data = Arrays.asList("11", "A", "B", "C");
+ assertEquals(1, Iter.firstIndex(data, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void first_06()
- {
- List<String> data = Arrays.asList( "11", "AA", "BB", "CC") ;
- assertEquals(-1, Iter.firstIndex(data, filter)) ;
+ public void first_06() {
+ List<String> data = Arrays.asList("11", "AA", "BB", "CC");
+ assertEquals(-1, Iter.firstIndex(data, filter));
}
@Test
- public void last_01()
- {
- Iter<String> iter = Iter.nullIter() ;
- assertEquals(null, Iter.last(iter, filter)) ;
+ public void last_01() {
+ Iter<String> iter = Iter.nullIter();
+ assertEquals(null, Iter.last(iter, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void last_02()
- {
- List<String> data = Arrays.asList( "11", "A", "B", "C") ;
- assertEquals("C", Iter.last(data, filter)) ;
+ public void last_02() {
+ List<String> data = Arrays.asList("11", "A", "B", "C");
+ assertEquals("C", Iter.last(data, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void last_03()
- {
- List<String> data = Arrays.asList( "11", "AA", "BB", "CC") ;
- assertEquals(null, Iter.last(data, filter)) ;
+ public void last_03() {
+ List<String> data = Arrays.asList("11", "AA", "BB", "CC");
+ assertEquals(null, Iter.last(data, filter));
}
-
+
@Test
- public void last_04()
- {
- Iter<String> iter = Iter.nullIter() ;
- assertEquals(-1, Iter.lastIndex(iter, filter)) ;
+ public void last_04() {
+ Iter<String> iter = Iter.nullIter();
+ assertEquals(-1, Iter.lastIndex(iter, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void last_05()
- {
- List<String> data = Arrays.asList( "11", "A", "B", "C") ;
- assertEquals(3, Iter.lastIndex(data, filter)) ;
+ public void last_05() {
+ List<String> data = Arrays.asList("11", "A", "B", "C");
+ assertEquals(3, Iter.lastIndex(data, filter));
}
@SuppressWarnings("deprecation")
@Test
- public void last_06()
- {
- List<String> data = Arrays.asList( "11", "AA", "BB", "CC") ;
- assertEquals(-1, Iter.lastIndex(data, filter)) ;
+ public void last_06() {
+ List<String> data = Arrays.asList("11", "AA", "BB", "CC");
+ assertEquals(-1, Iter.lastIndex(data, filter));
}
-
-
- private static Iterator<?> iterator(int n) {
- return IntStream.range(1, n+1).iterator();
+
+ private static Iterator<? > iterator(int n) {
+ return IntStream.range(1, n + 1).iterator();
}
- @Test public void iteratorStep_1() {
- Iterator<?> iter = iterator(0);
+ @Test
+ public void iteratorStep_1() {
+ Iterator<? > iter = iterator(0);
int x = Iter.step(iter, 0);
- assertEquals(0,x);
+ assertEquals(0, x);
}
-
- @Test public void iteratorStep_2() {
- Iterator<?> iter = iterator(0);
+
+ @Test
+ public void iteratorStep_2() {
+ Iterator<? > iter = iterator(0);
int x = Iter.step(iter, 1);
- assertEquals(0,x);
+ assertEquals(0, x);
}
- @Test public void iteratorStep_3() {
- Iterator<?> iter = iterator(5);
+ @Test
+ public void iteratorStep_3() {
+ Iterator<? > iter = iterator(5);
int x = Iter.step(iter, 1);
- assertEquals(1,x);
+ assertEquals(1, x);
}
- @Test public void iteratorStep_4() {
- Iterator<?> iter = iterator(5);
+ @Test
+ public void iteratorStep_4() {
+ Iterator<? > iter = iterator(5);
int x = Iter.step(iter, 4);
- assertEquals(4,x);
+ assertEquals(4, x);
}
-
- @Test public void iteratorStep_5() {
- Iterator<?> iter = iterator(5);
+
+ @Test
+ public void iteratorStep_5() {
+ Iterator<? > iter = iterator(5);
int x = Iter.step(iter, 5);
- assertEquals(5,x);
+ assertEquals(5, x);
}
-
- @Test public void iteratorStep_6() {
- Iterator<?> iter = iterator(5);
+
+ @Test
+ public void iteratorStep_6() {
+ Iterator<? > iter = iterator(5);
int x = Iter.step(iter, 6);
- assertEquals(5,x);
+ assertEquals(5, x);
}
-
@Test
- public void take_01()
- {
- List<String> data = Arrays.asList( "1", "A", "B", "CC") ;
- List<String> data2 = Iter.take(data.iterator(), 2) ;
- assertEquals(2, data2.size()) ;
- assertEquals("1", data2.get(0)) ;
- assertEquals("A", data2.get(1)) ;
+ public void take_01() {
+ List<String> data = Arrays.asList("1", "A", "B", "CC");
+ List<String> data2 = Iter.take(data.iterator(), 2);
+ assertEquals(2, data2.size());
+ assertEquals("1", data2.get(0));
+ assertEquals("A", data2.get(1));
}
-
+
@Test
- public void take_02()
- {
- List<String> data = Arrays.asList( "1", "A", "B", "CC") ;
- List<String> data2 = Iter.take(data.iterator(), 0) ;
- assertEquals(0, data2.size()) ;
+ public void take_02() {
+ List<String> data = Arrays.asList("1", "A", "B", "CC");
+ List<String> data2 = Iter.take(data.iterator(), 0);
+ assertEquals(0, data2.size());
}
@Test
- public void take_03()
- {
- List<String> data = Arrays.asList( "1", "A", "B", "CC") ;
- List<String> data2 = Iter.take(data.iterator(), 10) ;
- assertEquals(4, data2.size()) ;
- assertEquals("1", data2.get(0)) ;
- assertEquals("A", data2.get(1)) ;
- assertEquals("B", data2.get(2)) ;
- assertEquals("CC", data2.get(3)) ;
+ public void take_03() {
+ List<String> data = Arrays.asList("1", "A", "B", "CC");
+ List<String> data2 = Iter.take(data.iterator(), 10);
+ assertEquals(4, data2.size());
+ assertEquals("1", data2.get(0));
+ assertEquals("A", data2.get(1));
+ assertEquals("B", data2.get(2));
+ assertEquals("CC", data2.get(3));
}
-
+
@Test
public void take_04() {
List<String> data = Arrays.asList("a", "b", "b", "c", "c", "d");
@@ -440,57 +396,52 @@ public class TestIter
Iterator<String> iter = Iter.takeWhile(data.iterator(), item -> true);
assertFalse(iter.hasNext());
}
-
+
@Test
- public void filter_01()
- {
+ public void filter_01() {
test(Iter.removeNulls(data3.iterator()), "x", "y", "z");
}
-
+
@Test
- public void filter_02()
- {
+ public void filter_02() {
Iterator<String> it = Iter.filter(data3.iterator(), item -> "x".equals(item) || "z".equals(item));
-
test(it, "x", "z");
}
-
+
@Test
- public void filter_03()
- {
+ public void filter_03() {
Iterator<String> it = Iter.filter(data3.iterator(), item -> null == item || "x".equals(item));
-
test(it, null, "x", null, null, null, null);
}
-
- @Test public void distinct_01()
- {
- List<String> x = Arrays.asList("a", "b", "a") ;
- Iterator<String> iter = Iter.distinct(x.iterator()) ;
- test(iter, "a", "b") ;
+
+ @Test
+ public void distinct_01() {
+ List<String> x = Arrays.asList("a", "b", "a");
+ Iterator<String> iter = Iter.distinct(x.iterator());
+ test(iter, "a", "b");
}
-
- @Test public void distinct_02()
- {
- List<String> x = Arrays.asList("a", "b", "a") ;
- Iterator<String> iter = Iter.distinctAdjacent(x.iterator()) ;
- test(iter, "a", "b", "a") ;
+
+ @Test
+ public void distinct_02() {
+ List<String> x = Arrays.asList("a", "b", "a");
+ Iterator<String> iter = Iter.distinctAdjacent(x.iterator());
+ test(iter, "a", "b", "a");
}
-
- @Test public void distinct_03()
- {
- List<String> x = Arrays.asList("a", "a", "b", "b", "b", "a", "a") ;
- Iterator<String> iter = Iter.distinct(x.iterator()) ;
- test(iter, "a", "b") ;
+
+ @Test
+ public void distinct_03() {
+ List<String> x = Arrays.asList("a", "a", "b", "b", "b", "a", "a");
+ Iterator<String> iter = Iter.distinct(x.iterator());
+ test(iter, "a", "b");
}
-
- @Test public void distinct_04()
- {
- List<String> x = Arrays.asList("a", "a", "b", "b", "b", "a", "a") ;
- Iterator<String> iter = Iter.distinctAdjacent(x.iterator()) ;
- test(iter, "a", "b", "a") ;
+
+ @Test
+ public void distinct_04() {
+ List<String> x = Arrays.asList("a", "a", "b", "b", "b", "a", "a");
+ Iterator<String> iter = Iter.distinctAdjacent(x.iterator());
+ test(iter, "a", "b", "a");
}
-
+
private static class AlwaysAcceptFilterStack extends FilterStack<Object> {
public AlwaysAcceptFilterStack(Predicate<Object> f) {
super(f);
@@ -508,12 +459,11 @@ public class TestIter
FilterStack<Object> filterStack = new AlwaysAcceptFilterStack(filter);
assertTrue(filterStack.test(new Object()));
}
-
+
@Test
public void testFilterStack_02() {
Predicate<Object> filter = x -> false;
FilterStack<Object> filterStack = new AlwaysAcceptFilterStack(filter);
assertFalse(filterStack.test(new Object()));
}
-
}