Author: julien_viet Date: 2009-08-25 17:24:14 -0400 (Tue, 25 Aug 2009) New Revision: 64 Added: components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java Removed: components/common/trunk/common/src/main/java/org/gatein/common/adapter/ components/common/trunk/common/src/main/java/org/gatein/common/junit/ components/common/trunk/common/src/main/java/org/gatein/common/logging/ components/common/trunk/common/src/main/java/org/gatein/common/path/ components/common/trunk/common/src/main/java/org/gatein/common/transaction/ components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java components/common/trunk/common/src/test/java/org/gatein/common/adapter/ Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java Log: GTNCOMMON-2: Remove legacy code Modified: components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java =================================================================== --- components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/main/java/org/gatein/common/util/Tools.java 2009-08-25 21:24:14 UTC (rev 64) @@ -24,7 +24,6 @@ import org.apache.log4j.Level; import org.apache.log4j.Logger; -import org.gatein.common.logging.Log4JWriter; import java.io.PrintWriter; import java.io.StringWriter; @@ -750,18 +749,6 @@ pw.flush(); } - public static void dumpClassLoaderHierarchyInfo(Logger log, ClassLoader loader) - { - Writer writer = new Log4JWriter(log, Level.DEBUG); - dumpClassLoaderHierarchyInfo(writer, loader); - } - - public static void dumpClassLoaderHierarchyInfo(Logger log, Level level, ClassLoader loader) - { - Writer writer = new Log4JWriter(log, level); - dumpClassLoaderHierarchyInfo(writer, loader); - } - /** * Replace occurence in a string. * Copied: components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java (from rev 50, components/common/trunk/common/src/main/java/org/gatein/common/junit/ExtendedAssert.java) =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java (rev 0) +++ components/common/trunk/common/src/test/java/org/gatein/common/ExtendedAssert.java 2009-08-25 21:24:14 UTC (rev 64) @@ -0,0 +1,248 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.gatein.common; + +import junit.framework.Assert; + +import java.util.Arrays; +import java.util.List; + +/** + * Add more assert methods. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 7374 $ + */ +@SuppressWarnings("unchecked") +public class ExtendedAssert extends Assert +{ + + /** @see #assertEquals(Object[],Object[]) */ + public static void assertEquals(Object[] expected, Object[] actual) + { + assertEquals(null, expected, actual); + } + + /** Test equality as defined by java.util.Array#equals(Object[], Object[]). */ + public static void assertEquals(String message, Object[] expected, Object[] actual) + { + if (Arrays.equals(expected, actual)) + { + return; + } + fail(format(message, expected, actual)); + } + + /** @see #assertEquals(char[],char[]) */ + public static void assertEquals(char[] expected, char[] actual) + { + assertEquals(null, expected, actual); + } + + /** Test equality as defined by java.util.Array#equals(char[], char[]). */ + public static void assertEquals(String message, char[] expected, char[] actual) + { + if (Arrays.equals(expected, actual)) + { + return; + } + fail(format(message, expected, actual)); + } + + /** @see #assertEquals(byte[],byte[]) */ + public static void assertEquals(byte[] expected, byte[] actual) + { + assertEquals(null, expected, actual); + } + + /** Test equality as defined by java.util.Array#equals(char[], char[]). */ + public static void assertEquals(String message, byte[] expected, byte[] actual) + { + if (Arrays.equals(expected, actual)) + { + return; + } + + // + fail(format(message, toString(expected), toString(actual))); + } + + private static String toString(byte[] expected) + { + StringBuffer expectedBuffer = new StringBuffer("["); + + // + for (byte expectedByte : expected) + { + expectedBuffer.append(expectedByte).append(','); + } + + // + if (expectedBuffer.length() == 1) + { + expectedBuffer.append(']'); + } + else + { + expectedBuffer.setCharAt(expectedBuffer.length(), ']'); + } + + // + return expectedBuffer.toString(); + } + + private static String format(String message, Object expected, Object actual) + { + String formatted = ""; + if (message != null) + { + formatted = message + " "; + } + return formatted + "expected:<" + format(expected) + "> but was:<" + format(actual) + ">"; + } + + private static String format(Object o) + { + if (o instanceof Object[]) + { + Object[] array = (Object[])o; + StringBuffer buffer = new StringBuffer("["); + for (int i = 0; i < array.length; i++) + { + buffer.append(i == 0 ? "" : ",").append(String.valueOf(array[i])); + } + buffer.append("]"); + return buffer.toString(); + } + else + { + return String.valueOf(o); + } + } + + public static void assertEquals(Object[] expected, Object[] tested, boolean isOrderRelevant, String failMessage) + { + if (isOrderRelevant) + { + if (!Arrays.equals(expected, tested)) + { + fail(failMessage); + } + } + else + { + boolean equals = (expected == tested); + + if (!equals) + { + if (expected == null || tested == null) + { + fail(failMessage + " Not both null."); + } + + if (expected.getClass().getComponentType() != tested.getClass().getComponentType()) + { + fail(failMessage + " Different classes."); + } + + if (expected.length != tested.length) + { + fail(failMessage + " Different sizes (tested: " + tested.length + ", expected: " + expected.length + ")."); + } + + List expectedList = Arrays.asList(expected); + List testedList = Arrays.asList(tested); + if (!expectedList.containsAll(testedList)) + { + fail(failMessage); + } + } + } + } + + public static void assertEquals(Object[] expected, Object[] tested, boolean isOrderRelevant, String failMessage, Decorator decorator) + { + Object[] decoratedExpected = null, decoratedTested = null; + if (decorator != null) + { + decoratedExpected = decorate(expected, decorator); + decoratedTested = decorate(tested, decorator); + } + + assertEquals(decoratedExpected, decoratedTested, isOrderRelevant, failMessage); + } + + public static Object[] decorate(Object[] toBeDecorated, Decorator decorator) + { + if (toBeDecorated != null) + { + DecoratedObject[] decorated = new DecoratedObject[toBeDecorated.length]; + for (int i = 0; i < decorated.length; i++) + { + decorated[i] = new DecoratedObject(toBeDecorated[i], decorator); + } + return decorated; + } + return null; + + } + + public static void assertString1ContainsString2(String string1, String string2) + { + assertTrue("<" + string1 + "> does not contain <" + string2 + ">", string1.indexOf(string2) >= 0); + } + + public static interface Decorator + { + void decorate(Object decorated); + } + + public static class DecoratedObject + { + private Decorator decorator; + private Object decorated; + + public Object getDecorated() + { + return decorated; + } + + public DecoratedObject(Object decorated, Decorator decorator) + { + this.decorator = decorator; + this.decorated = decorated; + } + + public boolean equals(Object obj) + { + decorator.decorate(decorated); + return decorator.equals(obj); + } + + public String toString() + { + decorator.decorate(decorated); + return decorator.toString(); + } + } +} Modified: components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/ParameterMapTestCase.java 2009-08-25 21:24:14 UTC (rev 64) @@ -25,7 +25,7 @@ import junit.framework.TestCase; import org.gatein.common.util.ParameterMap; import org.gatein.common.util.Tools; -import org.gatein.common.junit.ExtendedAssert; +import org.gatein.common.ExtendedAssert; import org.gatein.common.io.IOTools; import java.util.HashMap; Deleted: components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/PathMapperTestCase.java 2009-08-25 21:24:14 UTC (rev 64) @@ -1,157 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2009, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.gatein.common; - -import junit.framework.TestCase; -import org.gatein.common.path.PathMapper; -import org.gatein.common.path.PathMapperContext; -import org.gatein.common.path.PathMapperResult; -import org.gatein.common.path.SimplePathMapper; - -import java.util.HashMap; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -@SuppressWarnings("unchecked") -public class PathMapperTestCase extends TestCase -{ - - public PathMapperTestCase(String s) - { - super(s); - } - - private PathMapper mapper; - - protected void setUp() throws Exception - { - mapper = new SimplePathMapper(); - } - - protected void tearDown() throws Exception - { - mapper = null; - } - - public void testEmptyContext() - { - PathMapperContextImpl root = new PathMapperContextImpl(null); - - assertEquals(new PathMapperResult(null, null, null), mapper.map(root, null)); - assertEquals(new PathMapperResult(null, null, null), mapper.map(root, "")); - assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "/")); - assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "//")); - - assertEquals(new PathMapperResult(null, null, "/a"), mapper.map(root, "/a")); - assertEquals(new PathMapperResult(null, null, "/a/"), mapper.map(root, "/a/")); - assertEquals(new PathMapperResult(null, null, "/a/b"), mapper.map(root, "/a/b")); - assertEquals(new PathMapperResult(null, null, "/a/b/"), mapper.map(root, "/a/b/")); - assertEquals(new PathMapperResult(null, null, "/a/b/c"), mapper.map(root, "/a/b/c")); - } - - public void testOneChild() - { - PathMapperContextImpl root = new PathMapperContextImpl(null); - PathMapperContextImpl child = new PathMapperContextImpl(null); - root.addChild("a", child); - - assertEquals(new PathMapperResult(null, null, null), mapper.map(root, null)); - assertEquals(new PathMapperResult(null, null, null), mapper.map(root, "")); - assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "/")); - assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "//")); - - assertEquals(new PathMapperResult(child, "/a", null), mapper.map(root, "/a")); - assertEquals(new PathMapperResult(child, "/a", "/"), mapper.map(root, "/a/")); - assertEquals(new PathMapperResult(child, "/a", "/b"), mapper.map(root, "/a/b")); - assertEquals(new PathMapperResult(child, "/a", "/b/"), mapper.map(root, "/a/b/")); - assertEquals(new PathMapperResult(child, "/a", "/b/c"), mapper.map(root, "/a/b/c")); - - assertEquals(new PathMapperResult(null, null, "/b"), mapper.map(root, "/b")); - assertEquals(new PathMapperResult(null, null, "/b/"), mapper.map(root, "/b/")); - assertEquals(new PathMapperResult(null, null, "/b/c"), mapper.map(root, "/b/c")); - assertEquals(new PathMapperResult(null, null, "/b/c/"), mapper.map(root, "/b/c/")); - assertEquals(new PathMapperResult(null, null, "/b/c/d"), mapper.map(root, "/b/c/d")); - } - - public void testOneChildHavingOneChild() - { - PathMapperContextImpl root = new PathMapperContextImpl(null); - PathMapperContextImpl child = new PathMapperContextImpl(null); - PathMapperContextImpl childOfChild = new PathMapperContextImpl(null); - root.addChild("a", child); - child.addChild("b", childOfChild); - - assertEquals(new PathMapperResult(null, null, null), mapper.map(root, null)); - assertEquals(new PathMapperResult(null, null, null), mapper.map(root, "")); - assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "/")); - assertEquals(new PathMapperResult(null, null, "/"), mapper.map(root, "//")); - - assertEquals(new PathMapperResult(child, "/a", null), mapper.map(root, "/a")); - assertEquals(new PathMapperResult(child, "/a", "/"), mapper.map(root, "/a/")); - assertEquals(new PathMapperResult(childOfChild, "/a/b", null), mapper.map(root, "/a/b")); - assertEquals(new PathMapperResult(child, "/a", "/b/"), mapper.map(root, "/a/b/")); - assertEquals(new PathMapperResult(child, "/a", "/b/c"), mapper.map(root, "/a/b/c")); - - assertEquals(new PathMapperResult(null, null, "/b"), mapper.map(root, "/b")); - assertEquals(new PathMapperResult(null, null, "/b/"), mapper.map(root, "/b/")); - assertEquals(new PathMapperResult(null, null, "/b/c"), mapper.map(root, "/b/c")); - assertEquals(new PathMapperResult(null, null, "/b/c/"), mapper.map(root, "/b/c/")); - assertEquals(new PathMapperResult(null, null, "/b/c/d"), mapper.map(root, "/b/c/d")); - } - - private static class Context - { - private final Map children; - - public Context(Object dflt) - { - children = new HashMap(); - } - - public void addChild(String name, Object child) - { - children.put(name, child); - } - } - - private static class PathMapperContextImpl extends Context implements PathMapperContext - { - public PathMapperContextImpl(Object dflt) - { - super(dflt); - } - - public Object getRoot() - { - return this; - } - - public Object getChild(Object parent, String name) - { - return ((Context)parent).children.get(name); - } - } -} Deleted: components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/PathTestCase.java 2009-08-25 21:24:14 UTC (rev 64) @@ -1,80 +0,0 @@ -/****************************************************************************** - * JBoss, a division of Red Hat * - * Copyright 2009, Red Hat Middleware, LLC, and individual * - * contributors as indicated by the @authors tag. See the * - * copyright.txt in the distribution for a full listing of * - * individual contributors. * - * * - * This is free software; you can redistribute it and/or modify it * - * under the terms of the GNU Lesser General Public License as * - * published by the Free Software Foundation; either version 2.1 of * - * the License, or (at your option) any later version. * - * * - * This software is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * - * Lesser General Public License for more details. * - * * - * You should have received a copy of the GNU Lesser General Public * - * License along with this software; if not, write to the Free * - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * - ******************************************************************************/ -package org.gatein.common; - -import junit.framework.TestCase; -import org.gatein.common.path.RelativePathParser; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5451 $ - */ -public class PathTestCase extends TestCase -{ - - public void testSimpleDown() - { - String[] paths = {"abc","abc/","abc/."}; - for (int i = 0; i < paths.length; i++) - { - String path = paths[i]; - RelativePathParser cursor = new RelativePathParser(path); - assertEquals(RelativePathParser.DOWN, cursor.next()); - assertEquals(0, cursor.getOffset()); - assertEquals(3, cursor.getLength()); - assertEquals("abc", path.substring(cursor.getOffset(), cursor.getLength())); - assertEquals(RelativePathParser.NONE, cursor.next()); - assertEquals(-1, cursor.getOffset()); - assertEquals(-1, cursor.getLength()); - } - } - - public void testSimpleNone() - { - String[] paths = {"",".","./","./."}; - for (int i = 0; i < paths.length; i++) - { - String path = paths[i]; - RelativePathParser cursor = new RelativePathParser(path); - assertEquals(RelativePathParser.NONE, cursor.next()); - assertEquals(-1, cursor.getOffset()); - assertEquals(-1, cursor.getLength()); - } - } - - public void testSimpleUp() - { - String[] paths = {"..","../","../."}; - for (int i = 0; i < paths.length; i++) - { - String path = paths[i]; - RelativePathParser cursor = new RelativePathParser(path); - assertEquals(RelativePathParser.UP, cursor.next()); - assertEquals(-1, cursor.getOffset()); - assertEquals(-1, cursor.getLength()); - assertEquals(RelativePathParser.NONE, cursor.next()); - assertEquals(-1, cursor.getOffset()); - assertEquals(-1, cursor.getLength()); - } - } -} Modified: components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/ToolsTestCase.java 2009-08-25 21:24:14 UTC (rev 64) @@ -24,7 +24,7 @@ package org.gatein.common; import junit.framework.TestCase; -import org.gatein.common.junit.ExtendedAssert; +import org.gatein.common.ExtendedAssert; import org.gatein.common.util.Tools; import java.util.ArrayList; Modified: components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/io/IOToolsTestCase.java 2009-08-25 21:24:14 UTC (rev 64) @@ -23,7 +23,7 @@ package org.gatein.common.io; import org.gatein.common.io.IOTools; -import org.gatein.common.junit.ExtendedAssert; +import org.gatein.common.ExtendedAssert; import junit.framework.TestCase; import java.io.OutputStream; Modified: components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/io/SerializationTestCase.java 2009-08-25 21:24:14 UTC (rev 64) @@ -24,7 +24,7 @@ import org.gatein.common.io.Serialization; import org.gatein.common.io.IOTools; -import org.gatein.common.junit.ExtendedAssert; +import org.gatein.common.ExtendedAssert; import org.gatein.common.util.MapBuilder; import java.util.Map; Modified: components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/net/AbstractSynchronizedServer.java 2009-08-25 21:24:14 UTC (rev 64) @@ -23,7 +23,7 @@ package org.gatein.common.net; import org.apache.log4j.Logger; -import org.gatein.common.junit.ExtendedAssert; +import org.gatein.common.ExtendedAssert; import java.net.ServerSocket; import java.net.Socket; Modified: components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java =================================================================== --- components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java 2009-08-25 21:13:58 UTC (rev 63) +++ components/common/trunk/common/src/test/java/org/gatein/common/net/URLToolsTestCase.java 2009-08-25 21:24:14 UTC (rev 64) @@ -24,7 +24,7 @@ import junit.framework.TestCase; import org.apache.log4j.Logger; -import org.gatein.common.junit.ExtendedAssert; +import org.gatein.common.ExtendedAssert; import org.gatein.common.net.URLTools; import java.net.MalformedURLException;