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/06/29 23:03:21 UTC
svn commit: r418137 - in
/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry:
BaseComponentTestCase.java components/TestIfElse.java
engine/DirectServiceTest.java junit/utils/TestRegexpMatcher.java
valid/TestUrlValidator.java
Author: jkuhnert
Date: Thu Jun 29 14:03:20 2006
New Revision: 418137
URL: http://svn.apache.org/viewvc?rev=418137&view=rev
Log:
More test fixes
Modified:
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/junit/utils/TestRegexpMatcher.java
tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java?rev=418137&r1=418136&r2=418137&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/BaseComponentTestCase.java Thu Jun 29 14:03:20 2006
@@ -610,16 +610,24 @@
return new URLResource(url);
}
- public static boolean assertListEquals(Object[] expected, List actual)
+ public static boolean assertListEquals(Object[] expected, Object[] actual)
{
if (expected == null || actual == null)
notEquals(expected, actual);
- Object[] acarr = actual.toArray(new Object[actual.size()]);
- if (!Arrays.equals(expected, acarr))
- notEquals(expected, acarr);
+ if (!Arrays.equals(expected, actual))
+ notEquals(expected, actual);
return true;
+ }
+
+ public static boolean assertListEquals(Object[] expected, List actual)
+ {
+ if (expected == null || actual == null)
+ notEquals(expected, actual);
+
+ Object[] acarr = actual.toArray(new Object[actual.size()]);
+ return assertListEquals(expected, acarr);
}
public static void notEquals(Object expected, Object actual)
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java?rev=418137&r1=418136&r2=418137&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/components/TestIfElse.java Thu Jun 29 14:03:20 2006
@@ -60,11 +60,12 @@
trainResponseBuilder(cycle, writer);
+ IRender body = newRender(writer, cycle);
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
expect(cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE)).andReturn(Boolean.TRUE);
- IRender body = newRender(writer, cycle);
IRender body2 = newRender();
replay();
@@ -136,11 +137,12 @@
trainResponseBuilder(cycle, writer);
+ IRender body = newRender(writer, cycle);
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
expect(cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE)).andReturn(Boolean.TRUE);
- IRender body = newRender(writer, cycle);
IRender body2 = newRender();
replay();
@@ -220,11 +222,12 @@
trainResponseBuilder(cycle, writer);
+ IRender body = newRender(writer, cycle);
+
cycle.setAttribute(IfBean.IF_VALUE_ATTRIBUTE, Boolean.TRUE);
expect(cycle.getAttribute(IfBean.IF_VALUE_ATTRIBUTE)).andReturn(Boolean.TRUE);
-
- IRender body = newRender(writer, cycle);
+
IRender body2 = newRender();
replay();
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java?rev=418137&r1=418136&r2=418137&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/engine/DirectServiceTest.java Thu Jun 29 14:03:20 2006
@@ -332,8 +332,7 @@
IRequestCycle cycle = newCycle();
IPage page = newPage();
IDirect d = newDirect();
- WebSession session = newWebSession(false);
- WebRequest request = newWebRequest(session);
+
LinkFactory lf = newLinkFactory();
ResponseRenderer rr = newResponseRenderer();
@@ -349,6 +348,11 @@
trainIsStateful(d, true);
+ WebSession session = newMock(WebSession.class);
+ WebRequest request = newWebRequest(session);
+
+ expect(session.isNew()).andReturn(false);
+
trainExtractListenerParameters(lf, cycle, parameters);
cycle.setListenerParameters(parameters);
@@ -379,7 +383,7 @@
IRequestCycle cycle = newCycle();
IPage page = newPage();
IDirect d = newDirect();
- WebRequest request = newWebRequest(null);
+
Location l = newLocation();
trainGetParameter(cycle, ServiceConstants.COMPONENT, "fred.barney");
@@ -393,7 +397,9 @@
trainGetNestedComponent(page, "fred.barney", d);
trainIsStateful(d, true);
-
+
+ WebRequest request = newWebRequest(null);
+
trainGetExtendedId(d, "ActivePage/fred.barney");
trainGetLocation(page, l);
trainGetPageName(page, "ActivePage");
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=418137&r1=418136&r2=418137&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 Thu Jun 29 14:03:20 2006
@@ -109,7 +109,7 @@
String[] matches = m.getMatches("\\d+", "57,232 89 147", 0);
- assertEquals(new String[]
+ assertListEquals(new String[]
{ "57", "232", "89", "147" }, matches);
}
@@ -152,7 +152,7 @@
String matches[] = m.getMatches("A(B|C|fred)", "AA AC AB Afred AA AC", 1);
- assertEquals(new String[]
+ assertListEquals(new String[]
{ "C", "B", "fred", "C" }, matches);
}
Modified: tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java?rev=418137&r1=418136&r2=418137&view=diff
==============================================================================
--- tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java (original)
+++ tapestry/tapestry4/trunk/framework/src/test/org/apache/tapestry/valid/TestUrlValidator.java Thu Jun 29 14:03:20 2006
@@ -21,6 +21,7 @@
import org.apache.tapestry.IPage;
import org.apache.tapestry.form.IFormComponent;
+import org.testng.annotations.Configuration;
import org.testng.annotations.Test;
/**
@@ -35,6 +36,18 @@
{
private UrlValidator v = new UrlValidator();
+ @Configuration(afterTestMethod = true)
+ public void reset()
+ {
+ v.setClientScriptingEnabled(false);
+ v.setDisallowedProtocolMessage(null);
+ v.setInvalidUrlFormatMessage(null);
+ v.setMinimumLength(-1);
+ v.setMinimumLengthMessage(null);
+ v.setRequired(false);
+ v.setRequiredMessage(null);
+ }
+
public void testValidUrl() throws ValidatorException
{
IFormComponent field = newField();