You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by mc...@apache.org on 2008/10/16 01:23:57 UTC
svn commit: r705096 - in
/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins:
org.apache.geronimo.testsuite.v20/
org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/
org.apache.geronimo.testsuite.v21/ org...
Author: mcconne
Date: Wed Oct 15 16:23:57 2008
New Revision: 705096
URL: http://svn.apache.org/viewvc?rev=705096&view=rev
Log:
Synchronize v20 and v21 testsuites before applying any more testsuite patches
Added:
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java (with props)
Modified:
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java
geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml
Added: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java?rev=705096&view=auto
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java (added)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java Wed Oct 15 16:23:57 2008
@@ -0,0 +1,68 @@
+/*
+ * 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.
+ */
+package org.apache.geronimo.testsuite.v20.ui;
+
+import org.apache.geronimo.testsuite.common.ui.AbbotHelper;
+import org.eclipse.jface.dialogs.IDialogConstants;
+import org.eclipse.swt.widgets.Shell;
+
+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;
+
+/*
+ * @version $Rev$ $Date$
+ */
+public class EclipseUITest extends WorkbenchTestCase {
+ Shell aShell;
+ AbbotHelper aHelper;
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ Preferences.setPerspectiveSwitchPrompt(Mode.Always);
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ }
+
+ public void testEclipseUI()
+ {
+ boolean success = false;
+ try {
+ // About Eclipse Test Case. There are three Shell newShell, nextShell and nextNextShell
+ //used because we need to save the states for newShell and nextShell
+ //newShell->nextShell->nextNextShell this is the order in which shell comes up
+ aShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
+ aHelper = new AbbotHelper(aShell);
+ Shell newShell = aHelper.clickMenuItem(aShell, new String[]{"&Help","&About Eclipse Platform"},"About Eclipse Platform");
+ Shell nextShell = aHelper.clickImageButton(newShell, "Apache.org - Geronimo v21 Server Tools Core Plug-in","About Eclipse Platform Features");
+ Shell nextNextShell = aHelper.clickButton(nextShell, "&Plug-in Details", "Feature Plug-ins");
+ aHelper.clickButton(nextNextShell, IDialogConstants.OK_LABEL);
+ aHelper.clickButton(nextShell, IDialogConstants.OK_LABEL);
+ aHelper.clickButton(newShell, IDialogConstants.OK_LABEL);
+
+ success = true;
+ }
+ catch(Exception e)
+ {
+ e.printStackTrace();
+ }
+ assertTrue (success);
+ }
+}
Propchange: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml?rev=705096&r1=705095&r2=705096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v20/test.xml Wed Oct 15 16:23:57 2008
@@ -1,120 +1,134 @@
-<?xml version="1.0"?>
-<!--
- ~ 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: 679174 $ $Date: 2008-07-23 12:52:55 -0700 (Wed, 23 Jul 2008) $ -->
-
-<project name="testsuite" default="run" basedir=".">
-
- <!-- sets the properties eclipse-home, and library-file -->
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}\..\.."/>
- <property name="plugin-name" value="org.apache.geronimo.testsuite.v20"/>
- <property name="library-file"
- value="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.common/library.xml"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="jdt-folder"
- value="${eclipse-home}/jdt_folder"/>
- <delete dir="${jdt-folder}" quiet="true"/>
-
- <!--
- #########################################################################
- ## ##
- ## Extra permgen memory required for this testsuite ##
- ## ##
- #########################################################################
- -->
- <property name="extraVMargs" value="-XX:MaxPermSize=128m" />
- <echo message="######################################################" />
- <echo message="## " />
- <echo message="## extraVMargs: ${extraVMargs}" />
- <echo message="## " />
- <echo message="######################################################" />
-
- <!--
- #########################################################################
- ## ##
- ## Define new server testcase ##
- ## ##
- #########################################################################
- -->
- <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.v20.ui.NewServerTest"/>
- </ant>
-
- <!--
- #########################################################################
- ## ##
- ## Copy the testsuite.v20 resources required for the 5 minute tutorial ##
- ## ##
- #########################################################################
- -->
- <mkdir dir="${jdt-folder}/src"/>
- <copy todir="${jdt-folder}/src">
- <fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v20/src">
- <include name="**/*.java"/>
- <include name="**/*.jsp"/>
- </fileset>
- </copy>
-
- <!--
- #########################################################################
- ## ##
- ## 5 minute tutorial testcase ##
- ## ##
- #########################################################################
- -->
- <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.v20.ui.Tutorial5MinuteTest"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-
-</project>
+<?xml version="1.0"?>
+<!--
+ ~ 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: 679174 $ $Date: 2008-07-23 12:52:55 -0700 (Wed, 23 Jul 2008) $ -->
+
+<project name="testsuite" default="run" basedir=".">
+
+ <!-- sets the properties eclipse-home, and library-file -->
+ <!-- The property ${eclipse-home} should be passed into this script -->
+ <!-- Set a meaningful default value for when it is not. -->
+ <property name="eclipse-home" value="${basedir}\..\.."/>
+ <property name="plugin-name" value="org.apache.geronimo.testsuite.v20"/>
+ <property name="library-file"
+ value="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.common/library.xml"/>
+
+ <!-- This target holds all initialization code that needs to be done for -->
+ <!-- all tests that are to be run. Initialization for individual tests -->
+ <!-- should be done within the body of the suite target. -->
+ <target name="init">
+ <tstamp/>
+ <delete>
+ <fileset dir="${eclipse-home}" includes="org*.xml"/>
+ </delete>
+ </target>
+
+ <!-- This target defines the tests that need to be run. -->
+ <target name="suite">
+ <property name="jdt-folder"
+ value="${eclipse-home}/jdt_folder"/>
+ <delete dir="${jdt-folder}" quiet="true"/>
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Extra permgen memory required for this testsuite ##
+ ## ##
+ #########################################################################
+ -->
+ <property name="extraVMargs" value="-XX:MaxPermSize=128m" />
+ <echo message="######################################################" />
+ <echo message="## " />
+ <echo message="## extraVMargs: ${extraVMargs}" />
+ <echo message="## " />
+ <echo message="######################################################" />
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Check UI Installation testcase ##
+ ## ##
+ #########################################################################
+ -->
+ <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.v20.ui.EclipseUITest"/>
+ </ant>
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Define new server testcase ##
+ ## ##
+ #########################################################################
+ -->
+ <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.v20.ui.NewServerTest"/>
+ </ant>
+
+ <!--
+ #########################################################################
+ ## ##
+ ## Copy the testsuite.v20 resources required for the 5 minute tutorial ##
+ ## ##
+ #########################################################################
+ -->
+ <mkdir dir="${jdt-folder}/src"/>
+ <copy todir="${jdt-folder}/src">
+ <fileset dir="${eclipse-home}/../../../plugins/org.apache.geronimo.testsuite.v20/src">
+ <include name="**/*.java"/>
+ <include name="**/*.jsp"/>
+ </fileset>
+ </copy>
+
+ <!--
+ #########################################################################
+ ## ##
+ ## 5 minute tutorial testcase ##
+ ## ##
+ #########################################################################
+ -->
+ <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.v20.ui.Tutorial5MinuteTest"/>
+ </ant>
+ </target>
+
+ <!-- This target holds code to cleanup the testing environment after -->
+ <!-- after all of the tests have been run. You can use this target to -->
+ <!-- delete temporary files that have been created. -->
+ <target name="cleanup">
+ </target>
+
+ <!-- This target runs the test suite. Any actions that need to happen -->
+ <!-- after all the tests have been run should go here. -->
+ <target name="run" depends="init,suite,cleanup">
+ <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
+ <property name="includes" value="org*.xml"/>
+ <property name="output-file" value="${plugin-name}.xml"/>
+ </ant>
+ </target>
+
+</project>
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/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/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java?rev=705096&r1=705095&r2=705096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/src/main/java/org/apache/geronimo/testsuite/v21/ui/EclipseUITest.java Wed Oct 15 16:23:57 2008
@@ -57,23 +57,6 @@
aHelper.clickButton(nextShell, IDialogConstants.OK_LABEL);
aHelper.clickButton(newShell, IDialogConstants.OK_LABEL);
- // Install GEP from Staging Site Test Case
-
- /*newShell=aHelper.clickMenuItem(aShell, new String[]{"&Help","&Software Updates..."},"Software Updates and Add-ons");
- aHelper.selectTabItem(newShell,"A&vailable Software");
- nextShell=aHelper.clickButton(newShell, "&Add Site...", "Add Site");
- aHelper.setTextField(nextShell, "http://", "http://apache.org/dist/geronimo/eclipse/updates/");
- aHelper.clickButton(nextShell,"OK");
- aHelper.waitTime(25000);
- aHelper.clickTreeItem(newShell, new String[] {"http://apache.org/dist/geronimo/eclipse/updates/"});
- aHelper.waitTime(10000);
- aHelper.checkTreeItem(newShell, new String[] {"http://apache.org/dist/geronimo/eclipse/updates/", "Geronimo WTP Server Adapters", "Geronimo v2.1 Server Adapter"});
- aHelper.clickButton(newShell, "&Install...");
- aHelper.waitTime(30000);
- //aHelper.waitForDialogDisposal(nextShell);
- aHelper.clickButton(newShell, "&Next");
- //aHelper.clickItem(newShell, "Geronimo v2.1 Server Adapter");*/
-
success = true;
}
catch(Exception e)
Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml?rev=705096&r1=705095&r2=705096&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml Wed Oct 15 16:23:57 2008
@@ -66,10 +66,10 @@
#########################################################################
-->
<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"/>
+ <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>
<!--