[seam-commits] Seam SVN: r14637 - in branches/community/Seam_2_2/src/test/ftest: examples and 1 other directories.

[seam-commits at lists.jboss.org]

Author: maschmid
Date: 2012-04-26 08:40:59 -0400 (Thu, 26 Apr 2012)
New Revision: 14637

Modified:
   branches/community/Seam_2_2/src/test/ftest/build.xml
   branches/community/Seam_2_2/src/test/ftest/examples/build.xml
   branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java
Log:
update Selenium


Modified: branches/community/Seam_2_2/src/test/ftest/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/build.xml	2012-04-25 07:46:15 UTC (rev 14636)
+++ branches/community/Seam_2_2/src/test/ftest/build.xml	2012-04-26 12:40:59 UTC (rev 14637)
@@ -41,7 +41,7 @@
 
 	<path id="selenium.server.classpath">
 		<fileset dir="${lib.dir}">
-			<include name="selenium-server-standalone.jar" />
+			<include name="*.jar" />
 		</fileset>
 	</path>
 

Modified: branches/community/Seam_2_2/src/test/ftest/examples/build.xml
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/examples/build.xml	2012-04-25 07:46:15 UTC (rev 14636)
+++ branches/community/Seam_2_2/src/test/ftest/examples/build.xml	2012-04-26 12:40:59 UTC (rev 14637)
@@ -412,14 +412,9 @@
 	
 	<target name="copy.selenium" unless="copy.selenium.done">
 		<copyInlineDependencies id="selenium.server" scope="compile" todir="${ftest.lib.dir}">
-			<dependency groupId="org.seleniumhq.selenium.server" artifactId="selenium-server" version="1.0.3" classifier="standalone">
-				<exclusion groupId="org.seleniumhq.selenium.core" artifactId="selenium-core" />
-				<exclusion groupId="org.seleniumhq.selenium.server" artifactId="selenium-server-coreless" />
-				<exclusion groupId="org.apache.ant" artifactId="ant-trax" />
-				<exclusion groupId="org.apache.ant" artifactId="ant-nodeps" />
+			<dependency groupId="org.seleniumhq.selenium" artifactId="selenium-server" version="2.21.0">
 			</dependency>
-			<dependency groupId="org.seleniumhq.selenium.client-drivers" artifactId="selenium-java-client-driver" version="1.0.2">
-				<exclusion groupId="org.codehaus.groovy.maven.runtime" artifactId="gmaven-runtime-default" />
+			<dependency groupId="org.seleniumhq.selenium" artifactId="selenium-java" version="2.21.0">
 			</dependency>
 			<dependency groupId="org.subethamail" artifactId="subethasmtp-smtp" version="1.2" >
 				<!-- subethamail requires commons-logging 1.1 which requires log4j 1.2.12. But we provide log4j 1.2.14, which is completely ok -->

Modified: branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java	2012-04-25 07:46:15 UTC (rev 14636)
+++ branches/community/Seam_2_2/src/test/ftest/src/main/org/jboss/seam/example/common/test/webdriver/DelegatedWebElement.java	2012-04-26 12:40:59 UTC (rev 14637)
@@ -25,6 +25,8 @@
 import java.util.Collections;
 import java.util.List;
 import org.openqa.selenium.By;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.Point;
 import org.openqa.selenium.WebElement;
 
 /**
@@ -119,15 +121,26 @@
    {
       return element.getAttribute(name);
    }
-   
-   //@Deprecated
-   //// @Override
-   //public String getElementName()
-   //{
-   //   return element.getElementName();
-   //}
-   
+
    // @Override
+   public String getCssValue(String propertyName)
+   {
+      return element.getCssValue(propertyName);
+   }
+
+   // @Override
+   public Point getLocation()
+   {
+      return element.getLocation();
+   }
+
+   // @Override
+   public Dimension getSize()
+   {
+      return element.getSize();
+   }
+
+   // @Override
    public String getTagName()
    {
       return element.getTagName();
@@ -138,11 +151,11 @@
    {
       return element.getText();
    }
-   
+
    // @Override
-   public String getValue()
+   public boolean isDisplayed()
    {
-      return element.getValue();
+      return element.isDisplayed();
    }
    
    // @Override
@@ -164,12 +177,6 @@
    }
    
    // @Override
-   public void setSelected()
-   {
-      element.setSelected();
-   }
-   
-   // @Override
    public void setWaitTime(int millis)
    {
       this.waitTime = millis;
@@ -180,11 +187,5 @@
    {
       element.submit();
    }
-   
-   // @Override
-   public boolean toggle()
-   {
-      return element.toggle();
-   }
-   
+
 }