geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tki...@apache.org
Subject svn commit: r702577 - in /geronimo/devtools/eclipse-plugin/branches/2.1.4: ./ testsuite/plugins/org.apache.geronimo.testsuite.common/ testsuite/plugins/org.apache.geronimo.testsuite.v20/ testsuite/plugins/org.apache.geronimo.testsuite.v21/ testsuite/pl...
Date Tue, 07 Oct 2008 18:33:46 GMT
Author: tkirby
Date: Tue Oct  7 11:33:46 2008
New Revision: 702577

URL: http://svn.apache.org/viewvc?rev=702577&view=rev
Log:
GERONIMODEVTOOLS-437. Changes to ant script so the build will fail when Abbot testcases fail

Added:
    geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.common/library.xml
      - copied unchanged from r701213, geronimo/devtools/eclipse-plugin/trunk/testsuite/plugins/org.apache.geronimo.testsuite.common/library.xml
Modified:
    geronimo/devtools/eclipse-plugin/branches/2.1.4/   (props changed)
    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/src/main/java/org/apache/geronimo/testsuite/v21/ui/NewServerTest.java
    geronimo/devtools/eclipse-plugin/branches/2.1.4/testsuite/plugins/org.apache.geronimo.testsuite.v21/test.xml

Propchange: geronimo/devtools/eclipse-plugin/branches/2.1.4/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Oct  7 11:33:46 2008
@@ -1 +1 @@
-/geronimo/devtools/eclipse-plugin/trunk:700249
+/geronimo/devtools/eclipse-plugin/trunk:700249-701213

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=702577&r1=702576&r2=702577&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
Tue Oct  7 11:33:46 2008
@@ -26,7 +26,7 @@
     <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.eclipse.test/library.xml"/>
+              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 -->

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=702577&r1=702576&r2=702577&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
Tue Oct  7 11:33:46 2008
@@ -43,6 +43,7 @@
 
     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
@@ -53,8 +54,6 @@
             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);
-            nextNextShell = aHelper.clickButton(nextShell, "&Columns...","Configure Columns");
-            aHelper.clickButton(nextNextShell, IDialogConstants.OK_LABEL);
             aHelper.clickButton(nextShell, IDialogConstants.OK_LABEL);
             aHelper.clickButton(newShell, IDialogConstants.OK_LABEL);
 
@@ -74,10 +73,13 @@
             //aHelper.waitForDialogDisposal(nextShell);
             aHelper.clickButton(newShell, "&Next");
             //aHelper.clickItem(newShell, "Geronimo v2.1 Server Adapter");*/
+
+            success = true;
         }
         catch(Exception e)
         {
             e.printStackTrace();
         }
+        assertTrue (success);
     }
 }

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/NewServerTest.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/NewServerTest.java?rev=702577&r1=702576&r2=702577&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/NewServerTest.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/NewServerTest.java
Tue Oct  7 11:33:46 2008
@@ -54,21 +54,17 @@
             workbenchShell = WorkbenchUtilities.getWorkbenchWindow().getShell();
             aHelper = new AbbotHelper (workbenchShell);
 
-
             ServerTasks serverTasks = new ServerTasks(workbenchShell, aHelper, Constants.SERVER_V21
);
             WorkbenchTasks workbenchTasks = new WorkbenchTasks(workbenchShell, aHelper);
             
             // so we are sure that we are looking in the desired perspective
             workbenchTasks.showJEEPerspective();
        		
-
-
             // create server from an installed instance
             serverTasks.createServer();
 
             serverTasks.startServer();
 
-            
             EclipseSelenium selenium = new EclipseSelenium();
         	selenium.start();
             
@@ -77,15 +73,13 @@
             selenium.type("j_username", "system");
             selenium.type("j_password", "manager");
             selenium.click("submit");
-            
-            
+
             serverTasks.stopServer();
 
             // remove the server 
             serverTasks.removeServer();
-            
-            selenium.stop();
 
+            selenium.stop();
 
             success = true;
         }
@@ -94,5 +88,4 @@
         }
         assertTrue (success);
     }
-
 }

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=702577&r1=702576&r2=702577&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
Tue Oct  7 11:33:46 2008
@@ -26,7 +26,7 @@
     <property name="eclipse-home" value="${basedir}\..\.."/>
     <property name="plugin-name" value="org.apache.geronimo.testsuite.v21"/>
     <property name="library-file"
-              value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
+              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 -->



Mime
View raw message