Author: ehillenius
Date: Thu Mar 22 20:59:22 2007
New Revision: 521571
URL: http://svn.apache.org/viewvc?view=rev&rev=521571
Log:
unit test fix
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/ComponentResolvingPage.java
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/HtmlHeaderContainerTest.java
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/ComponentResolvingPage.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/ComponentResolvingPage.java?view=diff&rev=521571&r1=521570&r2=521571
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/ComponentResolvingPage.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/ComponentResolvingPage.java
Thu Mar 22 20:59:22 2007
@@ -32,7 +32,7 @@
private static final long serialVersionUID = 1L;
/** onEndRequestWasCalledOnAutoAddedComponent */
- public boolean onEndRequestWasCalledOnAutoAddedComponent = false;
+ public boolean onDetachWasCalledOnAutoAddedComponent = false;
/**
* Construct.
@@ -42,7 +42,6 @@
}
/**
- *
* @see
wicket.markup.resolver.IComponentResolver#resolve(wicket.MarkupContainer,
* wicket.markup.MarkupStream, wicket.markup.ComponentTag)
*/
@@ -55,9 +54,10 @@
{
private static final long serialVersionUID = 1L;
- protected void onEndRequest()
+ protected void onDetach()
{
-
onEndRequestWasCalledOnAutoAddedComponent = true;
+ onDetachWasCalledOnAutoAddedComponent =
true;
+ super.onDetach();
}
});
return true;
Modified:
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/HtmlHeaderContainerTest.java
URL:
http://svn.apache.org/viewvc/incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/HtmlHeaderContainerTest.java?view=diff&rev=521571&r1=521570&r2=521571
==============================================================================
---
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/HtmlHeaderContainerTest.java
(original)
+++
incubator/wicket/branches/wicket-1.x/jdk-1.4/wicket/src/test/java/wicket/markup/html/internal/HtmlHeaderContainerTest.java
Thu Mar 22 20:59:22 2007
@@ -45,7 +45,7 @@
// onEndRequest() of auto added component was not called in
// MarkupContainer#internalEndRequest() using an iterator
ComponentResolvingPage page =
(ComponentResolvingPage)tester.getLastRenderedPage();
- assertTrue("onEndRequest() should be called",
- page.onEndRequestWasCalledOnAutoAddedComponent);
+ assertTrue("onDetach() should have been called",
+ page.onDetachWasCalledOnAutoAddedComponent);
}
}