[richfaces-svn-commits] JBoss Rich Faces SVN: r19235 - in modules/tests/metamer/trunk: ftest-source/src/main/java/org and 1 other directories.

Author: lfryc(a)redhat.com Date: 2010-09-17 05:12:32 -0400 (Fri, 17 Sep 2010) New Revision: 19235 Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/testng/ modules/tests/metamer/trunk/ftest-source/src/main/java/org/testng/Assert.java Modified: modules/tests/metamer/trunk/pom.xml Log: upgraded testng to 5.14; added org.testng.Assert locally to project (caused runtime errors while there is backward incompatibility with testng-eclipse plugin) Added: modules/tests/metamer/trunk/ftest-source/src/main/java/org/testng/Assert.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/testng/Assert.java (rev 0) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/testng/Assert.java 2010-09-17 09:12:32 UTC (rev 19235) @@ -0,0 +1,676 @@ +package org.testng; + +import org.testng.collections.Lists; + +import java.lang.reflect.Array; +import java.util.Arrays; +import java.util.Collection; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + + +/** + * Assertion tool class. Presents assertion methods with a more natural parameter order. + * The order is always <B>actualValue</B>, <B>expectedValue</B> [, message]. + * + * @author <a href='mailto:the_mindstorm@evolva.ro'>Alexandru Popescu</a> + */ +public class Assert { + + /** + * Protect constructor since it is a static only class + */ + protected Assert() { + // hide constructor + } + + /** + * Asserts that a condition is true. If it isn't, + * an AssertionError, with the given message, is thrown. + * @param condition the condition to evaluate + * @param message the assertion error message + */ + static public void assertTrue(boolean condition, CharSequence message) { + if(!condition) { + failNotEquals( Boolean.valueOf(condition), Boolean.TRUE, message); + } + } + + /** + * Asserts that a condition is true. If it isn't, + * an AssertionError is thrown. + * @param condition the condition to evaluate + */ + static public void assertTrue(boolean condition) { + assertTrue(condition, null); + } + + /** + * Asserts that a condition is false. If it isn't, + * an AssertionError, with the given message, is thrown. + * @param condition the condition to evaluate + * @param message the assertion error message + */ + static public void assertFalse(boolean condition, CharSequence message) { + if(condition) { + failNotEquals( Boolean.valueOf(condition), Boolean.FALSE, message); // TESTNG-81 + } + } + + /** + * Asserts that a condition is false. If it isn't, + * an AssertionError is thrown. + * @param condition the condition to evaluate + */ + static public void assertFalse(boolean condition) { + assertFalse(condition, null); + } + + /** + * Fails a test with the given message and wrapping the original exception. + * + * @param message the assertion error message + * @param realCause the original exception + */ + static public void fail(CharSequence message, Throwable realCause) { + AssertionError ae = new AssertionError(message); + ae.initCause(realCause); + + throw ae; + } + + /** + * Fails a test with the given message. + * @param message the assertion error message + */ + static public void fail(CharSequence message) { + throw new AssertionError(message); + } + + /** + * Fails a test with no message. + */ + static public void fail() { + fail(null); + } + + /** + * Asserts that two objects are equal. If they are not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(Object actual, Object expected, CharSequence message) { + if((expected == null) && (actual == null)) { + return; + } + if(expected != null) { + if (expected.getClass().isArray()) { + assertArrayEquals(actual, expected, message); + return; + } else if (expected.equals(actual)) { + return; + } + } + failNotEquals(actual, expected, message); + } + + /** + * Asserts that two objects are equal. It they are not, an AssertionError, + * with given message, is thrown. + * @param actual the actual value + * @param expected the expected value (should be an non-null array value) + * @param message the assertion error message + */ + private static void assertArrayEquals(Object actual, Object expected, CharSequence message) { + //is called only when expected is an array + if (actual.getClass().isArray()) { + int expectedLength = Array.getLength(expected); + if (expectedLength == Array.getLength(actual)) { + for (int i = 0 ; i < expectedLength ; i++) { + Object _actual = Array.get(actual, i); + Object _expected = Array.get(expected, i); + try { + assertEquals(_actual, _expected); + } catch (AssertionError ae) { + failNotEquals(actual, expected, message == null ? "" : message + + " (values as index " + i + " are not the same)"); + } + } + //array values matched + return; + } else { + failNotEquals(Array.getLength(actual), expectedLength, message == null ? "" : message + + " (Array lengths are not the same)"); + } + } + failNotEquals(actual, expected, message); + } + +/** + * Asserts that two objects are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(Object actual, Object expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two Strings are equal. If they are not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(String actual, String expected, CharSequence message) { + assertEquals((Object) actual, (Object) expected, message); + } + + /** + * Asserts that two Strings are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(String actual, String expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two doubles are equal concerning a delta. If they are not, + * an AssertionError, with the given message, is thrown. If the expected + * value is infinity then the delta value is ignored. + * @param actual the actual value + * @param expected the expected value + * @param delta the absolute tolerate value value between the actual and expected value + * @param message the assertion error message + */ + static public void assertEquals(double actual, double expected, double delta, CharSequence message) { + // handle infinity specially since subtracting to infinite values gives NaN and the + // the following test fails + if(Double.isInfinite(expected)) { + if(!(expected == actual)) { + failNotEquals(new Double(actual), new Double(expected), message); + } + } + else if(!(Math.abs(expected - actual) <= delta)) { // Because comparison with NaN always returns false + failNotEquals(new Double(actual), new Double(expected), message); + } + } + + /** + * Asserts that two doubles are equal concerning a delta. If they are not, + * an AssertionError is thrown. If the expected value is infinity then the + * delta value is ignored. + * @param actual the actual value + * @param expected the expected value + * @param delta the absolute tolerate value value between the actual and expected value + */ + static public void assertEquals(double actual, double expected, double delta) { + assertEquals(actual, expected, delta, null); + } + + /** + * Asserts that two floats are equal concerning a delta. If they are not, + * an AssertionError, with the given message, is thrown. If the expected + * value is infinity then the delta value is ignored. + * @param actual the actual value + * @param expected the expected value + * @param delta the absolute tolerate value value between the actual and expected value + * @param message the assertion error message + */ + static public void assertEquals(float actual, float expected, float delta, CharSequence message) { + // handle infinity specially since subtracting to infinite values gives NaN and the + // the following test fails + if(Float.isInfinite(expected)) { + if(!(expected == actual)) { + failNotEquals(new Float(actual), new Float(expected), message); + } + } + else if(!(Math.abs(expected - actual) <= delta)) { + failNotEquals(new Float(actual), new Float(expected), message); + } + } + + /** + * Asserts that two floats are equal concerning a delta. If they are not, + * an AssertionError is thrown. If the expected + * value is infinity then the delta value is ignored. + * @param actual the actual value + * @param expected the expected value + * @param delta the absolute tolerate value value between the actual and expected value + */ + static public void assertEquals(float actual, float expected, float delta) { + assertEquals(actual, expected, delta, null); + } + + /** + * Asserts that two longs are equal. If they are not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(long actual, long expected, CharSequence message) { + assertEquals(new Long(actual), new Long(expected), message); + } + + /** + * Asserts that two longs are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(long actual, long expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two booleans are equal. If they are not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(boolean actual, boolean expected, CharSequence message) { + assertEquals( Boolean.valueOf(actual), Boolean.valueOf(expected), message); + } + + /** + * Asserts that two booleans are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(boolean actual, boolean expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two bytes are equal. If they are not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(byte actual, byte expected, CharSequence message) { + assertEquals(new Byte(actual), new Byte(expected), message); + } + + /** + * Asserts that two bytes are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(byte actual, byte expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two chars are equal. If they are not, + * an AssertionFailedError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(char actual, char expected, CharSequence message) { + assertEquals(new Character(actual), new Character(expected), message); + } + + /** + * Asserts that two chars are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(char actual, char expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two shorts are equal. If they are not, + * an AssertionFailedError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(short actual, short expected, CharSequence message) { + assertEquals(new Short(actual), new Short(expected), message); + } + + /** + * Asserts that two shorts are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(short actual, short expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two ints are equal. If they are not, + * an AssertionFailedError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(int actual, int expected, CharSequence message) { + assertEquals(new Integer(actual), new Integer(expected), message); + } + + /** + * Asserts that two ints are equal. If they are not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(int actual, int expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that an object isn't null. If it is, + * an AssertionError is thrown. + * @param object the assertion object + */ + static public void assertNotNull(Object object) { + assertNotNull(object, null); + } + + /** + * Asserts that an object isn't null. If it is, + * an AssertionFailedError, with the given message, is thrown. + * @param object the assertion object + * @param message the assertion error message + */ + static public void assertNotNull(Object object, CharSequence message) { + assertTrue(object != null, message); + } + + /** + * Asserts that an object is null. If it is not, + * an AssertionError, with the given message, is thrown. + * @param object the assertion object + */ + static public void assertNull(Object object) { + assertNull(object, null); + } + + /** + * Asserts that an object is null. If it is not, + * an AssertionFailedError, with the given message, is thrown. + * @param object the assertion object + * @param message the assertion error message + */ + static public void assertNull(Object object, CharSequence message) { + assertTrue(object == null, message); + } + + /** + * Asserts that two objects refer to the same object. If they do not, + * an AssertionFailedError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertSame(Object actual, Object expected, CharSequence message) { + if(expected == actual) { + return; + } + failNotSame(actual, expected, message); + } + + /** + * Asserts that two objects refer to the same object. If they do not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertSame(Object actual, Object expected) { + assertSame(actual, expected, null); + } + + /** + * Asserts that two objects do not refer to the same objects. If they do, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertNotSame(Object actual, Object expected, CharSequence message) { + if(expected == actual) { + failSame(actual, expected, message); + } + } + + /** + * Asserts that two objects do not refer to the same object. If they do, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertNotSame(Object actual, Object expected) { + assertNotSame(actual, expected, null); + } + + static private void failSame(Object actual, Object expected, CharSequence message) { + String formatted = ""; + if(message != null) { + formatted = message + " "; + } + fail(formatted + "expected not same with:<" + expected +"> but was same:<" + actual + ">"); + } + + static private void failNotSame(Object actual, Object expected, CharSequence message) { + String formatted = ""; + if(message != null) { + formatted = message + " "; + } + fail(formatted + "expected same with:<" + expected + "> but was:<" + actual + ">"); + } + + static private void failNotEquals(Object actual , Object expected, CharSequence message ) { + fail(format(actual, expected, message)); + } + + static String format(Object actual, Object expected, CharSequence message) { + String formatted = ""; + if (null != message) { + formatted = message + " "; + } + + return formatted + "expected:<" + expected + "> but was:<" + actual + ">"; + } + + /** + * Asserts that two collections contain the same elements in the same order. If they do not, + * an AssertionError is thrown. + * + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(Collection actual, Collection expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two collections contain the same elements in the same order. If they do not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(Collection actual, Collection expected, CharSequence message) { + if(actual == expected) return; + + if ((actual == null && expected != null) || (actual != null && expected == null)) { + if (message != null) fail(message); + else fail("Arrays not equal: " + expected + " and " + actual); + } + + assertEquals(actual.size(), expected.size(), message + ": lists don't have the same size"); + + Iterator actIt = actual.iterator(); + Iterator expIt = expected.iterator(); + int i = -1; + while(actIt.hasNext() && expIt.hasNext()) { + i++; + Object e = expIt.next(); + Object a = actIt.next(); + String errorMessage = message == null + ? "Lists differ at element [" + i + "]: " + e + " != " + a + : message + ": Lists differ at element [" + i + "]: " + e + " != " + a; + + assertEquals(a, e, errorMessage); + } + } + + /** + * Asserts that two arrays contain the same elements in the same order. If they do not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(Object[] actual, Object[] expected, CharSequence message) { + if(actual == expected) return; + + if ((actual == null && expected != null) || (actual != null && expected == null)) { + if (message != null) fail(message); + else fail("Arrays not equal: " + expected + " and " + actual); + } + assertEquals(Arrays.asList(actual), Arrays.asList(expected), message); + } + + /** + * Asserts that two arrays contain the same elements in no particular order. If they do not, + * an AssertionError, with the given message, is thrown. + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEqualsNoOrder(Object[] actual, Object[] expected, CharSequence message) { + if(actual == expected) return; + + if ((actual == null && expected != null) || (actual != null && expected == null)) { + failAssertNoEqual(actual, expected, + "Arrays not equal: " + expected + " and " + actual, + message); + } + + if (actual.length != expected.length) { + failAssertNoEqual(actual, expected, + "Arrays do not have the same size:" + actual.length + " != " + expected.length, + message); + } + + List actualCollection = Lists.newArrayList(); + for (Object a : actual) { + actualCollection.add(a); + } + for (Object o : expected) { + actualCollection.remove(o); + } + if (actualCollection.size() != 0) { + failAssertNoEqual(actual, expected, + "Arrays not equal: " + expected + " and " + actual, + message); + } + } + + private static void failAssertNoEqual(Object[] actual, Object[] expected, + CharSequence message, CharSequence defaultMessage) + { + if (message != null) fail(message); + else fail(defaultMessage); + } + + /** + * Asserts that two arrays contain the same elements in the same order. If they do not, + * an AssertionError is thrown. + * + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(Object[] actual, Object[] expected) { + assertEquals(actual, expected, null); + } + + /** + * Asserts that two arrays contain the same elements in no particular order. If they do not, + * an AssertionError is thrown. + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEqualsNoOrder(Object[] actual, Object[] expected) { + assertEqualsNoOrder(actual, expected, null); + } + + /** + * Asserts that two arrays contain the same elements in the same order. If they do not, + * an AssertionError is thrown. + * + * @param actual the actual value + * @param expected the expected value + */ + static public void assertEquals(final byte[] actual, final byte[] expected) { + assertEquals(actual, expected, ""); + } + + /** + * Asserts that two arrays contain the same elements in the same order. If they do not, + * an AssertionError, with the given message, is thrown. + * + * @param actual the actual value + * @param expected the expected value + * @param message the assertion error message + */ + static public void assertEquals(final byte[] actual, final byte[] expected, final CharSequence message) { + if(expected == actual) { + return; + } + if(null == expected) { + fail("expected a null array, but not null found. " + message); + } + if(null == actual) { + fail("expected not null array, but null found. " + message); + } + + assertEquals(actual.length, expected.length, "arrays don't have the same size. " + message); + + for(int i= 0; i < expected.length; i++) { + if(expected[i] != actual[i]) { + fail("arrays differ firstly at element [" + i +"]; " + + "expected value is <" + expected[i] +"> but was <" + + actual[i] + ">. " + + message); + } + } + } + + /** + * Asserts that two sets are equal. + */ + static public void assertEquals(Set actual, Set expected) { + if (!actual.equals(expected)) { + fail("Sets differ: expected " + expected + " but got " + actual); + } + } + + /** + * Asserts that two maps are equal. + */ + static public void assertEquals(Map actual, Map expected) { + if (!actual.equals(expected)) { + fail("Maps differ: expected " + expected + " but got " + actual); + } + } + +} Modified: modules/tests/metamer/trunk/pom.xml =================================================================== --- modules/tests/metamer/trunk/pom.xml 2010-09-17 08:43:11 UTC (rev 19234) +++ modules/tests/metamer/trunk/pom.xml 2010-09-17 09:12:32 UTC (rev 19235) @@ -141,7 +141,7 @@ <dependency> <groupId>org.testng</groupId> <artifactId>testng</artifactId> - <version>5.12.1</version> + <version>5.14</version> </dependency> </dependencies> </dependencyManagement>