geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r1002008 - in /geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test: pom.xml src/test/java/org/apache/geronimo/testsuite/javaee6/intcptests/InterceptorTest.java
Date Tue, 28 Sep 2010 04:19:30 GMT
Author: gawor
Date: Tue Sep 28 04:19:29 2010
New Revision: 1002008

URL: http://svn.apache.org/viewvc?rev=1002008&view=rev
Log:
formatting and dependeny updates. the test actually deploys and runs (but there are failures)

Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/pom.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/intcptests/InterceptorTest.java

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/pom.xml?rev=1002008&r1=1002007&r2=1002008&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/pom.xml Tue Sep
28 04:19:29 2010
@@ -17,11 +17,8 @@
     specific language governing permissions and limitations
     under the License.
 -->
-
 <!-- $Rev$ $Date$ -->
-
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
@@ -40,77 +37,71 @@
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
             <scope>provided</scope>
         </dependency>
-		<dependency>
+        <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-interceptor_1.1_spec</artifactId>
-            <version>1.0</version>
+            <scope>provided</scope>
         </dependency>
-		<dependency>
-			<groupId>org.apache.geronimo.specs</groupId>
-			<artifactId>geronimo-ejb_3.1_spec</artifactId>
-			<version>1.0</version>
-		</dependency>
-		<dependency>
-            <groupId>org.apache.servicemix.bundles</groupId>
-            <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
-			<version>3.1_4</version>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-ejb_3.1_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
-<profiles>
-    <profile>
-        <id>it</id>
-        <activation>
-            <property>
-                <name>it</name>
-            </property>
-        </activation>
-    <build>        
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>selenium-maven-plugin</artifactId>
-            </plugin>            		
-		    <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <configuration>
-                    <suiteXmlFiles>
-                        <suiteXmlFile>
-							${project.build.testOutputDirectory}/testng.xml
-						</suiteXmlFile>
-                    </suiteXmlFiles>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.geronimo.buildsupport</groupId>
-                <artifactId>geronimo-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>deploy-wars</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy-module</goal>
-                        </goals>
-                        <configuration>
-                            <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>undeploy-war-as-moduleId</id>
-                        <phase>post-integration-test</phase>
-                        <goals>
-                            <goal>undeploy-module</goal>
-                        </goals>
+    <profiles>
+        <profile>
+            <id>it</id>
+            <activation>
+                <property>
+                    <name>it</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.codehaus.mojo</groupId>
+                        <artifactId>selenium-maven-plugin</artifactId>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-failsafe-plugin</artifactId>
                         <configuration>
-                            <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
+                            <suiteXmlFiles>
+                                <suiteXmlFile>
+                                    ${project.build.testOutputDirectory}/testng.xml
+                                </suiteXmlFile>
+                            </suiteXmlFiles>
                         </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-    </profile>
