Updated Branches: refs/heads/5.3 ef93aff22 -> 07709f29b
Apply commit 5c777af which got lost in previous release cycle (relative to tag 5.3.6) Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/edd00eee Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/edd00eee Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/edd00eee Branch: refs/heads/5.3 Commit: edd00eee4e3f34de1e4e3f51ddf5cebf3c605130 Parents: ef93aff Author: Massimo Lusetti <[email protected]> Authored: Sun Apr 21 15:58:30 2013 +0200 Committer: Massimo Lusetti <[email protected]> Committed: Sun Apr 21 15:58:30 2013 +0200 ---------------------------------------------------------------------- .../internal/services/ClientDataEncoderTest.java | 11 +++++------ .../ClientPersistentFieldStorageImplTest.java | 14 ++++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/edd00eee/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientDataEncoderTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientDataEncoderTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientDataEncoderTest.java index ac3ff49..fd6378f 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientDataEncoderTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientDataEncoderTest.java @@ -1,4 +1,4 @@ -// Copyright 2006, 2009 The Apache Software Foundation +// Copyright 2006, 2009, 2012 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -31,9 +31,9 @@ public class ClientDataEncoderTest extends InternalBaseTestCase private ClientDataEncoder encoder; @BeforeClass - public void setup() + public void setup() throws Exception { - encoder = getService(ClientDataEncoder.class); + encoder = new ClientDataEncoderImpl(new URLEncoderImpl(), "passphrase", null, "unused application-package-name", null); } @@ -63,7 +63,7 @@ public class ClientDataEncoderTest extends InternalBaseTestCase @Test public void checks_for_eof() throws Exception { - String[] values = { "fred", "barney", "wilma" }; + String[] values = {"fred", "barney", "wilma"}; ClientDataSink sink = encoder.createSink(); @@ -89,8 +89,7 @@ public class ClientDataEncoderTest extends InternalBaseTestCase { ois.readObject(); fail("Unreachable."); - } - catch (EOFException ex) + } catch (EOFException ex) { // Expected. } http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/edd00eee/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java ---------------------------------------------------------------------- diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java index 46a7db8..66cd6ba 100644 --- a/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java +++ b/tapestry-core/src/test/java/org/apache/tapestry5/internal/services/ClientPersistentFieldStorageImplTest.java @@ -1,4 +1,4 @@ -// Copyright 2007, 2008, 2009 The Apache Software Foundation +// Copyright 2007, 2008, 2009, 2012 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -17,27 +17,29 @@ package org.apache.tapestry5.internal.services; import org.apache.tapestry5.Link; import org.apache.tapestry5.internal.test.InternalBaseTestCase; import org.apache.tapestry5.internal.util.Holder; -import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList; import org.apache.tapestry5.services.ClientDataEncoder; import org.apache.tapestry5.services.PersistentFieldChange; import org.apache.tapestry5.services.Request; import org.easymock.EasyMock; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.isA; import org.easymock.IAnswer; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import java.io.UnsupportedEncodingException; import java.util.List; +import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.isA; + public class ClientPersistentFieldStorageImplTest extends InternalBaseTestCase { private ClientDataEncoder clientDataEncoder; @BeforeClass - public void setup() + public void setup() throws UnsupportedEncodingException { - clientDataEncoder = getService(ClientDataEncoder.class); + clientDataEncoder = new ClientDataEncoderImpl(new URLEncoderImpl(), "passphrase", null, "unused application-package-name", null); } @Test
