Return-Path: 
 <scm-return-32810-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 77165 invoked from network); 16 Oct 2008 23:00:00 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 16 Oct 2008 23:00:00 -0000
Received: (qmail 23723 invoked by uid 500); 16 Oct 2008 23:00:01 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 23677 invoked by uid 500); 16 Oct 2008 23:00:01 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 23664 invoked by uid 99); 16 Oct 2008 23:00:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2008 16:00:01 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 16 Oct 2008 22:59:01 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 91D1D2388855; Thu, 16 Oct 2008 15:59:39 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r705395 - in
 /geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite: eclipse/build.xml
 plugins/org.apache.geronimo.testsuite.v20/src/main/java/org/apache/geronimo/testsuite/v20/ui/EclipseUITest.java
Date: Thu, 16 Oct 2008 22:59:39 -0000
To: scm@geronimo.apache.org
From: mcconne@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20081016225939.91D1D2388855@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: mcconne
Date: Thu Oct 16 15:59:39 2008
New Revision: 705395

URL: http://svn.apache.org/viewvc?rev=705395&view=rev
Log:
Support only one branding testcase across all servers in the testsuite

Modified:
    geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml
    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

Modified: geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml
URL: http://svn.apache.org/viewvc/geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml?rev=705395&r1=705394&r2=705395&view=diff
==============================================================================
--- geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml (original)
+++ geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/eclipse/build.xml Thu Oct 16 15:59:39 2008
@@ -271,10 +271,10 @@
         </copy>
     </target>
 
-    <target name="gep-features" depends="init" description="Unzip the GEP feature(s) into the test_eclipse installation">
+    <target name="gep-features" depends="init" description="Unzip the GEP latest feature to the launcher Eclipse features directory">
         <!--
         |  
-        | Unzip the GEP feature(s) to the launcher Eclipse features directory (for branding testcases)
+        | Unzip the GEP latest feature to the launcher Eclipse features directory (for one branding testcase)
         |  
         -->
         <mkdir dir="${test_eclipse}"/>

Modified: 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=705395&r1=705394&r2=705395&view=diff
==============================================================================
--- 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 (original)
+++ 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 Thu Oct 16 15:59:39 2008
@@ -45,18 +45,6 @@
     {
         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)