You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by hl...@apache.org on 2006/11/21 03:31:37 UTC
svn commit: r477473 [2/2] - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/
main/java/org/apache/tapestry/corelib/components/
main/java/org/apache/tapestry/internal/
main/java/org/apache/tapestry/internal/model/ main/java...
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/bindings/PropBindingFactoryTest.java Mon Nov 20 18:31:34 2006
@@ -18,9 +18,9 @@
import org.apache.tapestry.ComponentResources;
import org.apache.tapestry.internal.TapestryException;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.Location;
import org.apache.tapestry.ioc.StringHolder;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.ioc.services.ClassFactory;
import org.apache.tapestry.ioc.services.PropertyAccess;
import org.apache.tapestry.runtime.Component;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/InternalUtilsTest.java Mon Nov 20 18:31:34 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.internal.util;
-import static org.apache.tapestry.internal.util.InternalUtils.toList;
+import static org.apache.tapestry.ioc.internal.util.InternalUtils.toList;
import static org.apache.tapestry.util.CollectionFactory.newMap;
import java.lang.reflect.Method;
@@ -29,6 +29,7 @@
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.ioc.Locatable;
import org.apache.tapestry.ioc.Location;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.util.CollectionFactory;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/DefaultModuleDefImplTest.java Mon Nov 20 18:31:34 2006
@@ -21,7 +21,6 @@
import java.util.Set;
import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.util.InternalUtils;
import org.apache.tapestry.ioc.IOCConstants;
import org.apache.tapestry.ioc.def.ContributionDef;
import org.apache.tapestry.ioc.def.DecoratorDef;
@@ -29,6 +28,7 @@
import org.apache.tapestry.ioc.def.ServiceDef;
import org.apache.tapestry.ioc.internal.DefaultModuleDefImpl;
import org.apache.tapestry.ioc.internal.IOCMessages;
+import org.apache.tapestry.ioc.internal.util.InternalUtils;
import org.apache.tapestry.test.TestBase;
import org.testng.Assert;
import org.testng.annotations.Test;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentBarrierTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentBarrierTest.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentBarrierTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentBarrierTest.java Mon Nov 20 18:31:34 2006
@@ -12,12 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import static org.apache.tapestry.util.CollectionFactory.newList;
import java.util.List;
+import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
import org.apache.tapestry.test.TestBase;
import org.testng.annotations.Test;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTarget.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTarget.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTarget.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTarget.java Mon Nov 20 18:31:34 2006
@@ -12,10 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
-import org.apache.tapestry.internal.util.ConcurrentBarrier;
-import org.apache.tapestry.internal.util.Invokable;
+import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
public class ConcurrentTarget
{
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTargetWrapper.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTargetWrapper.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/ConcurrentTargetWrapper.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/ConcurrentTargetWrapper.java Mon Nov 20 18:31:34 2006
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
-import org.apache.tapestry.internal.util.ConcurrentBarrier;
+import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
public class ConcurrentTargetWrapper implements Runnable
{
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/LocalizedNameGeneratorTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/LocalizedNameGeneratorTest.java Mon Nov 20 18:31:34 2006
@@ -12,16 +12,14 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import java.util.Locale;
+import org.apache.tapestry.ioc.internal.util.LocalizedNameGenerator;
import org.apache.tapestry.test.BaseTestCase;
import org.testng.annotations.Test;
-/**
- *
- */
public class LocalizedNameGeneratorTest extends BaseTestCase
{
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockSubject.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockSubject.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockSubject.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockSubject.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockSubject.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockSubject.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockSubject.java Mon Nov 20 18:31:34 2006
@@ -15,9 +15,9 @@
/**
*
*/
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
-import org.apache.tapestry.internal.util.OneShotLock;
+import org.apache.tapestry.ioc.internal.util.OneShotLock;
/**
* Evolved from a test for aspects + annotations to a test of a class that utilizeds OneShotLock as
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java (from r477469, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockTest.java&r1=477469&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OneShotLockTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OneShotLockTest.java Mon Nov 20 18:31:34 2006
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
+package org.apache.tapestry.ioc.internal.util;
import org.apache.tapestry.test.BaseTestCase;
import org.testng.annotations.Test;
Copied: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OrdererTest.java (from r477464, tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OrdererTest.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OrdererTest.java?view=diff&rev=477473&p1=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OrdererTest.java&r1=477464&p2=tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OrdererTest.java&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/OrdererTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/ioc/internal/util/OrdererTest.java Mon Nov 20 18:31:34 2006
@@ -12,320 +12,319 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
-
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.commons.logging.Log;
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.ioc.Orderable;
-import org.testng.annotations.Test;
-
-/**
- *
- */
-public class OrdererTest extends InternalBaseTestCase
-{
- @Test
- public void no_dependencies()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("fred", "FRED");
- o.add("barney", "BARNEY");
- o.add("wilma", "WILMA");
- o.add("betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
-
- verify();
- }
-
- @Test
- public void missing_constraint_type()
- {
- Log log = newLog();
-
- log.warn(UtilMessages.constraintFormat("fred", "foo.barney"));
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED");
- o.add("foo.barney", "BARNEY", "fred");
- o.add("foo.wilma", "WILMA");
- o.add("foo.betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
-
- verify();
- }
-
- @Test
- public void unknown_constraint_type()
- {
- Log log = newLog();
-
- log.warn(UtilMessages.constraintFormat("nearby:fred", "foo.barney"));
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED");
- o.add("foo.barney", "BARNEY", "nearby:fred");
- o.add("foo.wilma", "WILMA");
- o.add("foo.betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
-
- verify();
- }
-
- @Test
- public void nulls_not_included_in_result()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("fred", "FRED");
- o.add("barney", "BARNEY");
- o.add("zippo", null);
- o.add("wilma", "WILMA");
- o.add("groucho", null);
- o.add("betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
-
- verify();
- }
-
- @Test
- public void duplicate_id()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED");
- o.add("foo.barney", "BARNEY");
- o.add("foo.wilma", "WILMA");
-
- verify();
-
- log.warn(UtilMessages.duplicateOrderer("foo.fred"), null);
-
- replay();
-
- o.add("foo.fred", "FRED2");
-
- verify();
-
- replay();
-
- o.add("foo.betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
-
- verify();
- }
-
- @Test
- public void leader()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED");
- o.add("foo.barney", "BARNEY", "before:*.*");
- o.add("foo.wilma", "WILMA");
- o.add("foo.betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("BARNEY", "FRED", "WILMA", "BETTY"));
-
- verify();
- }
-
- @Test
- public void trailer()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED");
- o.add("foo.barney", "BARNEY", "after:*");
- o.add("foo.wilma", "WILMA");
- o.add("foo.betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered.get(3), "BARNEY");
-
- verify();
- }
-
- @Test
- public void prereqs()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED", "after:wilma");
- o.add("foo.barney", "BARNEY", "after:fred,betty");
- o.add("foo.wilma", "WILMA");
- o.add("foo.betty", "BETTY");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("WILMA", "FRED", "BETTY", "BARNEY"));
-
- verify();
- }
-
- @Test
- public void pre_and_post_reqs()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED", "after:wilma");
- o.add("foo.barney", "BARNEY", "after:fred,betty");
- o.add("foo.wilma", "WILMA");
- o.add("foo.betty", "BETTY", "before:wilma");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("BETTY", "WILMA", "FRED", "BARNEY"));
-
- verify();
- }
-
- @Test
- public void cross_module()
- {
- Log log = newLog();
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED", "after:*.wilma");
- o.add("bar.barney", "BARNEY", "after:*.fred,*.betty");
- o.add("baz.wilma", "WILMA");
- o.add("biff.betty", "BETTY", "before:baz.*");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("BETTY", "WILMA", "FRED", "BARNEY"));
-
- verify();
- }
-
- @Test
- public void dependency_cycle()
- {
- Log log = newLog();
-
- log.warn("Unable to add 'foo.barney' as a dependency of 'foo.betty', as that forms a "
- + "dependency cycle ('foo.betty' depends on itself via 'foo.barney'). "
- + "The dependency has been ignored.", null);
-
- replay();
-
- Orderer<String> o = new Orderer<String>(log);
-
- o.add("foo.fred", "FRED", "after:wilma");
- o.add("foo.barney", "BARNEY", "after:fred,betty");
- o.add("foo.wilma", "WILMA");
- o.add("foo.betty", "BETTY", "after:barney", "before:wilma");
-
- List<String> ordered = o.getOrdered();
-
- assertEquals(ordered, Arrays.asList("BETTY", "WILMA", "FRED", "BARNEY"));
-
- verify();
- }
-
- @Test
- public void toString_Orderable()
- {
- Orderable<String> simple = new Orderable<String>("simple", "SIMPLE");
-
- assertEquals(simple.toString(), "Orderable[simple SIMPLE]");
-
- Orderable<String> complex = new Orderable<String>("complex", "COMPLEX", "after:foo",
- "before:bar");
-
- assertEquals(complex.toString(), "Orderable[complex after:foo before:bar COMPLEX]");
- }
-
- @SuppressWarnings("unchecked")
- @Test
- public void toString_DependencyNode()
- {
- Log log = newLog();
-
- replay();
-
- DependencyNode<String> node1 = new DependencyNode<String>(log, new Orderable("node1",
- "NODE1"));
-
- assertEquals(node1.toString(), "[node1]");
-
- DependencyNode<String> node2 = new DependencyNode<String>(log, new Orderable("node2",
- "NODE2"));
-
- DependencyNode<String> node3 = new DependencyNode<String>(log, new Orderable("node3",
- "NODE3"));
-
- DependencyNode<String> node4 = new DependencyNode<String>(log, new Orderable("node4",
- "NODE4"));
-
- DependencyNode<String> node5 = new DependencyNode<String>(log, new Orderable("node5",
- "NODE5"));
-
- node2.addDependency(node1);
- node1.addDependency(node3);
- node1.addDependency(node4);
- node5.addDependency(node1);
-
- assertEquals(node5.toString(), "[node5: [node1: [node3], [node4]]]");
-
- verify();
- }
-}
+package org.apache.tapestry.ioc.internal.util;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.ioc.Orderable;
+import org.apache.tapestry.ioc.internal.util.DependencyNode;
+import org.apache.tapestry.ioc.internal.util.Orderer;
+import org.testng.annotations.Test;
+
+public class OrdererTest extends InternalBaseTestCase
+{
+ @Test
+ public void no_dependencies()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("fred", "FRED");
+ o.add("barney", "BARNEY");
+ o.add("wilma", "WILMA");
+ o.add("betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
+
+ verify();
+ }
+
+ @Test
+ public void missing_constraint_type()
+ {
+ Log log = newLog();
+
+ log.warn(UtilMessages.constraintFormat("fred", "foo.barney"));
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED");
+ o.add("foo.barney", "BARNEY", "fred");
+ o.add("foo.wilma", "WILMA");
+ o.add("foo.betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
+
+ verify();
+ }
+
+ @Test
+ public void unknown_constraint_type()
+ {
+ Log log = newLog();
+
+ log.warn(UtilMessages.constraintFormat("nearby:fred", "foo.barney"));
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED");
+ o.add("foo.barney", "BARNEY", "nearby:fred");
+ o.add("foo.wilma", "WILMA");
+ o.add("foo.betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
+
+ verify();
+ }
+
+ @Test
+ public void nulls_not_included_in_result()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("fred", "FRED");
+ o.add("barney", "BARNEY");
+ o.add("zippo", null);
+ o.add("wilma", "WILMA");
+ o.add("groucho", null);
+ o.add("betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
+
+ verify();
+ }
+
+ @Test
+ public void duplicate_id()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED");
+ o.add("foo.barney", "BARNEY");
+ o.add("foo.wilma", "WILMA");
+
+ verify();
+
+ log.warn(UtilMessages.duplicateOrderer("foo.fred"), null);
+
+ replay();
+
+ o.add("foo.fred", "FRED2");
+
+ verify();
+
+ replay();
+
+ o.add("foo.betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("FRED", "BARNEY", "WILMA", "BETTY"));
+
+ verify();
+ }
+
+ @Test
+ public void leader()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED");
+ o.add("foo.barney", "BARNEY", "before:*.*");
+ o.add("foo.wilma", "WILMA");
+ o.add("foo.betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("BARNEY", "FRED", "WILMA", "BETTY"));
+
+ verify();
+ }
+
+ @Test
+ public void trailer()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED");
+ o.add("foo.barney", "BARNEY", "after:*");
+ o.add("foo.wilma", "WILMA");
+ o.add("foo.betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered.get(3), "BARNEY");
+
+ verify();
+ }
+
+ @Test
+ public void prereqs()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED", "after:wilma");
+ o.add("foo.barney", "BARNEY", "after:fred,betty");
+ o.add("foo.wilma", "WILMA");
+ o.add("foo.betty", "BETTY");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("WILMA", "FRED", "BETTY", "BARNEY"));
+
+ verify();
+ }
+
+ @Test
+ public void pre_and_post_reqs()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED", "after:wilma");
+ o.add("foo.barney", "BARNEY", "after:fred,betty");
+ o.add("foo.wilma", "WILMA");
+ o.add("foo.betty", "BETTY", "before:wilma");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("BETTY", "WILMA", "FRED", "BARNEY"));
+
+ verify();
+ }
+
+ @Test
+ public void cross_module()
+ {
+ Log log = newLog();
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED", "after:*.wilma");
+ o.add("bar.barney", "BARNEY", "after:*.fred,*.betty");
+ o.add("baz.wilma", "WILMA");
+ o.add("biff.betty", "BETTY", "before:baz.*");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("BETTY", "WILMA", "FRED", "BARNEY"));
+
+ verify();
+ }
+
+ @Test
+ public void dependency_cycle()
+ {
+ Log log = newLog();
+
+ log.warn("Unable to add 'foo.barney' as a dependency of 'foo.betty', as that forms a "
+ + "dependency cycle ('foo.betty' depends on itself via 'foo.barney'). "
+ + "The dependency has been ignored.", null);
+
+ replay();
+
+ Orderer<String> o = new Orderer<String>(log);
+
+ o.add("foo.fred", "FRED", "after:wilma");
+ o.add("foo.barney", "BARNEY", "after:fred,betty");
+ o.add("foo.wilma", "WILMA");
+ o.add("foo.betty", "BETTY", "after:barney", "before:wilma");
+
+ List<String> ordered = o.getOrdered();
+
+ assertEquals(ordered, Arrays.asList("BETTY", "WILMA", "FRED", "BARNEY"));
+
+ verify();
+ }
+
+ @Test
+ public void toString_Orderable()
+ {
+ Orderable<String> simple = new Orderable<String>("simple", "SIMPLE");
+
+ assertEquals(simple.toString(), "Orderable[simple SIMPLE]");
+
+ Orderable<String> complex = new Orderable<String>("complex", "COMPLEX", "after:foo",
+ "before:bar");
+
+ assertEquals(complex.toString(), "Orderable[complex after:foo before:bar COMPLEX]");
+ }
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void toString_DependencyNode()
+ {
+ Log log = newLog();
+
+ replay();
+
+ DependencyNode<String> node1 = new DependencyNode<String>(log, new Orderable("node1",
+ "NODE1"));
+
+ assertEquals(node1.toString(), "[node1]");
+
+ DependencyNode<String> node2 = new DependencyNode<String>(log, new Orderable("node2",
+ "NODE2"));
+
+ DependencyNode<String> node3 = new DependencyNode<String>(log, new Orderable("node3",
+ "NODE3"));
+
+ DependencyNode<String> node4 = new DependencyNode<String>(log, new Orderable("node4",
+ "NODE4"));
+
+ DependencyNode<String> node5 = new DependencyNode<String>(log, new Orderable("node5",
+ "NODE5"));
+
+ node2.addDependency(node1);
+ node1.addDependency(node3);
+ node1.addDependency(node4);
+ node5.addDependency(node1);
+
+ assertEquals(node5.toString(), "[node5: [node1: [node3], [node4]]]");
+
+ verify();
+ }
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/services/SyncCostBench.java Mon Nov 20 18:31:34 2006
@@ -20,7 +20,7 @@
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
-import org.apache.tapestry.internal.util.ConcurrentBarrier;
+import org.apache.tapestry.ioc.internal.util.ConcurrentBarrier;
/**
* Tests single-thread synchronization overhead using different techniques. Note that we're fudging
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java?view=diff&rev=477473&r1=477472&r2=477473
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/util/FindTheParameterizedType.java Mon Nov 20 18:31:34 2006
@@ -22,7 +22,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.tapestry.internal.util.Orderer;
+import org.apache.tapestry.ioc.internal.util.Orderer;
public class FindTheParameterizedType
{