You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/09/16 04:56:55 UTC
svn commit: r997576 - in /geronimo/devtools/eclipse-plugin/trunk/testsuite:
./ eclipse/ launcher/ plugins/org.apache.geronimo.testsuite.common/
plugins/org.apache.geronimo.testsuite.common/META-INF/
plugins/org.apache.geronimo.testsuite.common/src/main...
Author: delos
Date: Thu Sep 16 02:56:54 2010
New Revision: 997576
URL: http://svn.apache.org/viewvc?rev=997576&view=rev
Log:
GERONIMODEVTOOLS-637 commit fix for 30 testsuite
Removed:
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseBrowserLauncher.java
Modified:
geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/.classpath
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/WorkbenchTasks.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/.classpath
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/.classpath
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/Activator.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.classpath
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/.classpath
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/META-INF/MANIFEST.MF
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/test.xml
geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/eclipse/build.xml Thu Sep 16 02:56:54 2010
@@ -29,18 +29,19 @@
<project name="TestsuiteArtifacts">
<target name="init">
- <property name="helios_url" value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/M6"/>
- <property name="helios_jee_win32" value="eclipse-jee-helios-M6-win32.zip"/>
- <property name="helios_jee_linux" value="eclipse-jee-helios-M6-linux-gtk.tar"/>
- <property name="helios_jee_linux-x86_64" value="eclipse-jee-helios-M6-linux-gtk-x86_64.tar"/>
- <property name="helios_jee_macos" value="eclipse-jee-helios-M6-macosx-carbon.tar"/>
+ <property name="helios_url" value="http://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/R"/>
+ <property name="helios_jee_win32" value="eclipse-jee-helios-win32.zip"/>
+ <property name="helios_jee_win64" value="eclipse-jee-helios-win32_64.zip"/>
+ <property name="helios_jee_linux" value="eclipse-jee-helios-linux-gtk.tar"/>
+ <property name="helios_jee_linux-x86_64" value="eclipse-jee-helios-linux-gtk-x86_64.tar"/>
+ <property name="helios_jee_macos" value="eclipse-jee-helios-macosx-carbon.tar"/>
<property name="helios_jee_linux_gz" value="${helios_jee_linux}.gz"/>
<property name="helios_jee_linux-x86_64_gz" value="${helios_jee_linux-x86_64}.gz"/>
<property name="helios_jee_macos_gz" value="${helios_jee_macos}.gz"/>
<property name="test_eclipse" value="${basedir}/../launcher/eclipse/"/>
- <property name="test_framework_url" value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/S-3.6M6-201003121448/"/>
- <property name="test_framework" value="eclipse-test-framework-3.6M6.zip"/>
+ <property name="test_framework_url" value="http://www.eclipse.org/downloads/download.php?file=/eclipse/downloads/drops/R-3.6-201006080911/eclipse-test-framework-3.6.zip"/>
+ <property name="test_framework" value="eclipse-test-framework-3.6.zip"/>
<property name="abbot_swt_url" value="http://downloads.sourceforge.net/abbot"/>
@@ -172,7 +173,7 @@
<antcall target="gep-features"/>
</target>
- <target name="cleanup" depends="init" description="Cleanup from previous invocatins of the testsuite">
+ <target name="cleanup" depends="init" description="Cleanup from previous invocations of the testsuite">
<!--
##############################################################################################
## ##
@@ -192,12 +193,14 @@
<echo>## From: ${test_framework_url} </echo>
<echo>## </echo>
<echo>#################################################################################</echo>
+
<mkdir dir="${LOCAL_M2_REPO}/eclipse-downloads"/>
<get src="${test_framework_url}/${test_framework}${protocol}"
dest="${LOCAL_M2_REPO}/eclipse-downloads/${test_framework}"
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
+
<echo>#################################################################################</echo>
<echo>## </echo>
<echo>## Unzipping: ${test_framework} </echo>
@@ -225,6 +228,49 @@
verbose="true"
ignoreerrors="true"
usetimestamp="true"/>
+
+ <!--
+ Replace the MANIFEST.MF files of abbot.swt and abbot.swt.eclipse with new MF files in which
+ the junit version is 4.8.1
+ -->
+
+ <mkdir dir="${basedir}/temp"/>
+ <unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
+ dest="${basedir}/temp"/>
+
+ <mkdir dir="${basedir}/temp/plugins/abbot.swt.temp"/>
+ <unzip src="${basedir}/temp/plugins/abbot.swt_${abbot_swt_version}.jar"
+ dest="${basedir}/temp/plugins/abbot.swt.temp"/>
+ <copy file="${basedir}/metadata_abbot_swt/MANIFEST.MF"
+ tofile="${basedir}/temp/plugins/abbot.swt.temp/META-INF/MANIFEST.MF"
+ overwrite="true"/>
+ <zip destfile="${basedir}/temp/plugins/abbot.swt_${abbot_swt_version}.jar"
+ basedir="${basedir}/temp/plugins/abbot.swt.temp"
+ includes="**"
+ update="true"/>
+
+ <mkdir dir="${basedir}/temp/plugins/abbot.swt.eclipse.temp"/>
+ <unzip src="${basedir}/temp/plugins/abbot.swt.eclipse_${abbot_swt_version}.jar"
+ dest="${basedir}/temp/plugins/abbot.swt.eclipse.temp"/>
+ <copy file="${basedir}/metadata_abbot_swt_eclipse/MANIFEST.MF"
+ tofile="${basedir}/temp/plugins/abbot.swt.eclipse.temp/META-INF/MANIFEST.MF"
+ overwrite="true"/>
+ <zip destfile="${basedir}/temp/plugins/abbot.swt.eclipse_${abbot_swt_version}.jar"
+ basedir="${basedir}/temp/plugins/abbot.swt.eclipse.temp"
+ includes="**"
+ update="true"/>
+
+ <delete dir="${basedir}/temp/plugins/abbot.swt.temp"/>
+ <delete dir="${basedir}/temp/plugins/abbot.swt.eclipse.temp"/>
+
+ <zip destfile="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
+ basedir="${basedir}/temp"
+ includes="**"
+ update="true"/>
+
+ <delete dir="${basedir}/temp"/>
+
+
<echo>#################################################################################</echo>
<echo>## </echo>
<echo>## Unzipping: ${abbot_swt} </echo>
@@ -236,6 +282,7 @@
<unzip src="${LOCAL_M2_REPO}/eclipse-downloads/${abbot_swt}"
dest="${test_eclipse}eclipse"
overwrite="true"/>
+
<!--
|
| Copy the SWT jars to the local maven repo
@@ -262,6 +309,7 @@
failonerror="true" />
</target>
+
<target name="gep-plugins" depends="init" description="Copy the GEP plugin(s) into the test_eclipse installation">
<!--
|
@@ -270,7 +318,16 @@
-->
<mkdir dir="${test_eclipse}"/>
<copy todir="${test_eclipse}eclipse/plugins">
- <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jee.v21.jaxbmodel/${gep_version}">
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jaxbmodel.common/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.j2ee.v11.jaxbmodel/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.jee.v21.jaxbmodel/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v30.jaxbmodel/${gep_version}">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.common/${gep_version}">
@@ -288,6 +345,9 @@
<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.v20/${gep_version}">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.runtime.v11/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.core/${gep_version}">
<include name="**/*.jar"/>
</fileset>
@@ -321,6 +381,15 @@
<fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v20.ui/${gep_version}">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.core/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.schemas/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <fileset dir="${LOCAL_M2_REPO}/org/apache/geronimo/devtools/org.apache.geronimo.st.v11.ui/${gep_version}">
+ <include name="**/*.jar"/>
+ </fileset>
</copy>
</target>
@@ -335,5 +404,5 @@
dest="${test_eclipse}eclipse/features/org.apache.geronimo.v30.feature_${gep_version}"
overwrite="true"/>
</target>
-
+
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/build.xml Thu Sep 16 02:56:54 2010
@@ -33,6 +33,9 @@
|
-->
<target name="init">
+ <!-- Prompt to install aries tools manually -->
+ <input message="Please install aries tools manually and then press Enter to continue..."/>
+
<property name="eclipse-home" value="eclipse"/>
<copy tofile="${eclipse-home}/eclipse/plugins/org.eclipse.equinox.launcher.jar">
<fileset dir="${eclipse-home}/eclipse/plugins"
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/launcher/testsuite.xml Thu Sep 16 02:56:54 2010
@@ -43,7 +43,7 @@
</macrodef>
<target name="junit">
- <ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}" />
+ <ant antfile="${eclipse-home}/plugins/${testPlugin}/test.xml" dir="${eclipse-home}"/>
<antcall target="genResults" />
</target>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/.classpath?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/.classpath Thu Sep 16 02:56:54 2010
@@ -1,29 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!-- @version $Rev$ $Date$ -->
-
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-beta-1/selenium-java-client-driver-1.0-beta-1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/server/selenium-server-coreless/1.0-beta-1/selenium-server-coreless-1.0-beta-1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/core/selenium-core/1.0-beta-1/selenium-core-1.0-beta-1.jar"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/server/selenium-server/1.0.3/selenium-server-1.0.3-standalone.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/META-INF/MANIFEST.MF Thu Sep 16 02:56:54 2010
@@ -22,7 +22,8 @@ Require-Bundle: abbot.swt;resolution:=op
org.eclipse.ui.editors,
org.eclipse.ui.forms,
org.eclipse.ui.ide,
- org.eclipse.ui.views
+ org.eclipse.ui.views,
+ org.junit;bundle-version="4.8.1"
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.geronimo.testsuite.common,
org.apache.geronimo.testsuite.common.selenium,
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/pom.xml Thu Sep 16 02:56:54 2010
@@ -76,22 +76,21 @@
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>unzip-common</id>
+ <id>unzip-selenium</id>
<phase>generate-resources</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
- <unzip src="${settings.localRepository}/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-beta-1/selenium-java-client-driver-1.0-beta-1.jar"
- dest="${project.build.directory}/classes"/>
- <unzip src="${settings.localRepository}/org/openqa/selenium/server/selenium-server/1.0-beta-1/selenium-server-1.0-beta-1-standalone.jar"
+ <unzip src="${settings.localRepository}/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"/>
+ <unzip src="${settings.localRepository}/org/seleniumhq/selenium/server/selenium-server/1.0.3/selenium-server-1.0.3-standalone.jar"
dest="${project.build.directory}/classes"/>
</tasks>
</configuration>
</execution>
<execution>
- <id>unzip-selenium</id>
+ <id>unzip-common</id>
<phase>package</phase>
<goals>
<goal>run</goal>
@@ -176,20 +175,43 @@
<artifactId>abbot.swt.eclipse</artifactId>
</dependency>
- <dependency>
- <groupId>org.openqa.selenium.client-drivers</groupId>
- <artifactId>selenium-java-client-driver</artifactId>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server-coreless</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>org.openqa.selenium.server</groupId>
- <artifactId>selenium-server</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.openqa.selenium.core</groupId>
- <artifactId>selenium-core</artifactId>
- </dependency>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <classifier>standalone</classifier>
+ <version>1.0.3</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.server</groupId>
+ <artifactId>selenium-server-coreless</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.seleniumhq.selenium.core</groupId>
+ <artifactId>selenium-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/selenium/EclipseSeleniumServer.java Thu Sep 16 02:56:54 2010
@@ -17,16 +17,13 @@
package org.apache.geronimo.testsuite.common.selenium;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.Platform;
import org.eclipse.swt.widgets.Shell;
import org.openqa.selenium.server.SeleniumServer;
import org.openqa.selenium.server.browserlaunchers.BrowserLauncherFactory;
+import org.openqa.selenium.server.browserlaunchers.Firefox3Launcher;
/**
* EclipseSeleniumServer
@@ -64,8 +61,9 @@ public class EclipseSeleniumServer imple
public void run() throws Exception {
try {
- BrowserLauncherFactory.addBrowserLauncher("EclipseBrowser", EclipseBrowserLauncher.class);
- SeleniumServer.setDebugMode (true);
+ //BrowserLauncherFactory.addBrowserLauncher("EclipseBrowser", EclipseBrowserLauncher.class);
+ BrowserLauncherFactory.addBrowserLauncher("Firefox Browser", Firefox3Launcher.class);
+ //SeleniumServer.setDebugMode (true);
server = new SeleniumServer();
server.start();
} catch (Throwable th) {
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/ServerTasks.java Thu Sep 16 02:56:54 2010
@@ -89,7 +89,7 @@ public class ServerTasks {
try {
String serverDisplay = Constants.getConstant(serverVersion, Constants.SERVERDISPLAY);
abbotHelper.clickMenuItem (workbenchShell,
- new String[] {"&Window", "Show &View", "Servers"});
+ new String[] {"&Window", "Show View", "Servers"});
if (restart == true) {
abbotHelper.rightClickItem (workbenchShell, serverDisplay,
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/WorkbenchTasks.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/WorkbenchTasks.java?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/WorkbenchTasks.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/src/main/java/org/apache/geronimo/testsuite/common/ui/WorkbenchTasks.java Thu Sep 16 02:56:54 2010
@@ -38,7 +38,7 @@ public class WorkbenchTasks {
Shell perspectiveShell = abbotHelper.clickMenuItem (workbenchShell,
new String[] {"&Window", "&Open Perspective", "&Other..." },
"Open Perspective");
- abbotHelper.clickItem (perspectiveShell, "Java EE (default)");
+ abbotHelper.clickItem (perspectiveShell, "Java EE");
abbotHelper.clickButton (perspectiveShell, IDialogConstants.OK_LABEL);
}
catch (Exception e) {
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/.classpath?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/.classpath Thu Sep 16 02:56:54 2010
@@ -1,27 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!-- @version $Rev$ $Date$ -->
-
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-beta-1/selenium-java-client-driver-1.0-beta-1.jar"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/META-INF/MANIFEST.MF?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v20/META-INF/MANIFEST.MF Thu Sep 16 02:56:54 2010
@@ -24,7 +24,7 @@ Require-Bundle: abbot.swt,
org.eclipse.ui.forms,
org.eclipse.ui.ide,
org.eclipse.ui.views,
- org.apache.geronimo.testsuite.common
+ org.apache.geronimo.testsuite.common,
+ org.junit;bundle-version="4.8.1"
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.geronimo.testsuite.v20
-Import-Package: junit.framework;version="3.8.2"
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/.classpath?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/.classpath Thu Sep 16 02:56:54 2010
@@ -1,27 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!-- @version $Rev$ $Date$ -->
-
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-beta-1/selenium-java-client-driver-1.0-beta-1.jar"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/META-INF/MANIFEST.MF?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/META-INF/MANIFEST.MF Thu Sep 16 02:56:54 2010
@@ -24,7 +24,7 @@ Require-Bundle: abbot.swt,
org.eclipse.ui.forms,
org.eclipse.ui.ide,
org.eclipse.ui.views,
- org.apache.geronimo.testsuite.common
+ org.apache.geronimo.testsuite.common,
+ org.junit;bundle-version="4.8.1"
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.geronimo.testsuite.v21
-Import-Package: junit.framework;version="3.8.2"
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/Activator.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/Activator.java?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/Activator.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/Activator.java Thu Sep 16 02:56:54 2010
@@ -59,6 +59,7 @@ public class Activator extends Plugin {
AbbotHelper aHelper = new AbbotHelper (workbenchShell);
seleniumServer = new EclipseSeleniumServer(aHelper, workbenchShell);
try {
+ System.out.println("--------------------");
SafeRunner.run( seleniumServer );
Thread.sleep(5000);
// new Exception("sdsfsdf").printStackTrace();
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java Thu Sep 16 02:56:54 2010
@@ -17,12 +17,13 @@
package org.apache.geronimo.testsuite.v21.ui;
import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
-import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.swt.widgets.Shell;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import abbot.swt.eclipse.junit.extensions.WorkbenchTestCase;
import abbot.swt.eclipse.utils.Preferences;
-import abbot.swt.eclipse.utils.WorkbenchUtilities;
import abbot.swt.eclipse.utils.Preferences.Mode;
/*
@@ -32,6 +33,10 @@ public class EclipseUITest extends Workb
Shell aShell;
AbbotHelper aHelper;
+ public EclipseUITest(){
+ super();
+ }
+
protected void setUp() throws Exception {
super.setUp();
Preferences.setPerspectiveSwitchPrompt(Mode.Always);
@@ -41,6 +46,7 @@ public class EclipseUITest extends Workb
super.tearDown();
}
+ @Test()
public void testEclipseUI()
{
boolean success = false;
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml Thu Sep 16 02:56:54 2010
@@ -78,12 +78,12 @@
## ##
#########################################################################
-->
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <!--ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jdt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname"
value="org.apache.geronimo.testsuite.v21.ui.EclipseUITest"/>
- </ant>
+ </ant-->
<!--
@@ -93,12 +93,12 @@
## ##
#########################################################################
-->
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <!--ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jdt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname"
value="org.apache.geronimo.testsuite.v21.ui.RunOnServerTest"/>
- </ant>
+ </ant-->
<!--
@@ -108,12 +108,12 @@
## ##
#########################################################################
-->
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <!--ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jdt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname"
value="org.apache.geronimo.testsuite.v21.ui.SharedLibPojoTest"/>
- </ant>
+ </ant-->
<!--
@@ -138,12 +138,12 @@
## ##
#########################################################################
-->
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <!--ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jdt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname"
value="org.apache.geronimo.testsuite.v21.ui.Tutorial5MinuteTest"/>
- </ant>
+ </ant-->
</target>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.classpath?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/.classpath Thu Sep 16 02:56:54 2010
@@ -22,6 +22,6 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-beta-1/selenium-java-client-driver-1.0-beta-1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v22/META-INF/MANIFEST.MF Thu Sep 16 02:56:54 2010
@@ -24,7 +24,7 @@ Require-Bundle: abbot.swt,
org.eclipse.ui.forms,
org.eclipse.ui.ide,
org.eclipse.ui.views,
- org.apache.geronimo.testsuite.common
+ org.apache.geronimo.testsuite.common,
+ org.junit;bundle-version="4.8.1"
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.geronimo.testsuite.v22
-Import-Package: junit.framework;version="3.8.2"
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/.classpath
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/.classpath?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/.classpath (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/.classpath Thu Sep 16 02:56:54 2010
@@ -1,27 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<!-- @version $Rev$ $Date$ -->
-
<classpath>
- <classpathentry kind="src" path="src/main/java"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="var" path="M2_REPO/org/openqa/selenium/client-drivers/selenium-java-client-driver/1.0-beta-1/selenium-java-client-driver-1.0-beta-1.jar"/>
- <classpathentry kind="output" path="target/classes"/>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="var" path="M2_REPO/org/seleniumhq/selenium/client-drivers/selenium-java-client-driver/1.0.2/selenium-java-client-driver-1.0.2.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/META-INF/MANIFEST.MF?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/META-INF/MANIFEST.MF (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/META-INF/MANIFEST.MF Thu Sep 16 02:56:54 2010
@@ -24,7 +24,7 @@ Require-Bundle: abbot.swt,
org.eclipse.ui.forms,
org.eclipse.ui.ide,
org.eclipse.ui.views,
- org.apache.geronimo.testsuite.common
+ org.apache.geronimo.testsuite.common,
+ org.junit;bundle-version="4.8.1"
Bundle-ActivationPolicy: lazy
Export-Package: org.apache.geronimo.testsuite.v30
-Import-Package: junit.framework;version="3.8.2"
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/pom.xml Thu Sep 16 02:56:54 2010
@@ -42,6 +42,7 @@
<include>test.xml</include>
<include>plugin.xml</include>
<include>plugin.properties</include>
+ <include>install.xml</include>
</includes>
</resource>
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/test.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.v30/test.xml Thu Sep 16 02:56:54 2010
@@ -54,7 +54,6 @@
-->
<property name="extraVMargs" value="-XX:MaxPermSize=128m" />
-
<!--
#########################################################################
## ##
@@ -65,8 +64,7 @@
<mkdir dir="${jdt-folder}/src"/>
<copy todir="${jdt-folder}/src">
<fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v30/src">
- <include name="**/*.java"/>
- <include name="**/*.jsp"/>
+ <include name="**/*"/>
</fileset>
</copy>
@@ -78,13 +76,91 @@
## ##
#########################################################################
-->
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <!--ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
<property name="data-dir" value="${jdt-folder}"/>
<property name="plugin-name" value="${plugin-name}"/>
<property name="classname"
value="org.apache.geronimo.testsuite.v30.ui.EclipseUITest"/>
+ </ant-->
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Run all aries test case ##
+ ## ##
+ #########################################################################
+ -->
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.NewOSGiBundleTest"/>
</ant>
-
+ <!--
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.NewOSGiCompositeBundleTest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.ImportBundleTest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.ImportEBATest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.ImportCBATest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.ExportBundleTest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.ExportEBATest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.ExportCBATest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.Tutorial5MinuteTest"/>
+ </ant>
+
+ <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="data-dir" value="${jdt-folder}"/>
+ <property name="plugin-name" value="${plugin-name}"/>
+ <property name="classname"
+ value="org.apache.geronimo.testsuite.v30.ui.aries.DownloadsTest"/>
+ </ant>
+ -->
</target>
<!-- This target holds code to cleanup the testing environment after -->
Modified: geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml?rev=997576&r1=997575&r2=997576&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml (original)
+++ geronimo/devtools/eclipse-plugin/trunk/testsuite/pom.xml Thu Sep 16 02:56:54 2010
@@ -39,7 +39,7 @@
</description>
<properties>
- <geronimoVersion_1>3.0_M1-SNAPSHOT</geronimoVersion_1>
+ <geronimoVersion_1>3.0-SNAPSHOT</geronimoVersion_1>
<geronimoVersion_2>2.2.1-SNAPSHOT</geronimoVersion_2>
<geronimoVersion_3>2.1.4</geronimoVersion_3>
<geronimoVersion_4>2.0.2</geronimoVersion_4>