-</profiles>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.geronimo.buildsupport</groupId>
+                        <artifactId>geronimo-maven-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>deploy-wars</id>
+                                <phase>pre-integration-test</phase>
+                                <goals>
+                                    <goal>deploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>undeploy-war-as-moduleId</id>
+                                <phase>post-integration-test</phase>
+                                <goals>
+                                    <goal>undeploy-module</goal>
+                                </goals>
+                                <configuration>
+                                    <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/intcptests/InterceptorTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/intcptests/InterceptorTest.java?rev=1002008&r1=1002007&r2=1002008&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/intcptests/InterceptorTest.java
(original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/interceptors1.1-test/src/test/java/org/apache/geronimo/testsuite/javaee6/intcptests/InterceptorTest.java
Tue Sep 28 04:19:29 2010
@@ -18,64 +18,55 @@ import org.apache.geronimo.testsupport.S
 import org.testng.Assert;
 import org.testng.annotations.*;
 
+public class InterceptorTest extends SeleniumTestSupport {
 
-
-public class InterceptorTest extends SeleniumTestSupport 
-{
-
-	@Test 
-	public void testInterceptorA() throws Exception 
-	{
-		selenium.open("/interceptor/");
-		selenium.type("NumberValue", "1.1");
-		selenium.click("operation");
-		selenium.waitForPageToLoad("30000");
-		Assert.assertEquals("Valid", selenium.getText("//*[@id=\"intcpt1\"]"));
-		Assert.assertEquals("Invalid", selenium.getText("//*[@id=\"intcpt2\"]"));
-		String sysmi1=selenium.getText("//*[@id=\"sys1\"]");
-		long s1 = Long.valueOf(sysmi1);
-		String sysmi2=selenium.getText("//*[@id=\"sys2\"]");
-		long s2 = Long.valueOf(sysmi2);
-		boolean real = (s2-s1>0)?true:false;
-		Assert.assertEquals(true, real);
-		
-	}
-	
-
-	@Test 
-	public void testInterceptorB() throws Exception 
-	{
-		selenium.open("/interceptor/");
-		selenium.type("NumberValue", "-0.9");
-		selenium.click("operation");
-		selenium.waitForPageToLoad("30000");
-		Assert.assertEquals("Invalid", selenium.getText("//*[@id=\"intcpt1\"]"));
-		Assert.assertEquals("Valid", selenium.getText("//*[@id=\"intcpt2\"]"));
-		String sysmi1=selenium.getText("//*[@id=\"sys1\"]");
-		long s1 = Long.valueOf(sysmi1);
-		String sysmi2=selenium.getText("//*[@id=\"sys2\"]");
-		long s2 = Long.valueOf(sysmi2);
-		boolean real = (s2-s1>0)?true:false;
-		Assert.assertEquals(true, real);
-		
-	}
-	
-
-	@Test 
-	public void testTimeoutInterceptor() throws Exception {
-		selenium.open("/interceptor/");
-		selenium.click("checkAroundTimeout");
-		selenium.waitForPageToLoad("30000");
-		Assert.assertEquals("@AroundTimeout invoked!", selenium.getText("//*[@id=\"outputRes\"]"));
-	}
-	
-
-	@Test 
-	public void testInterceptorBinding() throws Exception {
-		selenium.open("/interceptor/");
-		selenium.click("checkIntcptBind");		
-		selenium.waitForPageToLoad("30000");
-		Assert.assertEquals("invoke @Interceptor, @InterceptorBinding!", selenium.getText("//*[@id=\"intcptBind\"]"));
-	}
+    @Test
+    public void testInterceptorA() throws Exception {
+        selenium.open("/interceptor/");
+        selenium.type("NumberValue", "1.1");
+        selenium.click("operation");
+        selenium.waitForPageToLoad("30000");
+        Assert.assertEquals("Valid", selenium.getText("//*[@id=\"intcpt1\"]"));
+        Assert.assertEquals("Invalid", selenium.getText("//*[@id=\"intcpt2\"]"));
+        String sysmi1 = selenium.getText("//*[@id=\"sys1\"]");
+        long s1 = Long.valueOf(sysmi1);
+        String sysmi2 = selenium.getText("//*[@id=\"sys2\"]");
+        long s2 = Long.valueOf(sysmi2);
+        boolean real = (s2 - s1 > 0) ? true : false;
+        Assert.assertEquals(true, real);
+
+    }
+
+    @Test
+    public void testInterceptorB() throws Exception {
+        selenium.open("/interceptor/");
+        selenium.type("NumberValue", "-0.9");
+        selenium.click("operation");
+        selenium.waitForPageToLoad("30000");
+        Assert.assertEquals("Invalid", selenium.getText("//*[@id=\"intcpt1\"]"));
+        Assert.assertEquals("Valid", selenium.getText("//*[@id=\"intcpt2\"]"));
+        String sysmi1 = selenium.getText("//*[@id=\"sys1\"]");
+        long s1 = Long.valueOf(sysmi1);
+        String sysmi2 = selenium.getText("//*[@id=\"sys2\"]");
+        long s2 = Long.valueOf(sysmi2);
+        boolean real = (s2 - s1 > 0) ? true : false;
+        Assert.assertEquals(true, real);
+
+    }
+
+    @Test
+    public void testTimeoutInterceptor() throws Exception {
+        selenium.open("/interceptor/");
+        selenium.click("checkAroundTimeout");
+        selenium.waitForPageToLoad("30000");
+        Assert.assertEquals("@AroundTimeout invoked!", selenium.getText("//*[@id=\"outputRes\"]"));
+    }
+
+    @Test
+    public void testInterceptorBinding() throws Exception {
+        selenium.open("/interceptor/");
+        selenium.click("checkIntcptBind");
+        selenium.waitForPageToLoad("30000");
+        Assert.assertEquals("invoke @Interceptor, @InterceptorBinding!", selenium.getText("//*[@id=\"intcptBind\"]"));
+    }
 }
-



Mime
View raw message