You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mrunit.apache.org by jd...@apache.org on 2012/05/08 05:52:23 UTC
svn commit: r1335332 - in /incubator/mrunit/trunk/src:
main/java/org/apache/hadoop/mrunit/testutil/
test/java/org/apache/hadoop/mrunit/
test/java/org/apache/hadoop/mrunit/mapreduce/
Author: jdonofrio
Date: Tue May 8 03:52:22 2012
New Revision: 1335332
URL: http://svn.apache.org/viewvc?rev=1335332&view=rev
Log:
MRUNIT-108: copy ExtendedAssert.assertListEquals to src/test/java and deprecate entire class and all methods in ExtendedAssert in src/main/java
Added:
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/ExtendedAssert.java (with props)
Modified:
incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/testutil/ExtendedAssert.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestTestDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
Modified: incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/testutil/ExtendedAssert.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/testutil/ExtendedAssert.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/testutil/ExtendedAssert.java (original)
+++ incubator/mrunit/trunk/src/main/java/org/apache/hadoop/mrunit/testutil/ExtendedAssert.java Tue May 8 03:52:22 2012
@@ -22,6 +22,10 @@ import static org.junit.Assert.fail;
import java.util.List;
+/**
+ * @deprecated No replacement due to automatic comparisons using runTest()
+ */
+@Deprecated
public final class ExtendedAssert {
private ExtendedAssert() {
@@ -34,7 +38,9 @@ public final class ExtendedAssert {
* a list full of expected values
* @param actual
* a list full of actual test values
+ * @deprecated No replacement due to automatic list comparison using runTest()
*/
+ @Deprecated
public static void assertListEquals(final List<?> expected,
final List<?> actual) {
if (expected.size() != actual.size()) {
@@ -59,24 +65,44 @@ public final class ExtendedAssert {
/**
* asserts x > y
+ *
+ * @deprecated No replacement since extension methods to JUnit assert methods
+ * dont fit well with MRUnit's goals
*/
+ @Deprecated
public static void assertGreater(final int x, final int y) {
assertTrue("Expected " + x + " > " + y, x > y);
}
- /** asserts x >= y) */
+ /**
+ * asserts x >= y)
+ *
+ * @deprecated No replacement since extension methods to JUnit assert methods
+ * dont fit well with MRUnit's goals
+ */
+ @Deprecated
public static void assertGreaterOrEqual(final int x, final int y) {
assertTrue("Expected " + x + " >= " + y, x >= y);
}
/**
* asserts x < y
+ *
+ * @deprecated No replacement since extension methods to JUnit assert methods
+ * dont fit well with MRUnit's goals
*/
+ @Deprecated
public static void assertLess(final int x, final int y) {
assertTrue("Expected " + x + " < " + y, x < y);
}
- /** asserts x >= y) */
+ /**
+ * asserts x >= y)
+ *
+ * @deprecated No replacement since extension methods to JUnit assert methods
+ * dont fit well with MRUnit's goals
+ * */
+ @Deprecated
public static void assertLessOrEqual(final int x, final int y) {
assertTrue("Expected " + x + " <= " + y, x <= y);
}
Added: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/ExtendedAssert.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/ExtendedAssert.java?rev=1335332&view=auto
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/ExtendedAssert.java (added)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/ExtendedAssert.java Tue May 8 03:52:22 2012
@@ -0,0 +1,58 @@
+/**
+ * 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 org.apache.hadoop.mrunit;
+
+import static org.junit.Assert.fail;
+
+import java.util.List;
+
+public final class ExtendedAssert {
+
+ private ExtendedAssert() {
+ }
+
+ /**
+ * Asserts that all the elements of the list are equivalent under equals()
+ *
+ * @param expected
+ * a list full of expected values
+ * @param actual
+ * a list full of actual test values
+ */
+ public static void assertListEquals(final List<?> expected,
+ final List<?> actual) {
+ if (expected.size() != actual.size()) {
+ fail("Expected list of size " + expected.size() + "; actual size is "
+ + actual.size());
+ }
+
+ for (int i = 0; i < expected.size(); i++) {
+ final Object t1 = expected.get(i);
+ final Object t2 = actual.get(i);
+
+ final boolean same = (t1 == t2) || (t1 != null && t1.equals(t2))
+ || (t2 != null && t2.equals(t1));
+ if (!same) {
+ fail("Expected element " + t1 + " ("
+ + ((t2 == null) ? "unknown type" : t2.getClass().getName())
+ + ") at index " + i + " != actual element " + t2 + " ("
+ + ((t2 == null) ? "unknown type" : t2.getClass().getName()) + ")");
+ }
+ }
+ }
+}
Propchange: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/ExtendedAssert.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/ExtendedAssert.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapDriver.java Tue May 8 03:52:22 2012
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.mrunit;
-import static org.apache.hadoop.mrunit.testutil.ExtendedAssert.assertListEquals;
+import static org.apache.hadoop.mrunit.ExtendedAssert.assertListEquals;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestMapReduceDriver.java Tue May 8 03:52:22 2012
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.mrunit;
-import static org.apache.hadoop.mrunit.testutil.ExtendedAssert.assertListEquals;
+import static org.apache.hadoop.mrunit.ExtendedAssert.assertListEquals;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestReduceDriver.java Tue May 8 03:52:22 2012
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.mrunit;
-import static org.apache.hadoop.mrunit.testutil.ExtendedAssert.assertListEquals;
+import static org.apache.hadoop.mrunit.ExtendedAssert.assertListEquals;
import java.io.IOException;
import java.util.ArrayList;
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestTestDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestTestDriver.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestTestDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/TestTestDriver.java Tue May 8 03:52:22 2012
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.mrunit;
-import static org.apache.hadoop.mrunit.testutil.ExtendedAssert.assertListEquals;
+import static org.apache.hadoop.mrunit.ExtendedAssert.assertListEquals;
import static org.junit.Assert.assertEquals;
import java.util.ArrayList;
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapDriver.java Tue May 8 03:52:22 2012
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.mrunit.mapreduce;
-import static org.apache.hadoop.mrunit.testutil.ExtendedAssert.assertListEquals;
+import static org.apache.hadoop.mrunit.ExtendedAssert.assertListEquals;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestMapReduceDriver.java Tue May 8 03:52:22 2012
@@ -17,7 +17,7 @@
*/
package org.apache.hadoop.mrunit.mapreduce;
-import static org.apache.hadoop.mrunit.testutil.ExtendedAssert.assertListEquals;
+import static org.apache.hadoop.mrunit.ExtendedAssert.assertListEquals;
import static org.junit.Assert.assertEquals;
import java.io.IOException;
Modified: incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java
URL: http://svn.apache.org/viewvc/incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java?rev=1335332&r1=1335331&r2=1335332&view=diff
==============================================================================
--- incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java (original)
+++ incubator/mrunit/trunk/src/test/java/org/apache/hadoop/mrunit/mapreduce/TestReduceDriver.java Tue May 8 03:52:22 2012
@@ -18,7 +18,7 @@
package org.apache.hadoop.mrunit.mapreduce;
-import static org.apache.hadoop.mrunit.testutil.ExtendedAssert.assertListEquals;
+import static org.apache.hadoop.mrunit.ExtendedAssert.assertListEquals;
import static org.junit.Assert.assertEquals;
import java.io.IOException;