You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by bo...@apache.org on 2018/08/05 02:33:58 UTC
[1/5] tapestry-5 git commit: Fixed Spelling.
Repository: tapestry-5
Updated Branches:
refs/heads/master bd719bde6 -> 63f309d18
Fixed Spelling.
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/73d67994
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/73d67994
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/73d67994
Branch: refs/heads/master
Commit: 73d6799458865ba838ad94488b813cfbd6c57c84
Parents: f6e3cb2
Author: Jimmy Casey <ca...@gmail.com>
Authored: Sun Jul 29 21:42:33 2018 +0000
Committer: Bob Harner <bo...@gmail.com>
Committed: Sun Jul 29 21:07:52 2018 -0400
----------------------------------------------------------------------
.../java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java | 2 +-
.../org/apache/tapestry5/corelib/components/FormFragment.xdoc | 4 ++--
.../apache/tapestry5/ioc/internal/services/MethodIterator.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/73d67994/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
----------------------------------------------------------------------
diff --git a/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java b/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
index ab59d20..d2eadf9 100644
--- a/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
+++ b/commons/src/main/java/org/apache/tapestry5/ioc/util/CaseInsensitiveMap.java
@@ -309,7 +309,7 @@ public class CaseInsensitiveMap<V> extends AbstractMap<String, V> implements Ser
size++;
- // This is definately a structural change
+ // This is definitely a structural change
modCount++;
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/73d67994/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.xdoc
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.xdoc b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.xdoc
index ed29742..562b6fd 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.xdoc
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/components/FormFragment.xdoc
@@ -48,10 +48,10 @@
<t:beaneditor t:id="billingAddress"/>
- <t:checkbox t:id="separateShipTo" t:mixins="triggerfragment" fragment="seperateShippingAddress"/>
+ <t:checkbox t:id="separateShipTo" t:mixins="triggerfragment" fragment="separateShippingAddress"/>
<t:label for="separateShipTo">Separate Ship To?</t:label>
- <t:formfragment t:id="seperateShippingAddress" visible="separateShipTo">
+ <t:formfragment t:id="separateShippingAddress" visible="separateShipTo">
<h2>Shipping Address</h2>
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/73d67994/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
----------------------------------------------------------------------
diff --git a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
index c67ba75..b926e86 100644
--- a/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
+++ b/tapestry-ioc/src/main/java/org/apache/tapestry5/ioc/internal/services/MethodIterator.java
@@ -21,7 +21,7 @@ import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newList;
import static org.apache.tapestry5.ioc.internal.util.CollectionFactory.newMap;
/**
- * Utility used to iterate over the publically visible methods of a class or interface. The MethodIterator understands
+ * Utility used to iterate over the publicly visible methods of a class or interface. The MethodIterator understands
* some complications that can occur when a class inherits the same method from multiple interfaces and with slightly
* different signatures (due to the fact that declared thrown exceptions can vary slightly for the "same" method).
*
[3/5] tapestry-5 git commit: Fix unit tests (although BeanValidator
tests still fail intermittently)
Posted by bo...@apache.org.
Fix unit tests (although BeanValidator tests still fail intermittently)
This involved upgrading Selenium from 3.7.1 to 3.12.0 and
webdrivermanager from 2.0.0 to 2.2.4, and reverting some of Jochen's
AppFolderTests.groovy changes from Nov 2017.
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/d50d22c7
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/d50d22c7
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/d50d22c7
Branch: refs/heads/master
Commit: d50d22c726b991c44fc507f7f4f6cfe7f213de7e
Parents: daf3cee
Author: Bob Harner <bo...@gmail.com>
Authored: Sat Aug 4 22:27:57 2018 -0400
Committer: Bob Harner <bo...@gmail.com>
Committed: Sat Aug 4 22:27:57 2018 -0400
----------------------------------------------------------------------
build.gradle | 2 +-
.../integration/appfolder/AppFolderTests.groovy | 8 ++++----
.../tapestry5/integration/app1/components/Border.tml | 2 +-
tapestry-test/build.gradle | 2 +-
.../org/apache/tapestry5/test/SeleniumTestCase.java | 15 ++++++++++-----
tapestry-webresources/build.gradle | 2 +-
6 files changed, 18 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d50d22c7/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 215e7af..a19d0d5 100755
--- a/build.gradle
+++ b/build.gradle
@@ -17,7 +17,7 @@ project.ext.versions = [
hibernate: "5.1.0.Final",
slf4j: "1.7.25",
geb: "2.0",
- selenium: "3.7.1"
+ selenium: "3.12.0"
]
ext.continuousIntegrationBuild = Boolean.getBoolean("ci")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d50d22c7/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
index 4a3c996..0ee69ba 100644
--- a/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
+++ b/tapestry-core/src/test/groovy/org/apache/tapestry5/integration/appfolder/AppFolderTests.groovy
@@ -15,7 +15,7 @@ class AppFolderTests extends GroovyTapestryCoreTestCase
@Test
void page_navigation()
{
- openLinks "t5app/ "
+ openLinks "t5app/"
assertTitle "Index Page"
@@ -31,7 +31,7 @@ class AppFolderTests extends GroovyTapestryCoreTestCase
@Test
void component_event_request()
{
- openLinks "t5app/ ", "show index page alert"
+ openLinks "t5app/", "show index page alert"
assertTextPresent "index page alert"
}
@@ -39,7 +39,7 @@ class AppFolderTests extends GroovyTapestryCoreTestCase
@Test
void static_pages()
{
- openLinks "static.html "
+ openLinks "static.html"
assertTitle "Static File"
@@ -51,7 +51,7 @@ class AppFolderTests extends GroovyTapestryCoreTestCase
@Test
void asset_access()
{
- openLinks "t5app/ "
+ openLinks "t5app/"
// Ony one image on page
String assetURL = getAttribute("//img/@src")
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d50d22c7/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Border.tml
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Border.tml b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Border.tml
index 36c8b00..007f7a0 100644
--- a/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Border.tml
+++ b/tapestry-core/src/test/resources/org/apache/tapestry5/integration/app1/components/Border.tml
@@ -3,7 +3,7 @@
<head>
<title>Tapestry Integration Test Application</title>
</head>
-<body data-floating-console="enabled">
+<body data-floating-console="invisible">
<div class="navbar navbar-inverse navbar-static-top" role="navigation">
<div class="container">
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d50d22c7/tapestry-test/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-test/build.gradle b/tapestry-test/build.gradle
index 8753084..41ef97f 100644
--- a/tapestry-test/build.gradle
+++ b/tapestry-test/build.gradle
@@ -5,7 +5,7 @@ dependencies {
compile project(":tapestry-test-data")
compile project(":tapestry-runner")
- compile ("io.github.bonigarcia:webdrivermanager:2.0.0")
+ compile ("io.github.bonigarcia:webdrivermanager:2.2.4")
compile "org.seleniumhq.selenium:selenium-leg-rc:${versions.selenium}", {
exclude group: "org.seleniumhq.selenium", module: "jetty-repacked"
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d50d22c7/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
----------------------------------------------------------------------
diff --git a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
index a1fba91..34806f8 100644
--- a/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
+++ b/tapestry-test/src/main/java/org/apache/tapestry5/test/SeleniumTestCase.java
@@ -37,6 +37,8 @@ import org.testng.ITestContext;
import org.testng.annotations.*;
import org.testng.xml.XmlTest;
+import io.github.bonigarcia.wdm.FirefoxDriverManager;
+
import java.io.File;
import java.lang.reflect.Method;
import java.util.concurrent.TimeUnit;
@@ -207,11 +209,11 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
final Runnable stopWebServer = launchWebServer(container, webAppFolder, contextPath, port, sslPort);
- // FirefoxDriverManager.getInstance().setup();
+ FirefoxDriverManager.getInstance().setup();
File ffProfileTemplate = new File(TapestryRunnerConstants.MODULE_BASE_DIR, "src/test/conf/ff_profile_template");
DesiredCapabilities desiredCapabilities = DesiredCapabilities.firefox();
- desiredCapabilities.setCapability(FirefoxDriver.MARIONETTE, false);
+ desiredCapabilities.setCapability(FirefoxDriver.MARIONETTE, true);
FirefoxOptions options = new FirefoxOptions(desiredCapabilities);
@@ -260,7 +262,9 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
try
{
- webDriver.quit();
+ if (webDriver != null) { // is sometimes null... but why?
+ webDriver.quit();
+ }
} catch (RuntimeException e)
{
LOGGER.error("Webdriver shutdown failure.", e);
@@ -563,7 +567,9 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
{
WebElement element = webDriver.findElement(convertLocator(locator));
scrollIntoView(element);
- element.click();
+ JavascriptExecutor executor = (JavascriptExecutor)webDriver;
+ executor.executeScript("arguments[0].click();", element);
+// element.click(); // failing as of Aug 2018
}
@Override
@@ -1801,7 +1807,6 @@ public abstract class SeleniumTestCase extends Assert implements Selenium
protected static By convertLocator(String locator)
{
- By by;
if (locator.startsWith("link="))
{
return By.linkText(locator.substring(5));
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/d50d22c7/tapestry-webresources/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-webresources/build.gradle b/tapestry-webresources/build.gradle
index 775cdde..7c9eb63 100644
--- a/tapestry-webresources/build.gradle
+++ b/tapestry-webresources/build.gradle
@@ -16,7 +16,7 @@ dependencies {
testCompile "org.seleniumhq.selenium:selenium-server:${versions.selenium}", {
exclude group: "org.eclipse.jetty"
}
- testCompile ("io.github.bonigarcia:webdrivermanager:1.7.2")
+ testCompile ("io.github.bonigarcia:webdrivermanager:2.2.4")
}
[2/5] tapestry-5 git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/tapestry-5 into TAP5-2588
Posted by bo...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/tapestry-5 into TAP5-2588
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/daf3cee7
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/daf3cee7
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/daf3cee7
Branch: refs/heads/master
Commit: daf3cee71846d15c59c3dae3c6b9054c2c912be6
Parents: 73d6799 bd719bd
Author: Bob Harner <bo...@gmail.com>
Authored: Sun Jul 29 21:20:43 2018 -0400
Committer: Bob Harner <bo...@gmail.com>
Committed: Sun Jul 29 21:20:43 2018 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[5/5] tapestry-5 git commit: Add more Gradle tasks for running
integration tests manually
Posted by bo...@apache.org.
Add more Gradle tasks for running integration tests manually
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/63f309d1
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/63f309d1
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/63f309d1
Branch: refs/heads/master
Commit: 63f309d1816cd3146ad4615245bd8e49169e79ab
Parents: 9c9de1a
Author: Bob Harner <bo...@gmail.com>
Authored: Sat Aug 4 22:29:50 2018 -0400
Committer: Bob Harner <bo...@gmail.com>
Committed: Sat Aug 4 22:29:50 2018 -0400
----------------------------------------------------------------------
tapestry-beanvalidator/build.gradle | 7 +++++++
tapestry-core/build.gradle | 26 ++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/63f309d1/tapestry-beanvalidator/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-beanvalidator/build.gradle b/tapestry-beanvalidator/build.gradle
index b9d0652..24ac5a1 100644
--- a/tapestry-beanvalidator/build.gradle
+++ b/tapestry-beanvalidator/build.gradle
@@ -15,6 +15,13 @@ task compileCoffeeScript(type: CompileCoffeeScript) {
outputDir "src/main/generated/compiled-coffeescript"
}
+// Start up the test app, useful when debugging failing integration tests
+task runTestApp303(type:JavaExec) {
+ main = 'org.apache.tapestry5.test.JettyRunner'
+ args "-d", "src/test/webapp", "-p", "8080"
+ classpath += project.sourceSets.test.runtimeClasspath
+}
+
clean.delete 'src/main/generated'
sourceSets {
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/63f309d1/tapestry-core/build.gradle
----------------------------------------------------------------------
diff --git a/tapestry-core/build.gradle b/tapestry-core/build.gradle
index d7453dd..9165da2 100644
--- a/tapestry-core/build.gradle
+++ b/tapestry-core/build.gradle
@@ -65,11 +65,37 @@ jar {
}
}
+// tasks for starting integration test apps, useful when debugging failing integration tests
task runTestApp1(type:JavaExec) {
main = 'org.apache.tapestry5.test.JettyRunner'
args "-d", "src/test/app1", "-p", "8080"
classpath += project.sourceSets.test.runtimeClasspath
}
+task runTestApp2(type:JavaExec) {
+ main = 'org.apache.tapestry5.test.JettyRunner'
+ args "-d", "src/test/app2", "-p", "8080"
+ classpath += project.sourceSets.test.runtimeClasspath
+}
+task runTestApp3(type:JavaExec) {
+ main = 'org.apache.tapestry5.test.JettyRunner'
+ args "-d", "src/test/app3", "-p", "8080"
+ classpath += project.sourceSets.test.runtimeClasspath
+}
+task runTestApp4(type:JavaExec) {
+ main = 'org.apache.tapestry5.test.JettyRunner'
+ args "-d", "src/test/app4", "-p", "8080"
+ classpath += project.sourceSets.test.runtimeClasspath
+}
+task runTestApp5(type:JavaExec) {
+ main = 'org.apache.tapestry5.test.JettyRunner'
+ args "-d", "src/test/app5", "-p", "8080"
+ classpath += project.sourceSets.test.runtimeClasspath
+}
+task runTestAppfolder(type:JavaExec) {
+ main = 'org.apache.tapestry5.test.JettyRunner'
+ args "-d", "src/test/appfolder", "-p", "8080"
+ classpath += project.sourceSets.test.runtimeClasspath
+}
task testWithPrototype(type:Test) {
systemProperties."tapestry.javascript-infrastructure-provider" = "prototype"
[4/5] tapestry-5 git commit: Minor - remove unneeded @Property in
DynamicDemo test
Posted by bo...@apache.org.
Minor - remove unneeded @Property in DynamicDemo test
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9c9de1a3
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9c9de1a3
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9c9de1a3
Branch: refs/heads/master
Commit: 9c9de1a3987ec4fc128311d9e0597a74cbe28faf
Parents: d50d22c
Author: Bob Harner <bo...@gmail.com>
Authored: Sat Aug 4 22:28:22 2018 -0400
Committer: Bob Harner <bo...@gmail.com>
Committed: Sat Aug 4 22:28:22 2018 -0400
----------------------------------------------------------------------
.../org/apache/tapestry5/integration/app1/pages/DynamicDemo.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9c9de1a3/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DynamicDemo.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DynamicDemo.java b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DynamicDemo.java
index 75e942b..4bde87a 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DynamicDemo.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/DynamicDemo.java
@@ -22,7 +22,6 @@ import org.apache.tapestry5.ioc.annotations.Inject;
public class DynamicDemo
{
- @Property
@Persist
private Integer selected;