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/05 18:35:14 UTC
svn commit: r482719 [4/4] - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/ main/java/org/apache/tapestry/annotations/
main/java/org/apache/tapestry/corelib/base/
main/java/org/apache/tapestry/corelib/components/ main/jav...
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=482719&r1=482718&r2=482719
==============================================================================
--- 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 Tue Dec 5 09:35:05 2006
@@ -19,8 +19,8 @@
import org.apache.tapestry.internal.test.InternalBaseTestCase;
import org.apache.tapestry.services.PersistentFieldChange;
-import org.apache.tapestry.services.WebRequest;
-import org.apache.tapestry.services.WebSession;
+import org.apache.tapestry.services.Request;
+import org.apache.tapestry.services.Session;
import org.testng.annotations.Test;
public class SessionPersistentFieldStrategyTest extends InternalBaseTestCase
@@ -28,8 +28,8 @@
@Test
public void post_change_to_root_component()
{
- WebSession session = newWebSession();
- WebRequest request = newWebRequest();
+ Session session = newSession();
+ Request request = newRequest();
train_getSession(request, true, session);
@@ -47,8 +47,8 @@
@Test
public void post_change_to_nested_component()
{
- WebSession session = newWebSession();
- WebRequest request = newWebRequest();
+ Session session = newSession();
+ Request request = newRequest();
train_getSession(request, true, session);
@@ -66,7 +66,7 @@
@Test
public void gather_changes_with_no_session()
{
- WebRequest request = newWebRequest();
+ Request request = newRequest();
train_getSession(request, false, null);
@@ -84,8 +84,8 @@
@Test
public void gather_changes_with_active_session()
{
- WebSession session = newWebSession();
- WebRequest request = newWebRequest();
+ Session session = newSession();
+ Request request = newRequest();
train_getSession(request, false, session);
train_getAttributeNames(
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java?view=diff&rev=482719&r1=482718&r2=482719
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/TemplateParserImplTest.java Tue Dec 5 09:35:05 2006
@@ -169,8 +169,9 @@
assertEquals(t.getText().trim(), "lt:< gt:> amp:&");
}
-
- @Test
+
+ /** Test disabled when not online. */
+ @Test (enabled=false)
void html_entity()
{
List<TemplateToken> tokens = tokens("html_entity.html");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.java?view=diff&rev=482719&r1=482718&r2=482719
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebRequestImplTest.java Tue Dec 5 09:35:05 2006
@@ -18,8 +18,8 @@
import javax.servlet.http.HttpSession;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.WebRequest;
-import org.apache.tapestry.services.WebSession;
+import org.apache.tapestry.services.Request;
+import org.apache.tapestry.services.Session;
import org.testng.annotations.Test;
public class WebRequestImplTest extends InternalBaseTestCase
@@ -33,7 +33,7 @@
replay();
- WebRequest request = new WebRequestImpl(sr);
+ Request request = new RequestImpl(sr);
assertNull(request.getSession(false));
@@ -52,8 +52,8 @@
replay();
- WebRequest request = new WebRequestImpl(sr);
- WebSession session = request.getSession(true);
+ Request request = new RequestImpl(sr);
+ Session session = request.getSession(true);
assertEquals(session.getAttribute("foo"), "bar");
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.java?view=diff&rev=482719&r1=482718&r2=482719
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/services/WebSessionImplTest.java Tue Dec 5 09:35:05 2006
@@ -21,7 +21,7 @@
import javax.servlet.http.HttpSession;
import org.apache.tapestry.internal.test.InternalBaseTestCase;
-import org.apache.tapestry.services.WebSession;
+import org.apache.tapestry.services.Session;
import org.testng.annotations.Test;
public class WebSessionImplTest extends InternalBaseTestCase
@@ -36,7 +36,7 @@
replay();
- WebSession session = new WebSessionImpl(hs);
+ Session session = new SessionImpl(hs);
assertEquals(session.getAttributeNames(), Arrays.asList("barney", "fred"));
@@ -53,7 +53,7 @@
replay();
- WebSession session = new WebSessionImpl(hs);
+ Session session = new SessionImpl(hs);
assertEquals(session.getAttributeNames("f"), Arrays.asList("fanny", "fred"));
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java?view=diff&rev=482719&r1=482718&r2=482719
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/util/URLChangeTrackerTest.java Tue Dec 5 09:35:05 2006
@@ -12,87 +12,101 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.net.URL;
-
-import org.apache.tapestry.ioc.test.TestBase;
-import org.testng.annotations.Test;
-
-/** */
-public class URLChangeTrackerTest extends TestBase
-{
- @Test
- public void contains_change_when_empty()
- {
- URLChangeTracker t = new URLChangeTracker();
-
- assertFalse(t.containsChanges());
- }
-
- @Test
- public void contains_changes() throws Exception
- {
- URLChangeTracker t = new URLChangeTracker();
-
- File f = File.createTempFile("changetracker0", ".tmp");
- URL url = f.toURL();
-
- t.add(url);
-
- assertFalse(t.containsChanges());
-
- boolean changed = false;
-
- // Because of clock accuracy, we need to try a couple of times
- // to ensure that the change to the file is visible in the
- // lastUpdated time stamp on the URL.
-
- for (int i = 0; i < 10 && !changed; i++)
- {
- Thread.sleep(100);
-
- touch(f);
-
- changed = t.containsChanges();
- }
-
- assertTrue(changed);
-
- // And, once a change has been observed ...
-
- assertFalse(t.containsChanges());
- }
-
- @Test
- public void unreadable() throws Exception
- {
- URLChangeTracker t = new URLChangeTracker();
-
- URL url = new URL("ftp://breeblebrox.com");
-
- try
- {
- t.add(url);
- unreachable();
- }
- catch (RuntimeException ex)
- {
- assertTrue(ex.getMessage().contains(
- "Unable to read last modified time stamp of resource ftp://breeblebrox.com:"));
- }
-
- }
-
- private void touch(File f) throws Exception
- {
- OutputStream os = new FileOutputStream(f);
-
- os.write(0);
-
- os.close();
- }
-}
+package org.apache.tapestry.internal.util;
+
+import java.io.File;
+import java.net.URL;
+
+import org.apache.tapestry.test.TapestryTestCase;
+import org.testng.annotations.Test;
+
+public class URLChangeTrackerTest extends TapestryTestCase
+{
+ @Test
+ public void contains_change_when_empty()
+ {
+ URLChangeTracker t = new URLChangeTracker();
+
+ assertFalse(t.containsChanges());
+ }
+
+ @Test
+ public void contains_changes() throws Exception
+ {
+ URLChangeTracker t = new URLChangeTracker();
+
+ File f = File.createTempFile("changetracker0", ".tmp");
+ URL url = f.toURL();
+
+ t.add(url);
+
+ assertFalse(t.containsChanges());
+
+ boolean changed = false;
+
+ // Because of clock accuracy, we need to try a couple of times
+ // to ensure that the change to the file is visible in the
+ // lastUpdated time stamp on the URL.
+
+ for (int i = 0; i < 10 && !changed; i++)
+ {
+ Thread.sleep(100);
+
+ touch(f);
+
+ changed = t.containsChanges();
+ }
+
+ assertTrue(changed);
+
+ // And, once a change has been observed ...
+
+ assertFalse(t.containsChanges());
+ }
+
+ @Test
+ public void unreadable() throws Exception
+ {
+ URLChangeTracker t = new URLChangeTracker();
+
+ URL url = new URL("ftp://breeblebrox.com");
+
+ try
+ {
+ t.add(url);
+ unreachable();
+ }
+ catch (RuntimeException ex)
+ {
+ assertTrue(ex.getMessage().contains(
+ "Unable to read last modified time stamp of resource ftp://breeblebrox.com:"));
+ }
+
+ }
+
+ @Test
+ public void caching() throws Exception
+ {
+ URLChangeTracker t = new URLChangeTracker();
+
+ File f = File.createTempFile("changetracker0", ".tmp");
+ URL url = f.toURL();
+
+ long initial = t.add(url);
+
+ touch(f);
+
+ long current = t.add(url);
+
+ assertEquals(current, initial);
+
+ assertTrue(t.containsChanges());
+
+ t.clear();
+
+ current = t.add(url);
+
+ assertFalse(current == initial);
+ }
+
+}
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.html?view=diff&rev=482719&r1=482718&r2=482719
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/AssetDemo.html Tue Dec 5 09:35:05 2006
@@ -10,4 +10,13 @@
<t:comp type="Img" src="icon"/>
+ <p>
+ A classpath asset:
+ </p>
+
+ <t:comp type="Img" src="button"/>
+
+ <p>
+ [<a href="index.html">Back</a>]
+ </p>
</t:comp>
Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/smiley.png
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/smiley.png?view=auto&rev=482719
==============================================================================
Binary file - no diff available.
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/smiley.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/tapestry-button.png
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/tapestry-button.png?view=auto&rev=482719
==============================================================================
Binary file - no diff available.
Propchange: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/tapestry-button.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream