You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2006/12/13 17:59:33 UTC
svn commit: r486738 - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java
Author: hlship
Date: Wed Dec 13 08:59:32 2006
New Revision: 486738
URL: http://svn.apache.org/viewvc?view=rev&rev=486738
Log:
Neaten up a couple test classes.
Modified:
tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java
Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java?view=diff&rev=486738&r1=486737&r2=486738
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/services/ComponentTemplateSourceImpl.java Wed Dec 13 08:59:32 2006
@@ -55,7 +55,7 @@
*/
private final Map<Resource, ComponentTemplate> _templates = newThreadSafeMap();
- private final URLChangeTracker _tracker = new URLChangeTracker();
+ private final URLChangeTracker _tracker;
private final ComponentTemplate _missingTemplate = new ComponentTemplate()
{
@@ -87,8 +87,14 @@
ComponentTemplateSourceImpl(ClassLoader loader, TemplateParser parser)
{
+ this(loader, parser, new URLChangeTracker());
+ }
+
+ ComponentTemplateSourceImpl(ClassLoader loader, TemplateParser parser, URLChangeTracker tracker)
+ {
_loader = loader;
_parser = parser;
+ _tracker = tracker;
}
/**
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java?view=diff&rev=486738&r1=486737&r2=486738
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/SessionPersistentFieldStrategyTest.java Wed Dec 13 08:59:32 2006
@@ -12,113 +12,115 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.services;
-
-import java.util.Collection;
-import java.util.Iterator;
-
-import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.Request;
-import org.apache.tapestry.services.Session;
-import org.testng.annotations.Test;
-
-public class SessionPersistentFieldStrategyTest extends InternalBaseTestCase
-{
- @Test
- public void post_change_to_root_component()
- {
- Session session = newSession();
- Request request = newRequest();
-
- train_getSession(request, true, session);
-
- session.setAttribute("state:foo.Bar::field", "VALUE");
-
- replay();
-
- SessionPersistentFieldStrategy strategy = new SessionPersistentFieldStrategy(request);
-
- strategy.postChange("foo.Bar", null, "field", "VALUE");
-
- verify();
- }
-
- @Test
- public void post_change_to_nested_component()
- {
- Session session = newSession();
- Request request = newRequest();
-
- train_getSession(request, true, session);
-
- session.setAttribute("state:foo.Bar:fee.fum:field", "VALUE");
-
- replay();
-
- SessionPersistentFieldStrategy strategy = new SessionPersistentFieldStrategy(request);
-
- strategy.postChange("foo.Bar", "fee.fum", "field", "VALUE");
-
- verify();
- }
-
- @Test
- public void gather_changes_with_no_session()
- {
- Request request = newRequest();
-
- train_getSession(request, false, null);
-
- replay();
-
- SessionPersistentFieldStrategy strategy = new SessionPersistentFieldStrategy(request);
-
- Collection<PersistentFieldChange> changes = strategy.gatherFieldChanges("foo.Bar");
-
- assertTrue(changes.isEmpty());
-
- verify();
- }
-
- @Test
- public void gather_changes_with_active_session()
- {
- Session session = newSession();
- Request request = newRequest();
-
- train_getSession(request, false, session);
- train_getAttributeNames(
- session,
- "state:foo.Bar:",
- "state:foo.Bar::root",
- "state:foo.Bar:nested:down");
-
- train_getAttribute(session, "state:foo.Bar::root", "ROOT");
- train_getAttribute(session, "state:foo.Bar:nested:down", "DOWN");
-
- replay();
-
- SessionPersistentFieldStrategy stategy = new SessionPersistentFieldStrategy(request);
-
- Collection<PersistentFieldChange> changes = stategy.gatherFieldChanges("foo.Bar");
-
- assertEquals(changes.size(), 2);
-
- Iterator<PersistentFieldChange> i = changes.iterator();
-
- PersistentFieldChange change1 = i.next();
-
- assertEquals(change1.getComponentId(), "");
- assertEquals(change1.getFieldName(), "root");
- assertEquals(change1.getValue(), "ROOT");
-
- PersistentFieldChange change2 = i.next();
-
- assertEquals(change2.getComponentId(), "nested");
- assertEquals(change2.getFieldName(), "down");
- assertEquals(change2.getValue(), "DOWN");
-
- verify();
- }
-}
+package org.apache.tapestry.internal.services;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+import org.apache.tapestry.internal.test.InternalBaseTestCase;
+import org.apache.tapestry.services.PersistentFieldChange;
+import org.apache.tapestry.services.Request;
+import org.apache.tapestry.services.Session;
+import org.testng.annotations.Test;
+
+public class SessionPersistentFieldStrategyTest extends InternalBaseTestCase
+{
+ @Test
+ public void post_change_to_root_component()
+ {
+ Session session = newSession();
+ Request request = newRequest();
+ Object value = new Object();
+
+ train_getSession(request, true, session);
+
+ session.setAttribute("state:foo.Bar::field", value);
+
+ replay();
+
+ SessionPersistentFieldStrategy strategy = new SessionPersistentFieldStrategy(request);
+
+ strategy.postChange("foo.Bar", null, "field", value);
+
+ verify();
+ }
+
+ @Test
+ public void post_change_to_nested_component()
+ {
+ Session session = newSession();
+ Request request = newRequest();
+ Object value = new Object();
+
+ train_getSession(request, true, session);
+
+ session.setAttribute("state:foo.Bar:fee.fum:field", value);
+
+ replay();
+
+ SessionPersistentFieldStrategy strategy = new SessionPersistentFieldStrategy(request);
+
+ strategy.postChange("foo.Bar", "fee.fum", "field", value);
+
+ verify();
+ }
+
+ @Test
+ public void gather_changes_with_no_session()
+ {
+ Request request = newRequest();
+
+ train_getSession(request, false, null);
+
+ replay();
+
+ SessionPersistentFieldStrategy strategy = new SessionPersistentFieldStrategy(request);
+
+ Collection<PersistentFieldChange> changes = strategy.gatherFieldChanges("foo.Bar");
+
+ assertTrue(changes.isEmpty());
+
+ verify();
+ }
+
+ @Test
+ public void gather_changes_with_active_session()
+ {
+ Session session = newSession();
+ Request request = newRequest();
+
+ train_getSession(request, false, session);
+ train_getAttributeNames(
+ session,
+ "state:foo.Bar:",
+ "state:foo.Bar::root",
+ "state:foo.Bar:nested:down");
+
+ train_getAttribute(session, "state:foo.Bar::root", "ROOT");
+ train_getAttribute(session, "state:foo.Bar:nested:down", "DOWN");
+
+ replay();
+
+ SessionPersistentFieldStrategy stategy = new SessionPersistentFieldStrategy(request);
+
+ Collection<PersistentFieldChange> changes = stategy.gatherFieldChanges("foo.Bar");
+
+ assertEquals(changes.size(), 2);
+
+ Iterator<PersistentFieldChange> i = changes.iterator();
+
+ PersistentFieldChange change1 = i.next();
+
+ assertEquals(change1.getComponentId(), "");
+ assertEquals(change1.getFieldName(), "root");
+ assertEquals(change1.getValue(), "ROOT");
+
+ PersistentFieldChange change2 = i.next();
+
+ assertEquals(change2.getComponentId(), "nested");
+ assertEquals(change2.getFieldName(), "down");
+ assertEquals(change2.getValue(), "DOWN");
+
+ verify();
+ }
+}