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 2012/11/20 19:42:24 UTC
[4/4] git commit: Fix tests broken due to core library images being
deleted and renamed
Fix tests broken due to core library images being deleted and renamed
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/b76b21c6
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/b76b21c6
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/b76b21c6
Branch: refs/heads/5.4-js-rewrite
Commit: b76b21c6a07d1cccb87adbf7355d3d4fb48692c0
Parents: 64f4d9a
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Tue Nov 20 10:04:08 2012 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Tue Nov 20 10:04:08 2012 -0800
----------------------------------------------------------------------
.../integration/app2/pages/TestPageForSubmit.java | 4 ++--
.../integration/pagelevel/SubmitTest.java | 12 ++----------
2 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b76b21c6/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java
index 82467ba..53f0981 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app2/pages/TestPageForSubmit.java
@@ -1,4 +1,4 @@
-// Copyright 2007, 2008 The Apache Software Foundation
+// Copyright 2007, 2008, 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.
@@ -52,7 +52,7 @@ public class TestPageForSubmit
@Property
@Inject
- @Path("${tapestry.spacer-image}")
+ @Path("${tapestry.asset.root}/ajax-loader.gif")
private Asset spacerImage;
@Persist
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/b76b21c6/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
index f863d03..94e5d97 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/pagelevel/SubmitTest.java
@@ -1,4 +1,4 @@
-// Copyright 2007, 2009 The Apache Software Foundation
+// Copyright 2007, 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,7 +17,6 @@ package org.apache.tapestry5.integration.pagelevel;
import org.apache.tapestry5.dom.Document;
import org.apache.tapestry5.dom.Element;
import org.apache.tapestry5.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry5.ioc.services.SymbolSource;
import org.apache.tapestry5.test.PageTester;
import org.testng.Assert;
import org.testng.annotations.AfterMethod;
@@ -86,14 +85,7 @@ public class SubmitTest extends Assert
assertEquals("image", submitButton.getAttribute("type"));
- SymbolSource service = tester.getService(SymbolSource.class);
-
- String symbolValue = service.valueForSymbol("tapestry.spacer-image");
-
- String iconName = symbolValue.substring(symbolValue.lastIndexOf("/"));
-
- assertTrue(submitButton.getAttribute("src").contains(iconName));
-
+ assertTrue(submitButton.getAttribute("src").endsWith(".gif"));
}
@BeforeMethod