OpenJDK / lambda / lambda / jdk

changeset 5854:2632635aea6d it2-bootstrap

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add @Test annotations and a second column to data provider which names the dataset.
author mduigou
date Wed, 15 Aug 2012 16:39:02 -0700
parents cc0054ebcba5
children 9994054465df
files test-ng/tests/org/openjdk/tests/java/util/streams/ops/CumulateOpTest.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/FilterOpTest.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/FlatMapOpTest.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/GroupByOpTest.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/MapOpTest.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/SortedOpTest.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/StreamOpTestCase.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/ToArrayOpTest.java test-ng/tests/org/openjdk/tests/java/util/streams/ops/UniqOpTest.java
diffstat 9 files changed, 23 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/CumulateOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/CumulateOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -45,7 +45,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         assertConsistentOpBehavior(data, new CumulateOp<>(rPlus), l -> l);
         assertConsistentOpBehavior(data, new CumulateOp<>(rMin), l -> l);
         assertConsistentOpBehavior(data, new CumulateOp<>(rMax), l -> l);
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/FilterOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/FilterOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -47,7 +47,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         assertConsistentOpBehavior(data, new FilterOp<>(pTrue), l -> l);
         assertConsistentOpBehavior(data, new FilterOp<>(pFalse), l -> 0);
         assertConsistentOpBehavior(data, new FilterOp<>(pEven));
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/FlatMapOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/FlatMapOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -67,7 +67,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         assertConsistentOpBehavior(data, new FlatMapOp<>(mfId), l -> l);
         assertConsistentOpBehavior(data, new FlatMapOp<>(mfNull), l -> 0);
         assertConsistentOpBehavior(data, new FlatMapOp<>(mfLt));
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/GroupByOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/GroupByOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -43,11 +43,12 @@
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 import static org.testng.Assert.assertEquals;
+
 /**
- * MapOpTest
+ * GroupByOpTest
  *
- * @author Brian Goetz
  */
+@Test
 public class GroupByOpTest extends StreamOpTestCase {
 
     public void testRawIterator() {
@@ -62,7 +63,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         assertConsistentOpBehavior(data, new GroupByOp<>(mId));
         assertConsistentOpBehavior(data, new GroupByOp<>(mZero));
         assertConsistentOpBehavior(data, new GroupByOp<>(mDoubler));
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/MapOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/MapOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -49,7 +49,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         assertConsistentOpBehavior(data, new MapOp<>(mId), l -> l);
         assertConsistentOpBehavior(data, new MapOp<>(mZero), l -> l);
         assertConsistentOpBehavior(data, new MapOp<>(mDoubler), l -> l);
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/SortedOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/SortedOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -48,7 +48,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         SortedOp<Integer> op = new SortedOp<>(cInteger);
         assertSorted(new SequentialPipeline<>(Arrays.asList(data), op).into(new ArrayList<Integer>()).iterator());
         assertConsistentOpBehavior(data, op, l->l);
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/StreamOpTestCase.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/StreamOpTestCase.java	Wed Aug 15 16:39:02 2012 -0700
@@ -217,7 +217,16 @@
     // Return an array of Integer[]
     @DataProvider(name = "opArrays")
     public static Object[][] makeOpArrays() {
-        return new Object[][]{{to0}, {to1}, {to10}, {to100}, {to1000}, {ones}, {twice}, {reversed}, {pseudoRandom}};
+        return new Object[][]{
+            {"to zero", to0},
+            {"to one", to1},
+            {"to ten", to10},
+            {"to 100", to100},
+            {"to 1000", to1000},
+            {"100 ones", ones},
+            {"to 100 twice", twice},
+            {"reversed", reversed},
+            {"pseudorandom", pseudoRandom}};
     }
 
     private static class ArraySink<T> implements Sink<T>, Traversable<T>, Sized {
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/ToArrayOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/ToArrayOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -37,6 +37,7 @@
  * ToArrayOpTest
  *
  */
+@Test
 public class ToArrayOpTest extends StreamOpTestCase {
     public void testRawIterator() {
         ToArrayOp<Integer> op = ToArrayOp.singleton();
@@ -47,7 +48,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         ToArrayOp<Integer> op = ToArrayOp.singleton();
         assertConsistentOpBehavior(data, op);
     }
--- a/test-ng/tests/org/openjdk/tests/java/util/streams/ops/UniqOpTest.java	Wed Aug 15 13:19:46 2012 -0700
+++ b/test-ng/tests/org/openjdk/tests/java/util/streams/ops/UniqOpTest.java	Wed Aug 15 16:39:02 2012 -0700
@@ -38,6 +38,7 @@
  * UniqOpTest
  *
  */
+@Test
 public class UniqOpTest extends StreamOpTestCase {
     public void testRawIterator() {
         assertCountSum(UniqOp.<Integer>singleton().iterator(repeat(0, 10).iterator()), 1 , 0);
@@ -48,7 +49,7 @@
     }
 
     @Test(dataProvider = "opArrays")
-    public void testOps(Integer[] data) {
+    public void testOps(String name, Integer[] data) {
         UniqOp<Integer> op = UniqOp.<Integer>singleton();
         assertUnique(new SequentialPipeline<>(Arrays.asList(data), op).into(new ArrayList<Integer>()).iterator());
         assertConsistentOpBehavior(data, op, null);
© 2007, Oracle and/or its affiliates
Terms of Use · Privacy · Trademarks