continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1548101 - in /continuum/branches/CONTINUUM-2713: continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/ continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/ continuum-webapp/src/main/webapp/WEB-INF/jsp/
Date Thu, 05 Dec 2013 12:00:07 GMT
Author: brett
Date: Thu Dec  5 12:00:07 2013
New Revision: 1548101

URL: http://svn.apache.org/r1548101
Log:
[CONTINUUM-2713] remove DMI from Maven 1

Add another test for adding from the project group page

Modified:
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java?rev=1548101&r1=1548100&r2=1548101&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
Thu Dec  5 12:00:07 2013
@@ -81,6 +81,18 @@ public class MavenOneProjectTest
         removeProjectGroup( projectGroupName, false );
     }
 
+    public void testAddMavenOneProjectToProjectGroup()
+        throws Exception
+    {
+        goToProjectGroupsSummaryPage();
+        String defaultProjectGroupName = getProperty( "DEFAULT_PROJECT_GROUP_NAME" );
+        clickLinkWithText( defaultProjectGroupName );
+        selectValue( "preferredExecutor", "Add M1 Project" );
+        clickButtonWithValue( "Add" );
+        assertAddMavenOneProjectPage( defaultProjectGroupName );
+        // rest is tested by other methods
+    }
+
     public void testAddMavenOneProjectWithNoDefaultBuildDefinitionFromTemplate()
         throws Exception
     {

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1548101&r1=1548100&r2=1548101&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
Thu Dec  5 12:00:07 2013
@@ -631,7 +631,12 @@ public abstract class AbstractContinuumT
         assertAddMavenOneProjectPage();
     }
 
-    void assertAddMavenOneProjectPage()
+    protected void assertAddMavenOneProjectPage()
+    {
+        assertAddMavenOneProjectPage( null );
+    }
+
+    protected void assertAddMavenOneProjectPage( String existingProjectGroup )
     {
         assertPage( "Continuum - Add Maven 1 Project" );
         assertTextPresent( "Add Maven 1.x Project" );
@@ -646,7 +651,14 @@ public abstract class AbstractContinuumT
         assertElementPresent( "m1PomFile" );
         assertTextPresent( "Project Group" );
         assertElementPresent( "selectedProjectGroup" );
-        assertOptionPresent( "selectedProjectGroup", new String[]{"Defined by POM", "Default
Project Group"} );
+        if ( existingProjectGroup == null )
+        {
+            assertOptionPresent( "selectedProjectGroup", new String[]{"Defined by POM", "Default
Project Group"} );
+        }
+        else
+        {
+            assert existingProjectGroup.equals( getFieldValue( "projectGroupName" ) );
+        }
         assertTextPresent( "Build Definition Template" );
         assertElementPresent( "buildDefinitionTemplateId" );
         assertOptionPresent( "buildDefinitionTemplateId",

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp?rev=1548101&r1=1548100&r2=1548101&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp/src/main/webapp/WEB-INF/jsp/projectGroupSummary.jsp
Thu Dec  5 12:00:07 2013
@@ -33,7 +33,7 @@
     <script type="text/javascript">
 
       <c:url var="addM2ProjectUrl" value="/addMavenTwoProjectInput.action" />
-      <c:url var="addM1ProjectUrl" value="/addMavenOneProjectInput!input.action" />
+      <c:url var="addM1ProjectUrl" value="/addMavenOneProjectInput.action" />
       <c:url var="addProjectUrl" value="/addProjectInput.action" />
 
       function goToAddProject()



Mime
View raw message