You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by jk...@apache.org on 2006/06/27 20:21:40 UTC
svn commit: r417545 [8/12] - in /tapestry/tapestry4/trunk: ./
examples/TimeTracker/src/context/ framework/
framework/src/java/org/apache/tapestry/form/validator/
framework/src/java/org/apache/tapestry/json/
framework/src/java/org/apache/tapestry/valid/...
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMocks.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMocks.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMocks.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/mock/TestMocks.java Tue Jun 27 11:21:31 2006
@@ -18,12 +18,14 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import java.util.ArrayList;
+import java.util.List;
import org.apache.hivemind.util.PropertyUtils;
import org.apache.tapestry.junit.TapestryTestCase;
+import org.testng.annotations.Configuration;
+import org.testng.annotations.Factory;
+import org.testng.annotations.Test;
/**
* Test case for Mock Servlet API tests using the Simple application.
@@ -31,7 +33,7 @@
* @author Howard Lewis Ship
* @since 2.2
*/
-
+@Test
public class TestMocks extends TapestryTestCase
{
public static final String LOGS_DIR = "/target/logs";
@@ -46,6 +48,13 @@
private static String _baseDir;
+ private String _path;
+
+ public TestMocks(String path)
+ {
+ _path = path;
+ }
+
public static String getBaseDirectory()
{
if (_baseDir == null)
@@ -54,20 +63,22 @@
return _baseDir;
}
+ @Test
protected void runTest() throws Throwable
{
- String path = getBaseDirectory() + SCRIPTS_DIR + "/" + getName();
-
- MockTester tester = new MockTester(getBaseDirectory() + "/src/test-data/", path);
-
+ MockTester tester = new MockTester(getBaseDirectory() + "/src/test-data/", _path);
+
tester.execute();
-
+
PropertyUtils.clearCache();
}
- public static Test suite()
+ @Factory
+ public static Object[] suite()
{
- TestSuite suite = new TestSuite("Mock Unit Test Suite");
+ List<TestMocks> tests = new ArrayList<TestMocks>();
+
+ // TestSuite suite = new TestSuite("Mock Unit Test Suite");
if (Boolean.getBoolean("skip-mock-tests"))
{
@@ -75,16 +86,16 @@
}
else
{
- addScripts(suite);
+ addScripts(tests);
// Handy place to perform one-time
deleteDir(getBaseDirectory() + "/target/.private");
}
- return suite;
+ return tests.toArray(new TestMocks[tests.size()]);
}
- private static void addScripts(TestSuite suite)
+ private static void addScripts(List<TestMocks> tests)
{
File scriptsDir = new File(getBaseDirectory() + SCRIPTS_DIR);
@@ -96,11 +107,9 @@
if (name.endsWith(".xml"))
{
- TestMocks test = new TestMocks();
-
- test.setName(name);
+ TestMocks test = new TestMocks(getBaseDirectory() + SCRIPTS_DIR + "/" + name);
- suite.addTest(test);
+ tests.add(test);
}
}
}
@@ -138,6 +147,7 @@
* Ensures that the log directory exists, then redirects System.out and System.err to files
* within the log.
*/
+ @Configuration(beforeTestClass = true)
protected void setUp() throws Exception
{
File outDir = new File(getBaseDirectory() + LOGS_DIR);
@@ -154,7 +164,7 @@
protected PrintStream createPrintStream(File directory, String extension) throws Exception
{
- String name = getName() + "." + extension;
+ String name = _path;
File file = new File(directory, name);
@@ -170,6 +180,7 @@
/**
* Closes System.out and System.err, then restores them to their original values.
*/
+ @Configuration(afterTestClass = true)
protected void tearDown() throws Exception
{
System.err.close();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,12 @@
package org.apache.tapestry.junit.parse;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import java.util.List;
import org.apache.commons.logging.Log;
@@ -470,7 +476,7 @@
public void testListenerBinding() throws Exception
{
- Log log = (Log) newMock(Log.class);
+ Log log = newMock(Log.class);
SpecificationParser parser = new SpecificationParser(new DefaultErrorHandler(), log,
new DefaultClassResolver(), new SpecFactory());
@@ -482,11 +488,11 @@
log
.warn("The <listener-binding> element is no longer supported (at classpath:/org/apache/tapestry/junit/parse/ListenerBinding.page, line 25, column 56).");
- replayControls();
+ replay();
IComponentSpecification spec = parser.parsePageSpecification(location);
- verifyControls();
+ verify();
IContainedComponent cc = spec.getComponent("c");
@@ -873,21 +879,6 @@
}
}
- /**
- * Check that <service> elements are ignored properly.
- *
- * @since 4.0
- */
-
- public void testServiceElement() throws Exception
- {
- interceptLogging("org.apache.tapestry");
-
- parseLib("ServiceElement.library");
-
- assertLoggedMessagePattern("The <service> element is no longer supported");
- }
-
/** @since 4.0 */
public void testMeta() throws Exception
{
@@ -1040,7 +1031,7 @@
assertEquals(false, ps.getCache());
ps = spec.getParameter("withAliases");
- assertListsEqual(new String[]
+ assertEquals(new String[]
{ "fred", "barney" }, ps.getAliasNames().toArray());
assertSame(ps, spec.getParameter("fred"));
@@ -1072,7 +1063,7 @@
assertEquals("http://myexternal/asset", as.getPath());
- assertListsEqual(new String[]
+ assertEquals(new String[]
{ "mycontext", "myexternal", "myprivate" }, cs.getAssetNames());
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/script/TestScript.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.junit.script;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -74,11 +77,11 @@
IRequestCycle cycle = (IRequestCycle) newMock(IRequestCycle.class);
- replayControls();
+ replay();
script.execute(cycle, _processor, symbols);
- verifyControls();
+ verify();
return script;
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.junit.spec;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.spec.IApplicationSpecification;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit.spec;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestIdAllocator.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,8 @@
package org.apache.tapestry.junit.utils;
+import static org.testng.AssertJUnit.assertEquals;
+
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.util.IdAllocator;
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,9 @@
package org.apache.tapestry.junit.utils;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.util.RegexpMatch;
@@ -104,7 +107,7 @@
String[] matches = m.getMatches("\\d+", "57,232 89 147", 0);
- assertListsEqual(new String[]
+ assertEquals(new String[]
{ "57", "232", "89", "147" }, matches);
}
@@ -147,7 +150,7 @@
String matches[] = m.getMatches("A(B|C|fred)", "AA AC AB Afred AA AC", 1);
- assertListsEqual(new String[]
+ assertEquals(new String[]
{ "C", "B", "fred", "C" }, matches);
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/l10n/DefaultResourceLocalizerTest.java Tue Jun 27 11:21:31 2006
@@ -14,10 +14,13 @@
package org.apache.tapestry.l10n;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Locale;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.l10n.DefaultResourceLocalizer}.
@@ -25,7 +28,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class DefaultResourceLocalizerTest extends HiveMindTestCase
+public class DefaultResourceLocalizerTest extends BaseComponentTestCase
{
public void testLocalizer()
{
@@ -33,20 +36,14 @@
Resource localized = newResource();
Locale locale = Locale.getDefault();
- root.getLocalization(locale);
- setReturnValue(root, localized);
+ expect(root.getLocalization(locale)).andReturn(localized);
- replayControls();
+ replay();
Resource actual = new DefaultResourceLocalizer().findLocalization(root, locale);
assertSame(localized, actual);
- verifyControls();
- }
-
- private Resource newResource()
- {
- return (Resource) newMock(Resource.class);
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/link/DefaultLinkRendererTest.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,10 @@
package org.apache.tapestry.link;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.tapestry.BaseComponentTestCase;
@@ -128,7 +131,7 @@
trainGetLocation(active, l);
- replayControls();
+ replay();
try
{
@@ -142,7 +145,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testStandardNotDisabled()
@@ -185,11 +188,11 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new DefaultLinkRenderer().renderLink(writer, cycle, component);
- verifyControls();
+ verify();
}
protected void trainGetScheme(ILinkComponent component, String scheme)
@@ -246,11 +249,11 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new DefaultLinkRenderer().renderLink(writer, cycle, component);
- verifyControls();
+ verify();
}
public void testDisabled()
@@ -268,11 +271,11 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new DefaultLinkRenderer().renderLink(writer, cycle, component);
- verifyControls();
+ verify();
}
public void testRewinding()
@@ -291,11 +294,11 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new DefaultLinkRenderer().renderLink(writer, cycle, component);
- verifyControls();
+ verify();
}
public void testWithSubclass()
@@ -346,14 +349,14 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new RendererFixture(writer, cycle, component, "xlink", true, "xtarget", "xurl").renderLink(
writer,
cycle,
component);
- verifyControls();
+ verify();
}
public void testWithSubclassNoBody()
@@ -401,12 +404,12 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new RendererFixture(writer, cycle, component, "xlink", false, "xtarget", "xurl")
.renderLink(writer, cycle, component);
- verifyControls();
+ verify();
}
public void testWithSubclassDisabled()
@@ -424,14 +427,14 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new RendererFixture(writer, cycle, component, "xlink", true, "xtarget", "xurl").renderLink(
writer,
cycle,
component);
- verifyControls();
+ verify();
}
public void testWithSubclassDisabledNoBody()
@@ -447,12 +450,12 @@
cycle.removeAttribute(Tapestry.LINK_COMPONENT_ATTRIBUTE_NAME);
- replayControls();
+ replay();
new RendererFixture(writer, cycle, component, "xlink", false, "xtarget", "xurl")
.renderLink(writer, cycle, component);
- verifyControls();
+ verify();
}
protected void trainGetAnchor(ILinkComponent component, String anchor)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMap.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,15 @@
package org.apache.tapestry.listener;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IActionListener;
import org.apache.tapestry.IRequestCycle;
@@ -29,7 +32,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestListenerMap extends HiveMindTestCase
+public class TestListenerMap extends BaseComponentTestCase
{
public void testGetListener()
{
@@ -40,7 +43,7 @@
invoker.invokeListenerMethod(target, cycle);
- replayControls();
+ replay();
ListenerMap lm = new ListenerMapImpl(target, map);
@@ -48,7 +51,7 @@
l1.actionTriggered(null, cycle);
- verifyControls();
+ verify();
IActionListener l2 = lm.getListener("method");
@@ -61,7 +64,7 @@
ListenerMethodInvoker invoker = newInvoker();
Map map = newMap("method", invoker);
- replayControls();
+ replay();
ListenerMap lm = new ListenerMapImpl(target, map);
@@ -69,7 +72,7 @@
assertEquals(new ArrayList(map.keySet()), new ArrayList(lm.getListenerNames()));
- verifyControls();
+ verify();
try
{
@@ -88,14 +91,14 @@
ListenerMethodInvoker invoker = newInvoker();
Map map = newMap("method", invoker);
- replayControls();
+ replay();
ListenerMap lm = new ListenerMapImpl(target, map);
assertEquals(true, lm.canProvideListener("method"));
assertEquals(false, lm.canProvideListener("foobar"));
- verifyControls();
+ verify();
}
public void testMissingListener()
@@ -104,7 +107,7 @@
ListenerMethodInvoker invoker = newInvoker();
Map map = newMap("method", invoker);
- replayControls();
+ replay();
ListenerMap lm = new ListenerMapImpl(target, map);
@@ -120,7 +123,7 @@
assertSame(target, ex.getComponent());
}
- verifyControls();
+ verify();
}
private Map newMap(Object key, Object value)
@@ -135,10 +138,5 @@
private ListenerMethodInvoker newInvoker()
{
return (ListenerMethodInvoker) newMock(ListenerMethodInvoker.class);
- }
-
- private IRequestCycle newCycle()
- {
- return (IRequestCycle) newMock(IRequestCycle.class);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/listener/TestListenerMapSource.java Tue Jun 27 11:21:31 2006
@@ -14,15 +14,19 @@
package org.apache.tapestry.listener;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import java.lang.reflect.Method;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
import org.apache.tapestry.engine.ILink;
import org.apache.tapestry.event.BrowserEvent;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.listener.ListenerMapSourceImpl} and
@@ -31,16 +35,14 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestListenerMapSource extends HiveMindTestCase
+public class TestListenerMapSource extends BaseComponentTestCase
{
- private IRequestCycle newCycle(Object[] listenerParameters)
+ private IRequestCycle newLCycle(Object[] listenerParameters)
{
- MockControl control = newControl(IRequestCycle.class);
- IRequestCycle cycle = (IRequestCycle) control.getMock();
+ IRequestCycle cycle = newCycle();
- cycle.getListenerParameters();
- control.setReturnValue(listenerParameters);
+ expect(cycle.getListenerParameters()).andReturn(listenerParameters);
return cycle;
}
@@ -80,12 +82,12 @@
public void testFoundWithParameters()
{
- IRequestCycle cycle = newCycle(new Object[] { "Hello", new Integer(7) });
+ IRequestCycle cycle = newLCycle(new Object[] { "Hello", new Integer(7) });
ListenerMethodHolder holder = newHolder();
holder.fred("Hello", 7);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -93,17 +95,17 @@
map.getListener("fred").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
public void testFoundWithCycleAndParameters()
{
- IRequestCycle cycle = newCycle(new Object[] { new Integer(7) });
+ IRequestCycle cycle = newLCycle(new Object[] { new Integer(7) });
ListenerMethodHolder holder = newHolder();
holder.wilma(cycle, 7);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -111,18 +113,18 @@
map.getListener("wilma").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
public void testFoundWithAllParameters()
{
BrowserEvent event = new BrowserEvent("onClick", null);
- IRequestCycle cycle = newCycle(new Object[] { event, new Integer(8) });
+ IRequestCycle cycle = newLCycle(new Object[] { event, new Integer(8) });
ListenerMethodHolder holder = newHolder();
holder.bangbangClicked(cycle, event, 8);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -130,7 +132,7 @@
map.getListener("bangbangClicked").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
/**
@@ -140,12 +142,12 @@
public void testNoParameterMatch()
{
- IRequestCycle cycle = newCycle(new Object[] { "Hello", new Integer(7) });
+ IRequestCycle cycle = newLCycle(new Object[] { "Hello", new Integer(7) });
ListenerMethodHolder holder = newHolder();
holder.barney();
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -153,18 +155,18 @@
map.getListener("barney").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
public void testFallbackToJustCycle()
{
- IRequestCycle cycle = newCycle(new Object[] { "Hello", new Integer(7) });
+ IRequestCycle cycle = newLCycle(new Object[] { "Hello", new Integer(7) });
ListenerMethodHolder holder = newHolder();
holder.pebbles(cycle);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -172,17 +174,17 @@
map.getListener("pebbles").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
public void testReturnPageName()
{
- IRequestCycle cycle = newCycle(null);
+ IRequestCycle cycle = newLCycle(null);
ListenerMethodHolder holder = new ListenerMethodHolder("PageName");
cycle.activate("PageName");
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -190,20 +192,20 @@
map.getListener("returnsPageName").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
public void testReturnLink()
{
ILink link = newLink("http://foo/bar");
- IRequestCycle cycle = newCycle(null);
+ IRequestCycle cycle = newLCycle(null);
cycle.sendRedirect("http://foo/bar");
ListenerMethodHolder holder = new ListenerMethodHolder(link);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -211,16 +213,14 @@
map.getListener("returnsLink").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
private ILink newLink(String absoluteURL)
{
- MockControl control = newControl(ILink.class);
- ILink link = (ILink) control.getMock();
+ ILink link = newMock(ILink.class);
- link.getAbsoluteURL();
- control.setReturnValue(absoluteURL);
+ expect(link.getAbsoluteURL()).andReturn(absoluteURL);
return link;
}
@@ -228,12 +228,12 @@
public void testReturnPageInstance()
{
IPage page = (IPage) newMock(IPage.class);
- IRequestCycle cycle = newCycle(null);
+ IRequestCycle cycle = newLCycle(null);
ListenerMethodHolder holder = new ListenerMethodHolder(page);
cycle.activate(page);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -241,14 +241,14 @@
map.getListener("returnsPage").actionTriggered(null, cycle);
- verifyControls();
+ verify();
}
public void testNoMatch()
{
- IRequestCycle cycle = newCycle(new Object[] { "Hello", new Integer(7) });
+ IRequestCycle cycle = newLCycle(new Object[] { "Hello", new Integer(7) });
- replayControls();
+ replay();
ListenerMethodHolder holder = new ListenerMethodHolder();
@@ -269,14 +269,14 @@
assertSame(holder, ex.getComponent());
}
- verifyControls();
+ verify();
}
public void testMismatchedTypes()
{
- IRequestCycle cycle = newCycle(new Object[] { "Hello" });
+ IRequestCycle cycle = newLCycle(new Object[] { "Hello" });
- replayControls();
+ replay();
ListenerMethodHolder holder = new ListenerMethodHolder();
@@ -303,12 +303,12 @@
assertSame(holder, ex.getComponent());
}
- verifyControls();
+ verify();
}
public void testInvocationTargetException()
{
- IRequestCycle cycle = newCycle(new Object[] { "Hello", new Integer(7) });
+ IRequestCycle cycle = newLCycle(new Object[] { "Hello", new Integer(7) });
ListenerMethodHolder holder = new ListenerMethodHolder();
@@ -316,7 +316,7 @@
holder.setException(exception);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -336,12 +336,12 @@
assertSame(exception, ex.getRootCause());
}
- verifyControls();
+ verify();
}
public void testInvocationTargetExceptionForApplicationRuntimeException()
{
- IRequestCycle cycle = newCycle(new Object[] { "Hello", new Integer(7) });
+ IRequestCycle cycle = newLCycle(new Object[] { "Hello", new Integer(7) });
ListenerMethodHolder holder = new ListenerMethodHolder();
@@ -349,7 +349,7 @@
holder.setException(exception);
- replayControls();
+ replay();
ListenerMapSource source = new ListenerMapSourceImpl();
@@ -365,7 +365,7 @@
assertSame(exception, ex);
}
- verifyControls();
+ verify();
}
private ListenerMethodHolder newHolder()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/markup/TestMarkupWriter.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,15 @@
package org.apache.tapestry.markup;
+import static org.testng.AssertJUnit.assertEquals;
+
import java.io.CharArrayWriter;
import java.io.PrintWriter;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IMarkupWriter;
+import org.testng.annotations.Configuration;
/**
* Tests for {@link org.apache.tapestry.markup.MarkupWriterImpl}.
@@ -27,7 +30,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestMarkupWriter extends HiveMindTestCase
+public class TestMarkupWriter extends BaseComponentTestCase
{
private static CharArrayWriter _writer;
@@ -65,11 +68,10 @@
return new PrintWriter(_writer);
}
+ @Configuration(afterTestClass = true)
protected void tearDown() throws Exception
{
_writer = null;
-
- super.tearDown();
}
private void assertOutput(String expected)
@@ -84,7 +86,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -96,7 +98,7 @@
assertOutput(" width=\"5\"");
- verifyControls();
+ verify();
}
public void testIntAttributeRequiresTag()
@@ -104,7 +106,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -118,7 +120,7 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testBooleanAttribute()
@@ -126,7 +128,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -142,7 +144,7 @@
assertOutput(" false=\"false\"");
- verifyControls();
+ verify();
}
public void testBooleanAttributeRequiresTag()
@@ -150,7 +152,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -164,7 +166,7 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testAttribute()
@@ -187,7 +189,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -198,7 +200,7 @@
assertOutput("<span width=\"\"");
- verifyControls();
+ verify();
}
public void testAttributeRequiresTag()
@@ -206,7 +208,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -220,7 +222,7 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testEnd()
@@ -284,7 +286,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -294,7 +296,7 @@
assertOutput("<span></span>");
- verifyControls();
+ verify();
}
public void testCloseTag()
@@ -302,7 +304,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -316,7 +318,7 @@
assertOutput("<img/>");
- verifyControls();
+ verify();
}
public void testNestedEnd()
@@ -324,7 +326,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -350,7 +352,7 @@
assertOutput("</h1>");
- verifyControls();
+ verify();
}
public void testEndNamed()
@@ -358,7 +360,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -376,7 +378,7 @@
assertOutput("</span></b></h1>");
- verifyControls();
+ verify();
}
public void testClose()
@@ -408,7 +410,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -418,7 +420,7 @@
assertOutput("<!-- Tapestry Rocks! -->" + NEWLINE);
- verifyControls();
+ verify();
}
public void testCommentClosesTag()
@@ -426,7 +428,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -437,7 +439,7 @@
assertOutput("<div><!-- Tapestry Rocks! -->" + NEWLINE);
- verifyControls();
+ verify();
}
/*
@@ -454,13 +456,13 @@
writer.flush();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
mw.flush();
- verifyControls();
+ verify();
}
*/
@@ -523,7 +525,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -531,7 +533,7 @@
assertOutput(NEWLINE);
- verifyControls();
+ verify();
}
public void testPrintLnClosesTag()
@@ -539,7 +541,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -551,7 +553,7 @@
assertOutput(">" + NEWLINE);
- verifyControls();
+ verify();
}
public void testPrintRawCharArray()
@@ -559,7 +561,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -572,7 +574,7 @@
assertOutput(">bc");
- verifyControls();
+ verify();
}
public void testPrintRawString()
@@ -580,7 +582,7 @@
MarkupFilter filter = newFilter();
PrintWriter writer = newPrintWriter();
- replayControls();
+ replay();
IMarkupWriter mw = new MarkupWriterImpl("text/html", writer, filter);
@@ -592,7 +594,7 @@
assertOutput(">Fred");
- verifyControls();
+ verify();
}
public void testNestedWriter()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestMultipartDecoderFilter.java Tue Jun 27 11:21:31 2006
@@ -14,15 +14,17 @@
package org.apache.tapestry.multipart;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertSame;
+
import java.io.IOException;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.ServletRequestServicer;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.multipart.MultipartDecoderFilter}.
@@ -30,7 +32,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestMultipartDecoderFilter extends HiveMindTestCase
+public class TestMultipartDecoderFilter extends BaseComponentTestCase
{
private static class MockServicer implements ServletRequestServicer
{
@@ -45,11 +47,9 @@
private HttpServletRequest newRequest(String contentType)
{
- MockControl control = newControl(HttpServletRequest.class);
- HttpServletRequest request = (HttpServletRequest) control.getMock();
+ HttpServletRequest request = newMock(HttpServletRequest.class);
- request.getContentType();
- control.setReturnValue(contentType);
+ expect(request.getContentType()).andReturn(contentType);
return request;
}
@@ -66,7 +66,7 @@
MockServicer servicer = new MockServicer();
- replayControls();
+ replay();
MultipartDecoderFilter f = new MultipartDecoderFilter();
@@ -74,7 +74,7 @@
assertSame(request, servicer._request);
- verifyControls();
+ verify();
}
public void testUploadRequest() throws Exception
@@ -82,18 +82,16 @@
HttpServletRequest request = newRequest("multipart/form-data");
HttpServletResponse response = newResponse();
HttpServletRequest decoded = (HttpServletRequest) newMock(HttpServletRequest.class);
+
+ ServletMultipartDecoder decoder = newMock(ServletMultipartDecoder.class);
- MockControl control = newControl(ServletMultipartDecoder.class);
- ServletMultipartDecoder decoder = (ServletMultipartDecoder) control.getMock();
-
- decoder.decode(request);
- control.setReturnValue(decoded);
+ expect(decoder.decode(request)).andReturn(decoded);
decoder.cleanup();
MockServicer servicer = new MockServicer();
- replayControls();
+ replay();
MultipartDecoderFilter f = new MultipartDecoderFilter();
f.setDecoder(decoder);
@@ -102,6 +100,6 @@
assertSame(decoded, servicer._request);
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/multipart/TestUploadFormParametersWrapper.java Tue Jun 27 11:21:31 2006
@@ -14,13 +14,18 @@
package org.apache.tapestry.multipart;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotSame;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
/**
* Tests for {@link org.apache.tapestry.multipart.UploadFormParametersWrapper}.
@@ -28,18 +33,18 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestUploadFormParametersWrapper extends HiveMindTestCase
+public class TestUploadFormParametersWrapper extends BaseComponentTestCase
{
- private HttpServletRequest newRequest()
+ private HttpServletRequest newHttpRequest()
{
return (HttpServletRequest) newMock(HttpServletRequest.class);
}
public void testMapIsNotModifiable()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
- replayControls();
+ replay();
Map map = new HashMap();
@@ -64,27 +69,27 @@
// Expected.
}
- verifyControls();
+ verify();
}
public void testGetSingleParameterWhenNull()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
- replayControls();
+ replay();
HttpServletRequest r = new UploadFormParametersWrapper(request, new HashMap());
assertNull(r.getParameter("unknown-key"));
- verifyControls();
+ verify();
}
public void testGetSingleParameterWhenEmptyArray()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
- replayControls();
+ replay();
HashMap params = new HashMap();
@@ -94,7 +99,7 @@
assertNull(r.getParameter("empty-key"));
- verifyControls();
+ verify();
}
public void testGetParameterValues()
@@ -102,9 +107,9 @@
String[] values =
{ "fred", "barney" };
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
- replayControls();
+ replay();
HashMap params = new HashMap();
@@ -114,14 +119,14 @@
assertSame(values, r.getParameterValues("key"));
- verifyControls();
+ verify();
}
public void testGetParameterNames()
{
- HttpServletRequest request = newRequest();
+ HttpServletRequest request = newHttpRequest();
- replayControls();
+ replay();
HashMap params = new HashMap();
@@ -135,6 +140,6 @@
assertEquals("key", e.nextElement());
assertEquals(false, e.hasMoreElements());
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/PageLoaderTest.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,10 @@
package org.apache.tapestry.pageload;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.commons.logging.Log;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
@@ -49,7 +53,7 @@
trainGetBinding(component, "dupe", oldBinding);
- replayControls();
+ replay();
try
{
@@ -110,7 +114,7 @@
component.setBinding("fred", binding);
- replayControls();
+ replay();
PageLoader loader = new PageLoader();
loader.setLog(log);
@@ -118,14 +122,14 @@
loader.bind(container, component, contained, "ognl");
- verifyControls();
+ verify();
}
private void trainCreateBinding(BindingSource source, IComponent container, String description,
String expression, String defaultBindingPrefix, Location l, IBinding binding)
{
- source.createBinding(container, description, expression, defaultBindingPrefix, l);
- setReturnValue(source, binding);
+ expect(source.createBinding(container, description, expression, defaultBindingPrefix, l))
+ .andReturn(binding);
}
protected BindingSource newBindingSource()
@@ -172,7 +176,7 @@
component.setBinding("fred", binding);
- replayControls();
+ replay();
PageLoader loader = new PageLoader();
loader.setLog(log);
@@ -180,7 +184,7 @@
loader.bind(container, component, contained, "ognl");
- verifyControls();
+ verify();
}
protected ComponentPropertySource newPropertySource()
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestNamespaceClassSearchComponentClassProvider.java Tue Jun 27 11:21:31 2006
@@ -14,11 +14,14 @@
package org.apache.tapestry.pageload;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.INamespace;
import org.apache.tapestry.services.ClassFinder;
import org.apache.tapestry.spec.IComponentSpecification;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.pageload.NamespaceClassSearchComponentClassProvider}.
@@ -26,31 +29,22 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestNamespaceClassSearchComponentClassProvider extends HiveMindTestCase
+public class TestNamespaceClassSearchComponentClassProvider extends BaseComponentTestCase
{
- private IComponentSpecification newSpec()
- {
- return (IComponentSpecification) newMock(IComponentSpecification.class);
- }
-
private INamespace newNamespace(String key, String prefixes)
{
- MockControl control = newControl(INamespace.class);
- INamespace namespace = (INamespace) control.getMock();
+ INamespace namespace = newMock(INamespace.class);
- namespace.getPropertyValue(key);
- control.setReturnValue(prefixes);
+ expect(namespace.getPropertyValue(key)).andReturn(prefixes);
return namespace;
}
private ClassFinder newClassFinder(String packageList, String className, Class resultClass)
{
- MockControl control = newControl(ClassFinder.class);
- ClassFinder finder = (ClassFinder) control.getMock();
+ ClassFinder finder = newMock(ClassFinder.class);
- finder.findClass(packageList, className);
- control.setReturnValue(resultClass);
+ expect(finder.findClass(packageList, className)).andReturn(resultClass);
return finder;
}
@@ -65,7 +59,7 @@
IComponentSpecification spec = newSpec();
- replayControls();
+ replay();
ComponentClassProviderContext context = new ComponentClassProviderContext("bar/Baz", spec,
namespace);
@@ -76,7 +70,7 @@
assertEquals(PageLoaderTest.class.getName(), provider.provideComponentClassName(context));
- verifyControls();
+ verify();
}
public void testNotFound()
@@ -86,7 +80,7 @@
IComponentSpecification spec = newSpec();
- replayControls();
+ replay();
ComponentClassProviderContext context = new ComponentClassProviderContext("bar/Baz", spec,
namespace);
@@ -97,6 +91,6 @@
assertNull(provider.provideComponentClassName(context));
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/pageload/TestVerifyRequiredParametersVisitor.java Tue Jun 27 11:21:31 2006
@@ -14,15 +14,18 @@
package org.apache.tapestry.pageload;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IBinding;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.spec.ComponentSpecification;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.ParameterSpecification;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.pageload.VerifyRequiredParametersVisitor}.
@@ -30,24 +33,17 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestVerifyRequiredParametersVisitor extends HiveMindTestCase
+public class TestVerifyRequiredParametersVisitor extends BaseComponentTestCase
{
private IComponent newComponent(IComponentSpecification spec)
{
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
+ IComponent component = newComponent();
- component.getSpecification();
- control.setReturnValue(spec);
+ expect(component.getSpecification()).andReturn(spec);
return component;
}
- private IBinding newBinding()
- {
- return (IBinding) newMock(IBinding.class);
- }
-
public void testNotRequired()
{
ParameterSpecification pspec = new ParameterSpecification();
@@ -58,13 +54,13 @@
IComponent component = newComponent(cspec);
- replayControls();
+ replay();
VerifyRequiredParametersVisitor visitor = new VerifyRequiredParametersVisitor();
visitor.visitComponent(component);
- verifyControls();
+ verify();
}
public void testRequiredWithAlias()
@@ -78,26 +74,20 @@
cspec.addParameter(pspec);
IBinding fredBinding = newBinding();
-
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
-
- component.getSpecification();
- control.setReturnValue(cspec);
+ IComponent component = newComponent(cspec);
// Notice that we don't ever check for "barney", just
// "fred"
- component.getBinding("fred");
- control.setReturnValue(fredBinding);
+ expect(component.getBinding("fred")).andReturn(fredBinding);
- replayControls();
+ replay();
VerifyRequiredParametersVisitor visitor = new VerifyRequiredParametersVisitor();
visitor.visitComponent(component);
- verifyControls();
+ verify();
}
public void testRequiredNotBound()
@@ -110,23 +100,16 @@
cspec.addParameter(pspec);
Location l = newLocation();
+
+ IComponent component = newComponent(cspec);
- MockControl control = newControl(IComponent.class);
- IComponent component = (IComponent) control.getMock();
-
- component.getSpecification();
- control.setReturnValue(cspec);
-
- component.getBinding("fred");
- control.setReturnValue(null);
+ expect(component.getBinding("fred")).andReturn(null);
- component.getExtendedId();
- control.setReturnValue("Fred/flintstone");
+ expect(component.getExtendedId()).andReturn("Fred/flintstone");
- component.getLocation();
- control.setReturnValue(l);
+ expect(component.getLocation()).andReturn(l);
- replayControls();
+ replay();
VerifyRequiredParametersVisitor visitor = new VerifyRequiredParametersVisitor();
@@ -143,6 +126,6 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/ClientPropertyPersistenceStrategyTest.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,10 @@
package org.apache.tapestry.record;
-import static org.easymock.EasyMock.*;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@@ -74,7 +77,7 @@
encoding.setParameterValue("appstate:MyPage", "ENCODED");
- replayControls();
+ replay();
ClientPropertyPersistenceStrategy strategy = new ClientPropertyPersistenceStrategy();
strategy.setRequest(request);
@@ -85,7 +88,7 @@
strategy.addParametersForPersistentProperties(encoding, false);
- verifyControls();
+ verify();
}
public void testGetChangesUnknownPage()
@@ -115,7 +118,7 @@
trainDecodePageChanges(encoder, "ENCODED", changes);
- replayControls();
+ replay();
ClientPropertyPersistenceStrategy strategy = new ClientPropertyPersistenceStrategy();
strategy.setRequest(request);
@@ -126,7 +129,7 @@
assertSame(changes, strategy.getStoredChanges("MyPage"));
- verifyControls();
+ verify();
}
public void testPageScope()
@@ -152,7 +155,7 @@
encoding.setParameterValue("state:MyPage", "ENCODED1");
- replayControls();
+ replay();
PageClientPropertyPersistenceScope scope = new PageClientPropertyPersistenceScope();
scope.setRequestCycle(cycle);
@@ -166,7 +169,7 @@
strategy.addParametersForPersistentProperties(encoding, false);
- verifyControls();
+ verify();
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PageClientPropertyPersistenceScopeTest.java Tue Jun 27 11:21:31 2006
@@ -14,7 +14,10 @@
package org.apache.tapestry.record;
-import org.apache.hivemind.test.HiveMindTestCase;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IPage;
import org.apache.tapestry.IRequestCycle;
@@ -24,7 +27,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class PageClientPropertyPersistenceScopeTest extends HiveMindTestCase
+public class PageClientPropertyPersistenceScopeTest extends BaseComponentTestCase
{
protected IRequestCycle newCycle()
{
@@ -67,7 +70,7 @@
trainGetPage(cycle, page);
trainGetPageName(page, "MyPage");
- replayControls();
+ replay();
PageClientPropertyPersistenceScope scope = new PageClientPropertyPersistenceScope();
@@ -75,7 +78,7 @@
assertEquals(true, scope.shouldEncodeState(null, "MyPage", null));
- verifyControls();
+ verify();
}
public void testShouldEncodeStateDifferentPage()
@@ -86,7 +89,7 @@
trainGetPage(cycle, page);
trainGetPageName(page, "MyPage");
- replayControls();
+ replay();
PageClientPropertyPersistenceScope scope = new PageClientPropertyPersistenceScope();
@@ -94,7 +97,7 @@
assertEquals(false, scope.shouldEncodeState(null, "OtherPage", null));
- verifyControls();
+ verify();
}
public void testShouldEncodeStateNoActivePage()
@@ -103,7 +106,7 @@
trainGetPage(cycle, null);
- replayControls();
+ replay();
PageClientPropertyPersistenceScope scope = new PageClientPropertyPersistenceScope();
@@ -111,18 +114,11 @@
assertEquals(true, scope.shouldEncodeState(null, "MyPage", null));
- verifyControls();
- }
-
- private void trainGetPageName(IPage page, String pageName)
- {
- page.getPageName();
- setReturnValue(page, pageName);
+ verify();
}
private void trainGetPage(IRequestCycle cycle, IPage page)
{
- cycle.getPage();
- setReturnValue(cycle, page);
+ expect(cycle.getPage()).andReturn(page);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/PropertyPersistenceStrategySourceTest.java Tue Jun 27 11:21:31 2006
@@ -14,12 +14,16 @@
package org.apache.tapestry.record;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.ServiceEncoding;
/**
@@ -28,7 +32,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class PropertyPersistenceStrategySourceTest extends HiveMindTestCase
+public class PropertyPersistenceStrategySourceTest extends BaseComponentTestCase
{
private PropertyPersistenceStrategy newStrategy()
{
@@ -48,7 +52,7 @@
{
PropertyPersistenceStrategy strategy = newStrategy();
- replayControls();
+ replay();
PropertyPersistenceStrategySourceImpl source = new PropertyPersistenceStrategySourceImpl();
source.setContributions(newContributions("known", strategy));
@@ -56,7 +60,7 @@
assertSame(strategy, source.getStrategy("known"));
- verifyControls();
+ verify();
}
public void testGetUnknownStrategy()
@@ -78,9 +82,7 @@
protected void trainGetStoredChanges(PropertyPersistenceStrategy strategy, String pageName,
Collection changes)
{
-
- strategy.getStoredChanges(pageName);
- setReturnValue(strategy, changes);
+ expect(strategy.getStoredChanges(pageName)).andReturn(changes);
}
public void testGetAllStoredChanges()
@@ -91,7 +93,7 @@
trainGetStoredChanges(strategy, "MyPage", Collections.singleton(change));
- replayControls();
+ replay();
PropertyPersistenceStrategySourceImpl source = new PropertyPersistenceStrategySourceImpl();
source.setContributions(newContributions("whatever", strategy));
@@ -102,7 +104,7 @@
assertEquals(1, result.size());
assertSame(change, result.iterator().next());
- verifyControls();
+ verify();
}
private PropertyChange newChange()
@@ -117,7 +119,7 @@
strategy.addParametersForPersistentProperties(encoding, false);
- replayControls();
+ replay();
PropertyPersistenceStrategySourceImpl source = new PropertyPersistenceStrategySourceImpl();
source.setContributions(newContributions("whatever", strategy));
@@ -125,11 +127,11 @@
source.addParametersForPersistentProperties(encoding, false);
- verifyControls();
+ verify();
strategy.addParametersForPersistentProperties(encoding, true);
- replayControls();
+ replay();
source.addParametersForPersistentProperties(encoding, true);
}
@@ -145,7 +147,7 @@
strategy.discardStoredChanges("Home");
- replayControls();
+ replay();
PropertyPersistenceStrategySourceImpl source = new PropertyPersistenceStrategySourceImpl();
source.setContributions(newContributions("known", strategy));
@@ -153,6 +155,6 @@
source.discardAllStoredChanged("Home");
- verifyControls();
+ verify();
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/SessionPropertyPersistenceStrategyTest.java Tue Jun 27 11:21:31 2006
@@ -14,11 +14,17 @@
package org.apache.tapestry.record;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
+
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.engine.ServiceEncoding;
import org.apache.tapestry.web.WebRequest;
import org.apache.tapestry.web.WebSession;
@@ -29,7 +35,7 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class SessionPropertyPersistenceStrategyTest extends HiveMindTestCase
+public class SessionPropertyPersistenceStrategyTest extends BaseComponentTestCase
{
private ServiceEncoding newEncoding()
{
@@ -40,9 +46,7 @@
{
WebRequest request = (WebRequest) newMock(WebRequest.class);
- request.getSession(create);
-
- setReturnValue(request, session);
+ expect(request.getSession(create)).andReturn(session);
return request;
}
@@ -68,10 +72,8 @@
{
WebSession session = (WebSession) newMock(WebSession.class);
- session.getAttributeNames();
-
- setReturnValue(session, Collections.singletonList(attributeName));
-
+ expect(session.getAttributeNames()).andReturn(Collections.singletonList(attributeName));
+
if (value != null)
trainGetAttribute(session, attributeName, value);
@@ -82,13 +84,13 @@
{
ServiceEncoding encoding = newEncoding();
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy strategy = new SessionPropertyPersistenceStrategy();
strategy.addParametersForPersistentProperties(encoding, false);
- verifyControls();
+ verify();
}
public void testClearPageProperty()
@@ -98,7 +100,7 @@
session.setAttribute("session,myapp,Help,bar", null);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
@@ -107,7 +109,7 @@
s.store("Help", null, "bar", null);
- verifyControls();
+ verify();
}
public void testDiscardChangesNoMatch()
@@ -115,28 +117,28 @@
WebSession session = newSession("session,myapp,Home,foo", false);
WebRequest request = newRequest(false, session);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
s.setRequest(request);
s.setApplicationId("myapp");
s.discardStoredChanges("Foo");
- verifyControls();
+ verify();
}
public void testDiscardChangesNoSession()
{
WebRequest request = newRequest(false, null);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
s.setRequest(request);
s.discardStoredChanges("Foo");
- verifyControls();
+ verify();
}
public void testDiscardChangesWithMatch()
@@ -144,7 +146,7 @@
WebSession session = newSession("session,myapp,Home,foo", true);
WebRequest request = newRequest(false, session);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
s.setRequest(request);
@@ -152,7 +154,7 @@
s.discardStoredChanges("Home");
- verifyControls();
+ verify();
}
public void testGetStoreChangesNoMatch()
@@ -160,7 +162,7 @@
WebSession session = newSession("session,myapp,Home,foo,bar", null);
WebRequest request = newRequest(false, session);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
s.setRequest(request);
@@ -170,21 +172,21 @@
assertTrue(actual.isEmpty());
- verifyControls();
+ verify();
}
public void testGetStoredChangesNoSession()
{
WebRequest request = newRequest(false, null);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
s.setRequest(request);
assertTrue(s.getStoredChanges("Foo").isEmpty());
- verifyControls();
+ verify();
}
public void testGetStoredComponentProperty()
@@ -193,7 +195,7 @@
WebSession session = newSession("session,myapp,Help,zap.biff,bar", value);
WebRequest request = newRequest(false, session);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
s.setRequest(request);
@@ -209,7 +211,7 @@
assertEquals("bar", pc.getPropertyName());
assertSame(value, pc.getNewValue());
- verifyControls();
+ verify();
}
public void testGetStoredPageProperty()
@@ -218,7 +220,7 @@
WebSession session = newSession("session,myapp,Help,bar", value);
WebRequest request = newRequest(false, session);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
s.setRequest(request);
@@ -234,7 +236,7 @@
assertEquals("bar", pc.getPropertyName());
assertSame(value, pc.getNewValue());
- verifyControls();
+ verify();
}
public void testStoreComponentProperty()
@@ -246,7 +248,7 @@
session.setAttribute("session,gloop,Nerf,zip.zap,spaz", value);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
@@ -255,7 +257,7 @@
s.store("Nerf", "zip.zap", "spaz", value);
- verifyControls();
+ verify();
}
public void testStorePageProperty()
@@ -267,7 +269,7 @@
session.setAttribute("session,myapp,Home,foo", value);
- replayControls();
+ replay();
SessionPropertyPersistenceStrategy s = new SessionPropertyPersistenceStrategy();
@@ -276,18 +278,16 @@
s.store("Home", null, "foo", value);
- verifyControls();
+ verify();
}
private void trainGetAttribute(WebSession session, String attributeName, Object value)
{
- session.getAttribute(attributeName);
- setReturnValue(session, value);
+ expect(session.getAttribute(attributeName)).andReturn(value);
}
private void trainGetAttributeNames(WebSession session, List names)
{
- session.getAttributeNames();
- setReturnValue(session, names);
+ expect(session.getAttributeNames()).andReturn(names);
}
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java?rev=417545&r1=417544&r2=417545&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/record/TestPageRecorder.java Tue Jun 27 11:21:31 2006
@@ -14,6 +14,11 @@
package org.apache.tapestry.record;
+import static org.easymock.EasyMock.expect;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertSame;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -22,14 +27,13 @@
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Location;
import org.apache.hivemind.Resource;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.IComponent;
import org.apache.tapestry.IPage;
import org.apache.tapestry.event.ObservedChangeEvent;
import org.apache.tapestry.spec.IComponentSpecification;
import org.apache.tapestry.spec.IPropertySpecification;
import org.apache.tapestry.test.Creator;
-import org.easymock.MockControl;
/**
* Tests for {@link org.apache.tapestry.record.PageRecorderImpl}.
@@ -37,27 +41,24 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestPageRecorder extends HiveMindTestCase
+public class TestPageRecorder extends BaseComponentTestCase
{
- private ErrorLog newLog()
+ private ErrorLog newErrorLog()
{
return (ErrorLog) newMock(ErrorLog.class);
}
public void testGetChanges()
{
- ErrorLog log = newLog();
-
- MockControl sourcec = newControl(PropertyPersistenceStrategySource.class);
- PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) sourcec
- .getMock();
+ ErrorLog log = newErrorLog();
+
+ PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
Collection expected = new ArrayList();
- source.getAllStoredChanges("Foo");
- sourcec.setReturnValue(expected);
+ expect(source.getAllStoredChanges("Foo")).andReturn(expected);
- replayControls();
+ replay();
PageRecorderImpl pr = new PageRecorderImpl("Foo", source, log);
@@ -65,55 +66,45 @@
assertSame(expected, actual);
- verifyControls();
+ verify();
}
private IComponentSpecification newSpec(String propertyName, String persistence)
{
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
-
- MockControl psc = newControl(IPropertySpecification.class);
- IPropertySpecification ps = (IPropertySpecification) psc.getMock();
+ IComponentSpecification spec = newSpec();
+
+ IPropertySpecification ps = newMock(IPropertySpecification.class);
- spec.getPropertySpecification(propertyName);
- specc.setReturnValue(ps);
+ expect(spec.getPropertySpecification(propertyName)).andReturn(ps);
- ps.getPersistence();
- psc.setReturnValue(persistence);
+ expect(ps.getPersistence()).andReturn(persistence);
return spec;
}
public void testObserveChange()
{
- ErrorLog log = newLog();
-
- MockControl pagec = newControl(IPage.class);
- IPage page = (IPage) pagec.getMock();
+ ErrorLog log = newErrorLog();
+
+ IPage page = newPage();
IComponentSpecification spec = newSpec("foobar", "session");
- page.getSpecification();
- pagec.setReturnValue(spec);
+ expect(page.getSpecification()).andReturn(spec);
- page.getIdPath();
- pagec.setReturnValue(null);
+ expect(page.getIdPath()).andReturn(null);
- MockControl sourcec = newControl(PropertyPersistenceStrategySource.class);
- PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) sourcec
- .getMock();
+ PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
- PropertyPersistenceStrategy strategy = (PropertyPersistenceStrategy) newMock(PropertyPersistenceStrategy.class);
+ PropertyPersistenceStrategy strategy = newMock(PropertyPersistenceStrategy.class);
- source.getStrategy("session");
- sourcec.setReturnValue(strategy);
+ expect(source.getStrategy("session")).andReturn(strategy);
Object newValue = new Object();
strategy.store("Foo", null, "foobar", newValue);
- replayControls();
+ replay();
PageRecorderImpl pr = new PageRecorderImpl("Foo", source, log);
@@ -121,72 +112,59 @@
pr.observeChange(event);
- verifyControls();
+ verify();
}
public void testUnknownStategy()
{
Location l = fabricateLocation(12);
Throwable inner = new ApplicationRuntimeException("Simulated error.");
- ErrorLog log = newLog();
-
- MockControl sourcec = newControl(PropertyPersistenceStrategySource.class);
- PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) sourcec
- .getMock();
+ ErrorLog log = newErrorLog();
- MockControl componentc = newControl(IComponent.class);
- IComponent component = (IComponent) componentc.getMock();
+ PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
+ IComponent component = newComponent();
+
+ IComponentSpecification spec = newSpec();
+
+ IPropertySpecification ps = newMock(IPropertySpecification.class);
- MockControl psc = newControl(IPropertySpecification.class);
- IPropertySpecification ps = (IPropertySpecification) psc.getMock();
+ expect(component.getSpecification()).andReturn(spec);
- component.getSpecification();
- componentc.setReturnValue(spec);
+ expect(spec.getPropertySpecification("zip")).andReturn(ps);
- spec.getPropertySpecification("zip");
- specc.setReturnValue(ps);
+ expect(ps.getPersistence()).andReturn("unknown");
- ps.getPersistence();
- psc.setReturnValue("unknown");
+ expect(source.getStrategy("unknown")).andThrow(inner);
- source.getStrategy("unknown");
- sourcec.setThrowable(inner);
-
- ps.getLocation();
- psc.setReturnValue(l);
+ expect(ps.getLocation()).andReturn(l);
log.error("Simulated error.", l, inner);
- replayControls();
+ replay();
PageRecorderImpl pr = new PageRecorderImpl("SomePage", source, log);
assertNull(pr.findStrategy(component, "zip"));
- verifyControls();
+ verify();
}
public void testRollbackPageProperty()
{
- ErrorLog log = newLog();
+ ErrorLog log = newErrorLog();
Creator creator = new Creator();
PageFixture page = (PageFixture) creator.newInstance(PageFixture.class);
- MockControl sourcec = newControl(PropertyPersistenceStrategySource.class);
- PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) sourcec
- .getMock();
+ PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
PropertyChange pc = new PropertyChangeImpl(null, "cartoonName", "Dexter's Laboratory");
- source.getAllStoredChanges("MyPage");
- sourcec.setReturnValue(Collections.singletonList(pc));
+ expect(source.getAllStoredChanges("MyPage")).andReturn(Collections.singletonList(pc));
- replayControls();
+ replay();
PageRecorderImpl pr = new PageRecorderImpl("MyPage", source, log);
@@ -194,52 +172,45 @@
assertEquals("Dexter's Laboratory", page.getCartoonName());
- verifyControls();
+ verify();
}
public void testRollbackComponentProperty()
{
- ErrorLog log = newLog();
-
- MockControl pagec = newControl(IPage.class);
- IPage page = (IPage) pagec.getMock();
+ ErrorLog log = newErrorLog();
+
+ IPage page = newPage();
IComponent component = (IComponent) newMock(IComponent.class);
- MockControl sourcec = newControl(PropertyPersistenceStrategySource.class);
- PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) sourcec
- .getMock();
+ PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
PropertyChange pc = new PropertyChangeImpl("fred.barney", "id", "ziff");
- source.getAllStoredChanges("MyPage");
- sourcec.setReturnValue(Collections.singletonList(pc));
+ expect(source.getAllStoredChanges("MyPage")).andReturn(Collections.singletonList(pc));
- page.getNestedComponent("fred.barney");
- pagec.setReturnValue(component);
+ expect(page.getNestedComponent("fred.barney")).andReturn(component);
component.setId("ziff");
- replayControls();
+ replay();
PageRecorderImpl pr = new PageRecorderImpl("MyPage", source, log);
pr.rollback(page);
- verifyControls();
+ verify();
}
public void testChangeWhileLocked()
{
- ErrorLog log = newLog();
-
- MockControl pagec = newControl(IPage.class);
- IPage page = (IPage) pagec.getMock();
+ ErrorLog log = newErrorLog();
+
+ IPage page = newPage();
- PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) newMock(PropertyPersistenceStrategySource.class);
+ PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
- page.getExtendedId();
- pagec.setReturnValue("MyPage");
+ expect(page.getExtendedId()).andReturn("MyPage");
log
.error(
@@ -248,7 +219,7 @@
null,
null);
- replayControls();
+ replay();
PageRecorderImpl pr = new PageRecorderImpl("MyPage", source, log);
@@ -258,36 +229,29 @@
pr.observeChange(event);
- verifyControls();
+ verify();
}
public void testChangeToNonSpecifiedProperty()
{
Resource r = fabricateLocation(99).getResource();
- ErrorLog log = newLog();
-
- MockControl pagec = newControl(IPage.class);
- IPage page = (IPage) pagec.getMock();
-
- MockControl specc = newControl(IComponentSpecification.class);
- IComponentSpecification spec = (IComponentSpecification) specc.getMock();
+ ErrorLog log = newErrorLog();
+
+ IPage page = newPage();
+
+ IComponentSpecification spec = newSpec();
- PropertyPersistenceStrategySource source = (PropertyPersistenceStrategySource) newMock(PropertyPersistenceStrategySource.class);
+ PropertyPersistenceStrategySource source = newMock(PropertyPersistenceStrategySource.class);
- page.getSpecification();
- pagec.setReturnValue(spec);
+ expect(page.getSpecification()).andReturn(spec);
- spec.getPropertySpecification("foobar");
- specc.setReturnValue(null);
+ expect(spec.getPropertySpecification("foobar")).andReturn(null);
- page.getExtendedId();
- pagec.setReturnValue("TestPage");
+ expect(page.getExtendedId()).andReturn("TestPage");
- page.getSpecification();
- pagec.setReturnValue(spec);
+ expect(page.getSpecification()).andReturn(spec);
- spec.getSpecificationLocation();
- specc.setReturnValue(r);
+ expect(spec.getSpecificationLocation()).andReturn(r);
log.error(
"A property change event for property foobar of TestPage was observed, "
@@ -295,7 +259,7 @@
null,
null);
- replayControls();
+ replay();
PageRecorderImpl pr = new PageRecorderImpl("TestPage", source, log);
@@ -303,6 +267,6 @@
pr.observeChange(event);
- verifyControls();
+ verify();
}
}