You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/04/09 01:06:06 UTC
[47/47] git commit: [flex-asjs] [refs/heads/develop] - fix mustella
(js) to handle defineProp
fix mustella (js) to handle defineProp
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/23b457c6
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/23b457c6
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/23b457c6
Branch: refs/heads/develop
Commit: 23b457c6bedd93877a1a3d2d78713d2ffff6a9d0
Parents: 6008098
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 8 16:04:48 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 8 16:04:48 2015 -0700
----------------------------------------------------------------------
build.xml | 92 +++++++--------
marmotinni/build.xml | 114 +++++++++----------
marmotinni/java/downloads.xml | 6 +-
.../src/marmotinni/AssertPropertyValue.java | 3 +-
mustella/java/src/marmotinni/TestStep.java | 2 +-
5 files changed, 108 insertions(+), 109 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23b457c6/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c5ee70c..3822577 100644
--- a/build.xml
+++ b/build.xml
@@ -1215,45 +1215,45 @@
<arg value="script=${basedir}/mustella/tests/basicTests/halo/scripts/CheckBoxTestScript.mxml" />
<!--<arg value="showSteps=true" />-->
<classpath>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.44.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-1.3.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-codec-1.9.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-collections-3.2.1.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-exec-1.1.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-io-2.4.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.3.2.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.1.3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.14.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.15.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-core-js-2.15.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.4.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.2.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.4.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jna-3.4.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jna-platform-3.4.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/json-20080701.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/junit-dep-4.11.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/nekohtml-1.9.21.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/operadriver-1.5.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.1.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/sac-1.3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/serializer-2.7.1.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.8.5.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xalan-2.7.1.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xercesImpl-2.11.0.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xml-apis-1.4.01.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.45.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-1.3.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-codec-1.9.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-collections-3.2.1.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-exec-1.1.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-io-2.4.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.2.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.1.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.14.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.1.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.15.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-core-js-2.15.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.6.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.6.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jna-3.4.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jna-platform-3.4.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/json-20080701.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/junit-dep-4.11.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/nekohtml-1.9.21.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/operadriver-1.5.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.2.1.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/sac-1.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/serializer-2.7.1.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/testng-6.8.5.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xalan-2.7.1.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xercesImpl-2.11.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/xml-apis-1.4.01.jar"/>
</classpath>
</java>
@@ -1304,7 +1304,7 @@
<mkdir dir="${basedir}/mustella/java/bin"/>
<javac srcdir="${basedir}/mustella/java/src/marmotinni" destdir="${basedir}/mustella/java/bin" debug="off" optimize="on">
<classpath>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.44.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/selenium-java-2.45.0.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/bsh-1.3.0.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
@@ -1313,18 +1313,18 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-exec-1.1.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-io-2.4.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.3.2.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-lang3-3.2.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/commons-logging-1.1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/cssparser-0.9.14.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/gson-2.3.1.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/guava-18.0.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-2.15.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/htmlunit-core-js-2.15.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.4.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.2.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.4.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpclient-4.3.6.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpcore-4.3.3.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/httpmime-4.3.6.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jcommander-1.29.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
@@ -1335,7 +1335,7 @@
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/nekohtml-1.9.21.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/operadriver-1.5.jar"/>
- <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.1.0.jar"/>
+ <pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/phantomjsdriver-1.2.1.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/sac-1.3.jar"/>
<pathelement location="${basedir}/marmotinni/java/lib/selenium/libs/serializer-2.7.1.jar"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23b457c6/marmotinni/build.xml
----------------------------------------------------------------------
diff --git a/marmotinni/build.xml b/marmotinni/build.xml
index 0fa501f..42252ff 100644
--- a/marmotinni/build.xml
+++ b/marmotinni/build.xml
@@ -91,45 +91,45 @@
<java classname="${param.test.class}" outputproperty="stdout" classpath="${basedir}/java/bin" fork="true" failonerror="yes">
<arg value="url=${param.test.url}" />
<classpath>
- <pathelement location="${basedir}/java/lib/selenium/selenium-java-2.44.0.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/bsh-1.3.0.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-codec-1.6.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-collections-3.2.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-exec-1.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-io-2.2.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-lang3-3.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-logging-1.1.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/cssparser-0.9.9.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/gson-2.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/guava-14.0.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-2.12.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-core-js-2.12.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/httpclient-4.2.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/httpcore-4.2.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/httpmime-4.2.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/jcommander-1.29.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/jna-3.4.0.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/jna-platform-3.4.0.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/json-20080701.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/junit-dep-4.11.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/nekohtml-1.9.17.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/operadriver-1.2.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/phantomjsdriver-1.0.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/sac-1.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/serializer-2.7.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/testng-6.8.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/xalan-2.7.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/xercesImpl-2.10.0.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/xml-apis-1.4.01.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/selenium-java-2.45.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/bsh-1.3.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-codec-1.9.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-collections-3.2.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-exec-1.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-io-2.4.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-lang3-3.2.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-logging-1.1.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/cssparser-0.9.14.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/gson-2.3.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/guava-18.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-2.15.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-core-js-2.15.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/httpclient-4.3.6.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/httpcore-4.3.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/httpmime-4.3.6.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/jcommander-1.29.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/jna-3.4.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/jna-platform-3.4.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/json-20080701.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/junit-dep-4.11.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/nekohtml-1.9.21.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/operadriver-1.5.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/phantomjsdriver-1.2.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/sac-1.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/serializer-2.7.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/testng-6.8.5.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/xalan-2.7.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/xercesImpl-2.11.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/xml-apis-1.4.01.jar"/>
</classpath>
</java>
@@ -155,27 +155,27 @@
<target name="test_compile" depends="test_prepare">
<javac srcdir="${basedir}/java/src/org/apache/flex/html/textButton" destdir="${basedir}/java/bin" debug="off" optimize="on">
<classpath>
- <pathelement location="${basedir}/java/lib/selenium/selenium-java-2.44.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/selenium-java-2.45.0.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/apache-mime4j-0.6.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/bsh-1.3.0.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/cglib-nodep-2.1_3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-codec-1.6.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-codec-1.9.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/commons-collections-3.2.1.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/commons-exec-1.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-io-2.2.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-io-2.4.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/commons-jxpath-1.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-lang3-3.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/commons-logging-1.1.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/cssparser-0.9.9.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/gson-2.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/guava-14.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-lang3-3.2.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/commons-logging-1.1.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/cssparser-0.9.14.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/gson-2.3.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/guava-18.0.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-core-1.3.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/hamcrest-library-1.3.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-2.12.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-core-js-2.12.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/httpclient-4.2.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/httpcore-4.2.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/httpmime-4.2.1.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-2.15.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/htmlunit-core-js-2.15.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/httpclient-4.3.6.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/httpcore-4.3.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/httpmime-4.3.6.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/ini4j-0.5.2.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/jcommander-1.29.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/jetty-websocket-8.1.8.jar"/>
@@ -183,16 +183,16 @@
<pathelement location="${basedir}/java/lib/selenium/libs/jna-platform-3.4.0.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/json-20080701.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/junit-dep-4.11.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/nekohtml-1.9.17.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/nekohtml-1.9.21.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/netty-3.5.7.Final.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/operadriver-1.2.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/phantomjsdriver-1.0.3.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/operadriver-1.5.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/phantomjsdriver-1.2.1.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/protobuf-java-2.4.1.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/sac-1.3.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/serializer-2.7.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/testng-6.8.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/testng-6.8.5.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/xalan-2.7.1.jar"/>
- <pathelement location="${basedir}/java/lib/selenium/libs/xercesImpl-2.10.0.jar"/>
+ <pathelement location="${basedir}/java/lib/selenium/libs/xercesImpl-2.11.0.jar"/>
<pathelement location="${basedir}/java/lib/selenium/libs/xml-apis-1.4.01.jar"/>
</classpath>
</javac>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23b457c6/marmotinni/java/downloads.xml
----------------------------------------------------------------------
diff --git a/marmotinni/java/downloads.xml b/marmotinni/java/downloads.xml
index b25d5c0..26a9d97 100644
--- a/marmotinni/java/downloads.xml
+++ b/marmotinni/java/downloads.xml
@@ -32,9 +32,9 @@
selenium (2.32.0) - Apache 2.0
-->
- <property name="selenium2.jar.dir.name" value="2.44"/>
- <property name="selenium2.jar.name" value="selenium-java-2.44.0"/>
- <property name="selenium2.dir.name" value="selenium-2.44.0"/>
+ <property name="selenium2.jar.dir.name" value="2.45"/>
+ <property name="selenium2.jar.name" value="selenium-java-2.45.0"/>
+ <property name="selenium2.dir.name" value="selenium-2.45.0"/>
<!--
Because the downloads requires a network connection and the JARs don't change very often,
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23b457c6/mustella/java/src/marmotinni/AssertPropertyValue.java
----------------------------------------------------------------------
diff --git a/mustella/java/src/marmotinni/AssertPropertyValue.java b/mustella/java/src/marmotinni/AssertPropertyValue.java
index 253cc49..156be82 100644
--- a/mustella/java/src/marmotinni/AssertPropertyValue.java
+++ b/mustella/java/src/marmotinni/AssertPropertyValue.java
@@ -65,8 +65,7 @@ public class AssertPropertyValue extends AssertStep {
StringBuilder getScript = new StringBuilder();
insertTargetScript(getScript, target);
- getScript.append("if (typeof(target['get_' + '" + propertyName + "']) == 'function') return target['get_' + '" + propertyName + "']();");
- getScript.append(" else return target['" + propertyName + "'];");
+ getScript.append(" return target['" + propertyName + "'];");
if (TestStep.showScripts)
System.out.println(getScript.toString());
String actualValue = ((JavascriptExecutor)webDriver).executeScript(getScript.toString()).toString();
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/23b457c6/mustella/java/src/marmotinni/TestStep.java
----------------------------------------------------------------------
diff --git a/mustella/java/src/marmotinni/TestStep.java b/mustella/java/src/marmotinni/TestStep.java
index 2019f7b..23eb1b3 100644
--- a/mustella/java/src/marmotinni/TestStep.java
+++ b/mustella/java/src/marmotinni/TestStep.java
@@ -112,7 +112,7 @@ public class TestStep {
int n = parts.length;
for (int i = 0; i < n; i++)
{
- sb.append("target = target['get_' + '" + parts[i] + "']();");
+ sb.append("target = target['" + parts[i] + "'];");
}
}