You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tapestry.apache.org by jk...@apache.org on 2006/08/22 04:10:31 UTC
svn commit: r433471 - in /tapestry/tapestry4/trunk: ./
tapestry-examples/TimeTracker/src/context/ tapestry-framework/
tapestry-framework/src/java/org/apache/tapestry/link/
tapestry-framework/src/js/tapestry/
tapestry-framework/src/test/org/apache/tapes...
Author: jkuhnert
Date: Mon Aug 21 19:10:29 2006
New Revision: 433471
URL: http://svn.apache.org/viewvc?rev=433471&view=rev
Log:
Upgraded tapestry-testng version and fixed associated old references.
Fixed various user reported issues with DirectLink and Form when doing ajax requests, such as
not properly detecting the right event target to gather href url attributes from - as well as IE not
liking the use of dojo.event.browser.isEvent on my fabricated event with form submissions.
Modified:
tapestry/tapestry4/trunk/pom.xml
tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
tapestry/tapestry4/trunk/tapestry-framework/pom.xml
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.script
tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestExternalResource.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestMisc.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponent.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestStaticLink.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestChangeKey.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestPropertyChange.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestStringValidator.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java
tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/TestWebUtils.java
tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java
Modified: tapestry/tapestry4/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/pom.xml?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/pom.xml (original)
+++ tapestry/tapestry4/trunk/pom.xml Mon Aug 21 19:10:29 2006
@@ -192,7 +192,7 @@
<groupId>com.javaforge.tapestry</groupId>
<artifactId>tapestry-testng</artifactId>
<version>1.0.0-SNAPSHOT</version>
- <scope>test</scope>
+ <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>tapestry</groupId>
@@ -202,6 +202,10 @@
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jwebunit</groupId>
+ <artifactId>jwebunit</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
@@ -222,8 +226,6 @@
<value>en_US</value>
</property>
</systemProperties>
- <threadCount>2</threadCount>
- <parallel>true</parallel>
</configuration>
</plugin>
<plugin>
Modified: tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html (original)
+++ tapestry/tapestry4/trunk/tapestry-examples/TimeTracker/src/context/Home.html Mon Aug 21 19:10:29 2006
@@ -69,7 +69,8 @@
<div jwcid="projectDescription@Any" >
<span jwcid="@If" condition="ognl:selectedProject">
<h2 style="clear:left" ><span jwcid="@Insert" value="ognl:selectedProject.name" /></h2>
- <a jwcid="@DirectLink" listener="listener:linkUpdateClicked" async="true">Another link!</a>
+ <a jwcid="@DirectLink" listener="listener:linkUpdateClicked"
+ async="true" updateComponents="ognl:{'projectDescription'}">Another link!</a>
</span>
</div>
Modified: tapestry/tapestry4/trunk/tapestry-framework/pom.xml
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/pom.xml?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/pom.xml (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/pom.xml Mon Aug 21 19:10:29 2006
@@ -79,6 +79,12 @@
<version>5.1</version>
<classifier>jdk15</classifier>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jdom</groupId>
@@ -89,12 +95,26 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.9</version>
+ <version>1.2.8</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.javaforge.tapestry</groupId>
<artifactId>tapestry-testng</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>tapestry</groupId>
+ <artifactId>tapestry</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jwebunit</groupId>
+ <artifactId>jwebunit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.tapestry</groupId>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.script
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.script?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.script (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/link/DirectLinkWorker.script Mon Aug 21 19:10:29 2006
@@ -22,13 +22,19 @@
tapestry.event.buildEventProperties(e, content);
if (!content["beventtarget.id"]) content["beventtarget.id"]="${component.clientId}";
- if (dj_undef("target", e) || dj_undef("getAttribute", e.target)
- || !e.target.getAttribute("href")) {
- dojo.raise("Error, link target not found or invalid " + e);
+ var url=null;
+ if (e["currentTarget"] && e.currentTarget.getAttribute("href")) {
+ url=e.currentTarget.getAttribute("href");
+ } else if (e["target"] && e.target.getAttribute("href")) {
+ url=e.target.getAttribute("href");
+ } else if (e["relatedTarget"] && e.relatedTarget.getAttribute("href")) {
+ url=e.relatedTarget.getAttribute("href");
+ } else {
+ dojo.raise("Error, link target not found or invalid. Couldn't determine href url. " + e);
return;
}
- tapestry.bind(e.target.getAttribute("href"), content, ${json});
+ tapestry.bind(url, content, ${json});
};
dojo.event.connect(dojo.byId("${component.clientId}"), "onclick", tapestry, "event${key}");
</initialization>
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/js/tapestry/core.js Mon Aug 21 19:10:29 2006
@@ -104,8 +104,8 @@
}
if (!id){
- dojo.raise("No element id found in ajax-response node.");
- return;
+ dojo.warn("No element id found in ajax-response node.");
+ continue;
}
var node=dojo.byId(id);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestExternalResource.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestExternalResource.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestExternalResource.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestExternalResource.java Mon Aug 21 19:10:29 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.asset;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -24,7 +24,7 @@
* @since 4.0
*/
@Test
-public class TestExternalResource extends HiveMindTestCase
+public class TestExternalResource extends BaseComponentTestCase
{
public void testGetResourceURL()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/asset/TestUnprotectedAsset.java Mon Aug 21 19:10:29 2006
@@ -17,7 +17,6 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
-import static org.testng.AssertJUnit.assertFalse;
import java.util.ArrayList;
import java.util.List;
@@ -109,7 +108,7 @@
matcher.contains("/org/apache/tapestry/asset/tapestry-in-action.png", pr);
long urtime = System.currentTimeMillis() - currTime;
- assertFalse("Urtime > drtime: " + urtime + " > " + drtime, urtime < drtime);
+ assertFalse(urtime < drtime, "Urtime > drtime: " + urtime + " > " + drtime);
}
/**
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/bean/TestLightweightBeanInitializer.java Mon Aug 21 19:10:29 2006
@@ -16,7 +16,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -26,7 +26,7 @@
* @since 4.0
*/
@Test
-public class TestLightweightBeanInitializer extends HiveMindTestCase
+public class TestLightweightBeanInitializer extends BaseComponentTestCase
{
public void testSuccess()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/StringToPropertySelectionModelConverterTest.java Mon Aug 21 19:10:29 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.coerce;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.form.IPropertySelectionModel;
import org.testng.annotations.Test;
@@ -26,7 +26,7 @@
* @since 4.0
*/
@Test
-public class StringToPropertySelectionModelConverterTest extends HiveMindTestCase
+public class StringToPropertySelectionModelConverterTest extends BaseComponentTestCase
{
private IPropertySelectionModel newModel(String value)
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestBooleanConverters.java Mon Aug 21 19:10:29 2006
@@ -20,7 +20,7 @@
import java.util.List;
import java.util.Map;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -31,7 +31,7 @@
* @since 4.0
*/
@Test
-public class TestBooleanConverters extends HiveMindTestCase
+public class TestBooleanConverters extends BaseComponentTestCase
{
public void testStringToBoolean()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestIteratorConverters.java Mon Aug 21 19:10:29 2006
@@ -18,7 +18,7 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -26,7 +26,7 @@
* @since 4.0
*/
@Test
-public class TestIteratorConverters extends HiveMindTestCase
+public class TestIteratorConverters extends BaseComponentTestCase
{
public void testObjectToIterator()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestMisc.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestMisc.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestMisc.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestMisc.java Mon Aug 21 19:10:29 2006
@@ -16,7 +16,7 @@
import java.util.Iterator;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -26,7 +26,7 @@
* @since 4.0
*/
@Test
-public class TestMisc extends HiveMindTestCase
+public class TestMisc extends BaseComponentTestCase
{
public void testCharArrayToIteratorConverter()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/coerce/TestStringConverters.java Mon Aug 21 19:10:29 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.coerce;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -22,7 +22,7 @@
* @since 4.0
*/
@Test
-public class TestStringConverters extends HiveMindTestCase
+public class TestStringConverters extends BaseComponentTestCase
{
public void testObjectToString()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/TestServiceEncoding.java Mon Aug 21 19:10:29 2006
@@ -17,7 +17,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -26,7 +26,7 @@
* @author Howard M. Lewis Ship
*/
@Test
-public class TestServiceEncoding extends HiveMindTestCase
+public class TestServiceEncoding extends BaseComponentTestCase
{
public void testSetServletPath()
{
@@ -76,14 +76,14 @@
se.setParameterValues("flintstone", new String[]
{ "fred", "wilma", "dino" });
- assertListsEqual(new String[]
+ assertListEquals(new String[]
{ "fred", "wilma", "dino" }, se.getParameterValues("flintstone"));
assertEquals(true, se.isModified());
se.setParameterValue("foo", "bar");
- assertListsEqual(new String[]
+ assertListEquals(new String[]
{ "bar" }, se.getParameterValues("foo"));
assertNull(se.getParameterValue("unknown"));
@@ -111,7 +111,7 @@
se.setParameterValue("foo", "bar");
se.setParameterValue("alpha", "beta");
- assertListsEqual(new String[]
+ assertListEquals(new String[]
{ "alpha", "foo" }, se.getParameterNames());
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestInstantiateClassStateObjectFactory.java Mon Aug 21 19:10:29 2006
@@ -18,7 +18,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -28,7 +28,7 @@
* @since 4.0
*/
@Test
-public class TestInstantiateClassStateObjectFactory extends HiveMindTestCase
+public class TestInstantiateClassStateObjectFactory extends BaseComponentTestCase
{
public void testSuccess()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/engine/state/TestNamedClassStateObjectFactory.java Mon Aug 21 19:10:29 2006
@@ -20,7 +20,7 @@
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
import org.apache.hivemind.impl.DefaultClassResolver;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -28,7 +28,7 @@
* @since 4.0
*/
@Test
-public class TestNamedClassStateObjectFactory extends HiveMindTestCase
+public class TestNamedClassStateObjectFactory extends BaseComponentTestCase
{
public void testSuccess()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/form/FormSupportTest.java Mon Aug 21 19:10:29 2006
@@ -18,7 +18,6 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.isA;
-import static org.testng.AssertJUnit.assertEquals;
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.hivemind.Location;
@@ -64,7 +63,7 @@
{
public void render(IMarkupWriter writer, IRequestCycle cycle)
{
- assertEquals("Writer argument must be nested instance.", nested, writer);
+ assertEquals(nested, writer);
for (int i = 0; i < component.length; i++)
fs.getElementId(component[i]);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/ContentTypeTest.java Mon Aug 21 19:10:29 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.junit;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertTrue;
import org.apache.tapestry.util.ContentType;
import org.testng.annotations.Test;
@@ -64,32 +62,29 @@
{
ContentType contentType = new ContentType("text/html;charset=utf-8");
- assertEquals("The base type of the ContentType is invalid", "text", contentType
+ assertEquals( "text", contentType
.getBaseType());
- assertEquals("The html type of the ContentType is invalid", "html", contentType
+ assertEquals( "html", contentType
.getSubType());
- assertEquals("The mime type of the ContentType is invalid", "text/html", contentType
+ assertEquals( "text/html", contentType
.getMimeType());
String[] parameterNames = contentType.getParameterNames();
assertEquals(
- "The number of parameter names of the ContentType is invalid",
1,
parameterNames.length);
assertEquals(
- "The parameter names of the ContentType are invalid",
"charset",
parameterNames[0]);
String charset = contentType.getParameter("charset");
- assertEquals("The charset parameter of the ContentType is invalid", "utf-8", charset);
+ assertEquals( "utf-8", charset);
String nonexistant = contentType.getParameter("nonexistant");
assertTrue(
- "ContentType does not return null for a non-existant parameter",
nonexistant == null);
}
@@ -97,23 +92,22 @@
{
ContentType contentType = new ContentType("text/html");
- assertEquals("The base type of the ContentType is invalid", "text", contentType
+ assertEquals( "text", contentType
.getBaseType());
- assertEquals("The html type of the ContentType is invalid", "html", contentType
+ assertEquals( "html", contentType
.getSubType());
- assertEquals("The mime type of the ContentType is invalid", "text/html", contentType
+ assertEquals( "text/html", contentType
.getMimeType());
String[] parameterNames = contentType.getParameterNames();
assertEquals(
- "The number of parameter names of the ContentType is invalid",
0,
parameterNames.length);
String charset = contentType.getParameter("charset");
- assertTrue("The charset parameter of the ContentType is invalid", charset == null);
+ assertTrue(charset == null);
}
public void testUnparsing1() throws Exception
@@ -125,7 +119,6 @@
contentType.setParameter("charset", "utf-8");
assertEquals(
- "ContentType does not generate a valid String representation",
"text/html;charset=utf-8",
contentType.unparse());
}
@@ -138,7 +131,6 @@
contentType.setSubType("html");
assertEquals(
- "ContentType does not generate a valid String representation",
"text/html",
contentType.unparse());
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TapestryTestCase.java Mon Aug 21 19:10:29 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.junit;
-import static org.testng.AssertJUnit.assertEquals;
-
import java.util.Arrays;
import java.util.List;
@@ -39,8 +37,6 @@
import org.apache.tapestry.spec.ILibrarySpecification;
import org.apache.tapestry.util.IPropertyHolder;
-import junit.framework.AssertionFailedError;
-
/**
* Base class for Tapestry test cases.
*
@@ -140,17 +136,17 @@
{
int count = Tapestry.size(actual);
- assertEquals(propertyName + " element count", expected.length, count);
+ assertEquals(expected.length, count);
for (int i = 0; i < count; i++)
{
- assertEquals("propertyName[" + i + "]", expected[i], actual.get(i));
+ assertEquals(expected[i], actual.get(i));
}
}
public static void checkProperty(IPropertyHolder h, String propertyName, String expectedValue)
{
- assertEquals("Property " + propertyName + ".", expectedValue, h.getProperty(propertyName));
+ assertEquals(expectedValue, h.getProperty(propertyName));
}
public static void checkException(Throwable ex, String string)
@@ -158,7 +154,7 @@
if (ex.getMessage().indexOf(string) >= 0)
return;
- throw new AssertionFailedError("Exception " + ex + " does not contain sub-string '"
+ throw new AssertionError("Exception " + ex + " does not contain sub-string '"
+ string + "'.");
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponent.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponent.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponent.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponent.java Mon Aug 21 19:10:29 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.junit;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertTrue;
import org.apache.tapestry.BaseComponent;
import org.apache.tapestry.BaseComponentTestCase;
@@ -96,6 +95,6 @@
verify();
for (int i = 0; i < list.length; i++)
- assertTrue("Outer object #" + i + " did render.", list[i].rendered);
+ assertTrue(list[i].rendered);
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestComponentMessages.java Mon Aug 21 19:10:29 2006
@@ -103,7 +103,7 @@
{
String actual = messages.getMessage(key);
- assertEquals("Key " + key, expected, actual);
+ assertEquals(expected, actual);
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestLocalizedProperties.java Mon Aug 21 19:10:29 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.junit;
-import static org.testng.AssertJUnit.assertEquals;
-
import java.io.InputStream;
import java.util.Properties;
@@ -65,7 +63,7 @@
}
if (standardException == null && localizedException == null)
- assertEquals("The property content does not match", standard, localized);
+ assertEquals(standard, localized, "The property content does not match");
else if (standardException == null && localizedException != null)
fail("Properties did not throw an exception, but LocalizedProperties did: "
+ localizedException);
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestStaticLink.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestStaticLink.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestStaticLink.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/TestStaticLink.java Mon Aug 21 19:10:29 2006
@@ -55,7 +55,7 @@
public void testGetParameterNames()
{
- assertEquals(null, l.getParameterNames());
+ assertNull(l.getParameterNames());
}
public void testGetParameterValues()
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/mock/TestMockApplications.java Mon Aug 21 19:10:29 2006
@@ -61,8 +61,6 @@
import javax.servlet.ServletException;
import javax.servlet.http.Cookie;
-import junit.framework.AssertionFailedError;
-
/**
* A complex class that reads an XML description of a test involving the Mock objects and executes
* it, pretending to be a running servlet container.
@@ -478,7 +476,7 @@
if (result)
return;
- throw new AssertionFailedError(buildTestName(name) + ": Expression '" + expression
+ throw new AssertionError(buildTestName(name) + ": Expression '" + expression
+ "' was not true.");
}
@@ -660,35 +658,35 @@
System.err.println(text);
- throw new AssertionFailedError(buildTestName(name)
+ throw new AssertionError(buildTestName(name)
+ ": Response does not contain regular expression '" + pattern + "'.");
}
private void matchSubstring(String name, String text, String substring)
{
if (text == null)
- throw new AssertionFailedError(buildTestName(name) + " : Response is null.");
+ throw new AssertionError(buildTestName(name) + " : Response is null.");
if (text.indexOf(substring) >= 0)
return;
System.err.println(text);
- throw new AssertionFailedError(buildTestName(name) + ":" + text + "\n Response does not contain string '"
+ throw new AssertionError(buildTestName(name) + ":" + text + "\n Response does not contain string '"
+ substring + "'.");
}
private void matchNoSubstring(String name, String text, String substring)
{
if (text == null)
- throw new AssertionFailedError(buildTestName(name) + " : Response is null.");
+ throw new AssertionError(buildTestName(name) + " : Response is null.");
if (text.indexOf(substring) < 0)
return;
System.err.println(text);
- throw new AssertionFailedError(buildTestName(name) + ": Response contains string '"
+ throw new AssertionError(buildTestName(name) + ": Response contains string '"
+ substring + "'.");
}
@@ -741,13 +739,13 @@
if (i >= count)
{
System.err.println(outputString);
- throw new AssertionFailedError(buildTestName(name) + ": Too many matches for '"
+ throw new AssertionError(buildTestName(name) + ": Too many matches for '"
+ pattern + "'.");
}
if (!matched) {
System.err.println(outputString);
- throw new AssertionFailedError(buildTestName(name) + ": No expected match found for "
+ throw new AssertionError(buildTestName(name) + ": No expected match found for "
+ "output of '" + actual + "'. ");
}
@@ -757,7 +755,7 @@
if (i < count)
{
System.err.println(outputString);
- throw new AssertionFailedError(buildTestName(name) + ": Too few matches for '"
+ throw new AssertionError(buildTestName(name) + ": Too few matches for '"
+ pattern + "' (expected " + count + " but got " + i + ").");
}
}
@@ -792,13 +790,13 @@
String value = assertion.getTextTrim();
if (_exception == null)
- throw new AssertionFailedError(buildTestName(name) + " no exception thrown.");
+ throw new AssertionError(buildTestName(name) + " no exception thrown.");
String message = _exception.getMessage();
if (message.indexOf(value) >= 0)
return;
- throw new AssertionFailedError(buildTestName(name) + " exception message (" + message
+ throw new AssertionError(buildTestName(name) + " exception message (" + message
+ ") does not contain '" + value + "'.");
}
@@ -830,11 +828,11 @@
if (cookies[i].getValue().equals(value))
return;
- throw new AssertionFailedError(buildTestName(name) + ": Response cookie '" + name
+ throw new AssertionError(buildTestName(name) + ": Response cookie '" + name
+ "': expected '" + value + "', but was '" + cookies[i].getValue() + "'.");
}
- throw new AssertionFailedError(buildTestName(name) + ": Could not find cookie named '"
+ throw new AssertionError(buildTestName(name) + ": Could not find cookie named '"
+ name + "' in response.");
}
@@ -866,21 +864,21 @@
String actualContentType = _response.getContentType();
if (!contentType.equals(actualContentType))
- throw new AssertionFailedError(buildTestName(name) + " content-type was '"
+ throw new AssertionError(buildTestName(name) + " content-type was '"
+ actualContentType + "', expected '" + contentType + "'.");
byte[] actualContent = _response.getResponseBytes();
byte[] expectedContent = getFileContent(getBaseDirectory() + "/" + path);
if (actualContent.length != expectedContent.length)
- throw new AssertionFailedError(buildTestName(name) + " actual length of "
+ throw new AssertionError(buildTestName(name) + " actual length of "
+ actualContent.length + " bytes does not match expected length of "
+ expectedContent.length + " bytes.");
for (int i = 0; i < actualContent.length; i++)
{
if (actualContent[i] != expectedContent[i])
- throw new AssertionFailedError(buildTestName(name)
+ throw new AssertionError(buildTestName(name)
+ " content mismatch at index + " + i + ".");
}
@@ -991,4 +989,4 @@
return _baseDir;
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestSpecificationParser.java Mon Aug 21 19:10:29 2006
@@ -14,10 +14,6 @@
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 java.util.List;
import org.apache.commons.logging.Log;
@@ -58,7 +54,7 @@
private void checkLine(Locatable locatable, int line)
{
- assertEquals("Line", line, locatable.getLocation().getLineNumber());
+ assertEquals(line, locatable.getLocation().getLineNumber());
}
/**
@@ -71,8 +67,8 @@
IBindingSpecification bs = spec.getComponent("hello").getBinding("value");
- assertEquals("type", BindingType.PREFIXED, bs.getType());
- assertEquals("key", "message:label.hello", bs.getValue());
+ assertEquals(BindingType.PREFIXED, bs.getType());
+ assertEquals("message:label.hello", bs.getValue());
checkLine(bs, 25);
}
@@ -109,7 +105,7 @@
IParameterSpecification ps = spec.getParameter("valid");
- assertNotNull("Parameter specification.", ps);
+ assertNotNull(ps);
checkLine(ps, 24);
}
@@ -513,28 +509,28 @@
{ "bool", "init", "longInitialValue", "persist" }, spec.getPropertySpecificationNames());
IPropertySpecification ps = spec.getPropertySpecification("bool");
- assertEquals("name", "bool", ps.getName());
- assertEquals("persistent", false, ps.isPersistent());
- assertEquals("type", "boolean", ps.getType());
- assertNull("initialValue", ps.getInitialValue());
+ assertEquals("bool", ps.getName());
+ assertEquals(false, ps.isPersistent());
+ assertEquals("boolean", ps.getType());
+ assertNull(ps.getInitialValue());
checkLine(ps, 24);
ps = spec.getPropertySpecification("init");
- assertEquals("name", "init", ps.getName());
- assertEquals("persistent", false, ps.isPersistent());
- assertNull("type", ps.getType());
+ assertEquals("init", ps.getName());
+ assertEquals(false, ps.isPersistent());
+ assertNull(ps.getType());
// Starting with release 4.0, the initial value is a binding reference
// with an appropriate prefix. In 3.0 it was always an OGNL expression.
- assertEquals("initialValue", "ognl:pageName", ps.getInitialValue());
+ assertEquals("ognl:pageName", ps.getInitialValue());
checkLine(ps, 26);
ps = spec.getPropertySpecification("persist");
- assertEquals("name", "persist", ps.getName());
- assertEquals("persistent", true, ps.isPersistent());
- assertNull("type", ps.getType());
- assertNull("initialValue", ps.getInitialValue());
+ assertEquals("persist", ps.getName());
+ assertEquals(true, ps.isPersistent());
+ assertNull(ps.getType());
+ assertNull(ps.getInitialValue());
checkLine(ps, 25);
ps = spec.getPropertySpecification("longInitialValue");
@@ -542,7 +538,7 @@
ps = spec.getPropertySpecification("unknown");
- assertNull("Unknown PropertySpecification", ps);
+ assertNull(ps);
}
/** @since 3.0 * */
@@ -925,29 +921,29 @@
{ "bool", "init", "longInit", "persist" }, spec.getPropertySpecificationNames());
IPropertySpecification ps = spec.getPropertySpecification("bool");
- assertEquals("name", "bool", ps.getName());
- assertEquals("persistent", false, ps.isPersistent());
+ assertEquals("bool", ps.getName());
+ assertEquals(false, ps.isPersistent());
// In a 4.0 DTD, type is always null.
- assertNull("type", ps.getType());
+ assertNull(ps.getType());
// Note that no prefix is added. Initial value will be a string literal,
// or have a prefix and be something else.
- assertNull("initialValue", ps.getInitialValue());
+ assertNull(ps.getInitialValue());
checkLine(ps, 24);
ps = spec.getPropertySpecification("init");
- assertEquals("name", "init", ps.getName());
- assertEquals("persistent", false, ps.isPersistent());
+ assertEquals("init", ps.getName());
+ assertEquals(false, ps.isPersistent());
- assertEquals("initialValue", "ognl:pageName", ps.getInitialValue());
+ assertEquals("ognl:pageName", ps.getInitialValue());
checkLine(ps, 26);
ps = spec.getPropertySpecification("persist");
- assertEquals("name", "persist", ps.getName());
- assertEquals("persistent", true, ps.isPersistent());
- assertNull("initialValue", ps.getInitialValue());
+ assertEquals("persist", ps.getName());
+ assertEquals(true, ps.isPersistent());
+ assertNull(ps.getInitialValue());
checkLine(ps, 25);
ps = spec.getPropertySpecification("longInit");
@@ -955,7 +951,7 @@
ps = spec.getPropertySpecification("unknown");
- assertNull("Unknown PropertySpecification", ps);
+ assertNull(ps);
}
/**
@@ -1112,4 +1108,4 @@
assertEquals("rubble/Barney", cc.getType());
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/parse/TestTemplateParser.java Mon Aug 21 19:10:29 2006
@@ -14,9 +14,6 @@
package org.apache.tapestry.junit.parse;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNotNull;
-
import java.io.IOException;
import java.io.InputStream;
import java.util.HashMap;
@@ -152,16 +149,16 @@
int expectedLength = endIndex - startIndex + 1;
- assertEquals("Text token type.", TokenType.TEXT, t.getType());
- assertEquals("Text token start index.", startIndex, t.getOffset());
- assertEquals("Text token end index.", expectedLength, t.getLength());
+ assertEquals(TokenType.TEXT, t.getType());
+ assertEquals(startIndex, t.getOffset());
+ assertEquals(expectedLength, t.getLength());
}
/** @since 3.0 * */
protected void checkLine(TemplateToken token, int line)
{
- assertEquals("Token line", line, token.getLocation().getLineNumber());
+ assertEquals(line, token.getLocation().getLineNumber());
}
/** @since 2.0.4 * */
@@ -170,10 +167,10 @@
{
LocalizationToken t = (LocalizationToken) token;
- assertEquals("Localization token type.", TokenType.LOCALIZATION, t.getType());
- assertEquals("Localization key.", key, t.getKey());
+ assertEquals(TokenType.LOCALIZATION, t.getType());
+ assertEquals( key, t.getKey());
- assertEquals("Localization attributes.", attributes, t.getAttributes());
+ assertEquals(attributes, t.getAttributes());
checkLine(token, line);
}
@@ -188,10 +185,10 @@
{
OpenToken t = (OpenToken) token;
- assertEquals("Open token type", TokenType.OPEN, t.getType());
- assertEquals("Open token id", id, t.getId());
- assertEquals("Open token component type", componentType, t.getComponentType());
- assertEquals("Open token tag", tag, t.getTag());
+ assertEquals(TokenType.OPEN, t.getType());
+ assertEquals(id, t.getId());
+ assertEquals(componentType, t.getComponentType());
+ assertEquals(tag, t.getTag());
checkLine(token, line);
}
@@ -200,20 +197,20 @@
{
OpenToken t = (OpenToken) token;
- assertEquals("Attributes", expected, t.getAttributesMap());
+ assertEquals(expected, t.getAttributesMap());
}
protected void assertCloseToken(TemplateToken token, int line)
{
- assertEquals("Close token type.", TokenType.CLOSE, token.getType());
+ assertEquals(TokenType.CLOSE, token.getType());
checkLine(token, line);
}
protected void assertTokenCount(TemplateToken[] tokens, int count)
{
- assertNotNull("Parsed tokens.", tokens);
- assertEquals("Parsed token count.", count, tokens.length);
+ assertNotNull(tokens);
+ assertEquals(count, tokens.length);
}
private void runFailure(String file, String message)
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/script/TestScript.java Mon Aug 21 19:10:29 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.junit.script;
-import static org.testng.AssertJUnit.assertEquals;
-
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -36,7 +34,7 @@
import org.apache.tapestry.services.impl.ExpressionCacheImpl;
import org.apache.tapestry.services.impl.ExpressionEvaluatorImpl;
import org.apache.tapestry.util.xml.DocumentParseException;
-import org.testng.annotations.Configuration;
+import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
/**
@@ -50,7 +48,7 @@
{
private MockScriptProcessor _processor = new MockScriptProcessor();
- @Configuration(afterTestMethod = true)
+ @AfterMethod
public void reset()
{
_processor.reset();
@@ -97,7 +95,7 @@
{
Object actual = symbols.get(key);
- assertEquals(key, expected, actual);
+ assertEquals(expected, actual);
}
/**
@@ -108,8 +106,8 @@
{
execute("simple.script", null);
- assertEquals("body", "\nBODY\n", _processor.getBody());
- assertEquals("initialization", "\nINITIALIZATION\n", _processor.getInitialization());
+ assertEquals("\nBODY\n", _processor.getBody());
+ assertEquals("\nINITIALIZATION\n", _processor.getInitialization());
assert _processor.getExternalScripts() == null
|| _processor.getExternalScripts().length == 0;
@@ -162,7 +160,7 @@
String outputSymbol = "output: " + inputSymbol;
- assertEquals("Output symbol", outputSymbol, symbols.get("outputSymbol"));
+ assertEquals(outputSymbol, symbols.get("outputSymbol"));
}
/**
@@ -192,7 +190,7 @@
scriptLocation.getRelativeResource("second"),
scriptLocation.getRelativeResource("third") };
- assertEquals("included scripts", Arrays.asList(expected), Arrays.asList(_processor
+ assertEquals(Arrays.asList(expected), Arrays.asList(_processor
.getExternalScripts()));
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestApplicationSpecification.java Mon Aug 21 19:10:29 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.junit.spec;
-import static org.testng.AssertJUnit.assertEquals;
-
import org.apache.hivemind.ApplicationRuntimeException;
import org.apache.tapestry.junit.TapestryTestCase;
import org.apache.tapestry.spec.IApplicationSpecification;
@@ -38,11 +36,11 @@
PropertyBean extension = (PropertyBean) spec.getExtension("testBean");
- assertEquals("booleanProperty", true, extension.getBooleanProperty());
- assertEquals("intProperty", 18, extension.getIntProperty());
- assertEquals("longProperty", 383838L, extension.getLongProperty());
- assertEquals("doubleProperty", -3.14, extension.getDoubleProperty(), 0.0);
- assertEquals("stringProperty", "Tapestry: Java Web Components", extension
+ assertEquals(true, extension.getBooleanProperty());
+ assertEquals(18, extension.getIntProperty());
+ assertEquals(383838L, extension.getLongProperty());
+ assertEquals(-3.14, extension.getDoubleProperty(), 0.0);
+ assertEquals("Tapestry: Java Web Components", extension
.getStringProperty());
}
@@ -77,15 +75,15 @@
IExtensionSpecification e = a.getExtensionSpecification("testBean");
- assertEquals("Property fred.", "flintstone", e.getProperty("fred"));
+ assertEquals("flintstone", e.getProperty("fred"));
}
public void testImmediateExtension() throws Exception
{
- assertEquals("instanceCount", 0, ImmediateExtension.getInstanceCount());
+ assertEquals(0, ImmediateExtension.getInstanceCount());
parseApp("ImmediateExtension.application");
- assertEquals("instanceCount", 1, ImmediateExtension.getInstanceCount());
+ assertEquals( 1, ImmediateExtension.getInstanceCount());
}
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/spec/TestComponentSpecification.java Mon Aug 21 19:10:29 2006
@@ -80,7 +80,7 @@
{
IAssetSpecification a = s.getAsset(assetName);
- assertEquals("Property " + propertyName + ".", expectedValue, a.getProperty(propertyName));
+ assertEquals(expectedValue, a.getProperty(propertyName));
}
/** @since 4.0 */
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/junit/utils/TestDataSqueezer.java Mon Aug 21 19:10:29 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.junit.utils;
-import static org.testng.AssertJUnit.assertEquals;
-
import java.io.File;
import java.io.Serializable;
import java.lang.reflect.Constructor;
@@ -38,8 +36,6 @@
import org.apache.tapestry.util.io.SqueezeAdaptor;
import org.testng.annotations.Test;
-import junit.framework.AssertionFailedError;
-
/**
* A series of tests for {@link DataSqueezerImpl} and friends.
*
@@ -64,11 +60,11 @@
{
String encoding = squeezer.squeeze(input);
- assertEquals("String encoding.", expectedEncoding, encoding);
+ assertEquals(expectedEncoding, encoding);
Object output = squeezer.unsqueeze(encoding);
- assertEquals("Decoded object.", input, output);
+ assertEquals(input, output);
}
public void testBoolean()
@@ -157,11 +153,11 @@
String[] encoded = ds.squeeze(input);
- assertEquals("Encoded array length.", input.length, encoded.length);
+ assertEquals(input.length, encoded.length);
Object[] output = ds.unsqueeze(encoded);
- assertEquals("Output array length.", input.length, output.length);
+ assertEquals(input.length, output.length);
for (int i = 0; i < input.length; i++)
{
@@ -322,7 +318,7 @@
{
ds.register(new BHSqueezer(""));
- throw new AssertionFailedError("Null prefix should be invalid.");
+ throw new AssertionError("Null prefix should be invalid.");
}
catch (IllegalArgumentException ex)
{
@@ -335,7 +331,7 @@
{
ds.register(new BHSqueezer("\n"));
- throw new AssertionFailedError("Prefix should be invalid.");
+ throw new AssertionError("Prefix should be invalid.");
}
catch (IllegalArgumentException ex)
{
@@ -348,7 +344,7 @@
{
ds.register(new BHSqueezer("b"));
- throw new AssertionFailedError("Duplicate prefix should be invalid.");
+ throw new AssertionError("Duplicate prefix should be invalid.");
}
catch (IllegalArgumentException ex)
{
@@ -361,7 +357,7 @@
{
ds.register(new BHSqueezer("B", null));
- throw new AssertionFailedError("Null data class should be invalid.");
+ throw new AssertionError("Null data class should be invalid.");
}
catch (IllegalArgumentException ex)
{
@@ -374,7 +370,7 @@
{
ds.register(null);
- throw new AssertionFailedError("Null squeezer should be invalid.");
+ throw new AssertionError("Null squeezer should be invalid.");
}
catch (IllegalArgumentException ex)
{
@@ -438,4 +434,4 @@
dsq.register(adaptor);
return dsq;
}
-}
\ No newline at end of file
+}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestChangeKey.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestChangeKey.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestChangeKey.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestChangeKey.java Mon Aug 21 19:10:29 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.record;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -24,7 +24,7 @@
* @since 4.0
*/
@Test
-public class TestChangeKey extends HiveMindTestCase
+public class TestChangeKey extends BaseComponentTestCase
{
public void testSetters()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestPropertyChange.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestPropertyChange.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestPropertyChange.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/record/TestPropertyChange.java Mon Aug 21 19:10:29 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.record;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -24,7 +24,7 @@
* @since 4.0
*/
@Test
-public class TestPropertyChange extends HiveMindTestCase
+public class TestPropertyChange extends BaseComponentTestCase
{
public void testAccessors()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/TestDataSqueezer.java Mon Aug 21 19:10:29 2006
@@ -14,7 +14,7 @@
package org.apache.tapestry.services;
import org.apache.hivemind.Registry;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
@@ -23,7 +23,7 @@
*
*/
@Test
-public class TestDataSqueezer extends HiveMindTestCase {
+public class TestDataSqueezer extends BaseComponentTestCase {
public void testPipeline() throws Exception {
final Registry reg = buildFrameworkRegistry( "squeezer-pipeline.xml" );
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestExpressionCache.java Mon Aug 21 19:10:29 2006
@@ -15,7 +15,7 @@
package org.apache.tapestry.services.impl;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -25,7 +25,7 @@
* @since 4.0
*/
@Test
-public class TestExpressionCache extends HiveMindTestCase
+public class TestExpressionCache extends BaseComponentTestCase
{
public void testValidExpression()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/services/impl/TestObjectPool.java Mon Aug 21 19:10:29 2006
@@ -17,7 +17,7 @@
import java.util.ArrayList;
import java.util.List;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.apache.tapestry.services.ObjectPool;
import org.testng.annotations.Test;
@@ -28,7 +28,7 @@
* @since 4.0
*/
@Test
-public class TestObjectPool extends HiveMindTestCase
+public class TestObjectPool extends BaseComponentTestCase
{
public void testStoreAndGet()
{
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestDateValidator.java Mon Aug 21 19:10:29 2006
@@ -14,8 +14,6 @@
package org.apache.tapestry.valid;
-import static org.testng.AssertJUnit.assertEquals;
-
import java.text.DateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -75,7 +73,7 @@
{
String out = v.toString(null, buildDate(Calendar.DECEMBER, 8, 2001));
- assertEquals("Result.", "12/08/2001", out);
+ assertEquals("12/08/2001", out);
}
public void testToStringFormat()
@@ -89,7 +87,7 @@
String out = v.toString(null, buildDate(Calendar.DECEMBER, 8, 2001));
- assertEquals("Result.", "08.12.01", out);
+ assertEquals("08.12.01", out);
}
public void testToObjectNull() throws ValidatorException
@@ -177,7 +175,7 @@
Object out = v.toObject(null, "08.12.01");
- assertEquals("Result.", buildDate(Calendar.DECEMBER, 8, 2001), out);
+ assertEquals(buildDate(Calendar.DECEMBER, 8, 2001), out, "Result.");
}
public void testToObjectMinimum()
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestNumberValidator.java Mon Aug 21 19:10:29 2006
@@ -15,7 +15,6 @@
package org.apache.tapestry.valid;
import static org.easymock.EasyMock.expect;
-import static org.testng.AssertJUnit.assertEquals;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -78,7 +77,7 @@
Object o = v.toObject(field, s);
- assertEquals("Input and output.", input, o);
+ assertEquals(input, o);
}
public void testShort() throws ValidatorException
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestStringValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestStringValidator.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestStringValidator.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/TestStringValidator.java Mon Aug 21 19:10:29 2006
@@ -14,9 +14,6 @@
package org.apache.tapestry.valid;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-
import org.apache.tapestry.form.IFormComponent;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.Test;
@@ -51,7 +48,7 @@
String in = "Foo";
String out = v.toString(field, in);
- assertEquals("Result.", in, out);
+ assertEquals(in, out);
verify();
}
@@ -64,7 +61,7 @@
String out = v.toString(field, null);
- assertNull("Null expected.", out);
+ assertNull(out);
verify();
}
@@ -123,7 +120,7 @@
Object result = v.toObject(field, "stuff");
- assertEquals("Result.", "stuff", result);
+ assertEquals("stuff", result, "Result.");
verify();
}
@@ -186,7 +183,7 @@
Object out = v.toObject(field, in);
- assertEquals("Result", in, out);
+ assertEquals(in, out, "Result");
verify();
}
@@ -207,7 +204,7 @@
Object out = v.toObject(field, in);
- assertNull("Result", out);
+ assertNull(out);
verify();
}
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/valid/ValidationDelegateTest.java Mon Aug 21 19:10:29 2006
@@ -289,7 +289,7 @@
d.setFormComponent(f2);
d.reset();
- assertEquals(null, d.getFieldTracking());
+ assertNull(d.getFieldTracking());
assertEquals(false, d.getHasErrors());
assertNull(d.getFirstError());
Modified: tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/TestWebUtils.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/TestWebUtils.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/TestWebUtils.java (original)
+++ tapestry/tapestry4/trunk/tapestry-framework/src/test/org/apache/tapestry/web/TestWebUtils.java Mon Aug 21 19:10:29 2006
@@ -19,7 +19,7 @@
import java.util.Enumeration;
import java.util.List;
-import org.apache.hivemind.test.HiveMindTestCase;
+import org.apache.tapestry.BaseComponentTestCase;
import org.testng.annotations.Test;
/**
@@ -29,7 +29,7 @@
* @since 4.0
*/
@Test
-public class TestWebUtils extends HiveMindTestCase
+public class TestWebUtils extends BaseComponentTestCase
{
public void testToSortedList()
{
Modified: tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java?rev=433471&r1=433470&r2=433471&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java (original)
+++ tapestry/tapestry4/trunk/tapestry-portlet/src/test/org/apache/tapestry/portlet/bindings/TestUserAttributeBinding.java Mon Aug 21 19:10:29 2006
@@ -14,15 +14,17 @@
package org.apache.tapestry.portlet.bindings;
+import static org.easymock.EasyMock.*;
+
import java.util.HashMap;
import java.util.Map;
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.coerce.ValueConverter;
-import org.easymock.MockControl;
+import org.testng.annotations.Test;
import javax.portlet.PortletRequest;
@@ -33,7 +35,8 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class TestUserAttributeBinding extends HiveMindTestCase
+@Test
+public class TestUserAttributeBinding extends BaseComponentTestCase
{
private IBinding newBinding(String bindingDescription, ValueConverter converter,
Location location, PortletRequest request, String attributeName)
@@ -47,27 +50,24 @@
private Map newMap(String key, String value)
{
- MockControl control = newControl(Map.class);
- Map map = (Map) control.getMock();
-
- map.get(key);
- control.setReturnValue(value);
-
+ Map map = newMock(Map.class);
+ checkOrder(map, false);
+
+ expect(map.get(key)).andReturn(value);
+
return map;
}
private ValueConverter newConverter()
{
- return (ValueConverter) newMock(ValueConverter.class);
+ return newMock(ValueConverter.class);
}
private PortletRequest newRequest(Map userInfo)
{
- MockControl control = newControl(PortletRequest.class);
- PortletRequest request = (PortletRequest) control.getMock();
+ PortletRequest request = newMock(PortletRequest.class);
- request.getAttribute(PortletRequest.USER_INFO);
- control.setReturnValue(userInfo);
+ expect(request.getAttribute(PortletRequest.USER_INFO)).andReturn(userInfo);
return request;
}
@@ -75,11 +75,11 @@
public void testGetObject()
{
Map map = newMap("foo.bar", "baz");
- ValueConverter vc = newConverter();
PortletRequest request = newRequest(map);
+ ValueConverter vc = newConverter();
Location l = newLocation();
-
- replayControls();
+
+ replay();
IBinding b = newBinding("description", vc, l, request, "foo.bar");
@@ -88,7 +88,7 @@
assertEquals(false, b.isInvariant());
assertEquals("baz", b.getObject());
- verifyControls();
+ verify();
}
public void testGetObjectNoUserInfo()
@@ -97,7 +97,7 @@
PortletRequest request = newRequest(null);
Location l = newLocation();
- replayControls();
+ replay();
IBinding b = newBinding("description", vc, l, request, "foo.bar");
@@ -112,7 +112,7 @@
assertSame(l, ex.getLocation());
}
- verifyControls();
+ verify();
}
public void testSetObject()
@@ -121,16 +121,15 @@
String valueConverted = "CONVERTED";
Map map = new HashMap();
-
- MockControl converterc = newControl(ValueConverter.class);
- ValueConverter converter = (ValueConverter) converterc.getMock();
- PortletRequest request = newRequest(map);
+
+ ValueConverter converter = newMock(ValueConverter.class);
Location l = newLocation();
- converter.coerceValue(newValue, String.class);
- converterc.setReturnValue(valueConverted);
-
- replayControls();
+ expect(converter.coerceValue(newValue, String.class)).andReturn(valueConverted);
+
+ PortletRequest request = newRequest(map);
+
+ replay();
IBinding b = newBinding("description", converter, l, request, "foo.bar");
@@ -138,7 +137,7 @@
assertSame(valueConverted, map.get("foo.bar"));
- verifyControls();
+ verify();
}
}