Return-Path: Delivered-To: apmail-continuum-commits-archive@www.apache.org Received: (qmail 27726 invoked from network); 1 Sep 2009 10:49:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 1 Sep 2009 10:49:31 -0000 Received: (qmail 26565 invoked by uid 500); 1 Sep 2009 10:49:31 -0000 Delivered-To: apmail-continuum-commits-archive@continuum.apache.org Received: (qmail 26507 invoked by uid 500); 1 Sep 2009 10:49:31 -0000 Mailing-List: contact commits-help@continuum.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@continuum.apache.org Delivered-To: mailing list commits@continuum.apache.org Received: (qmail 26498 invoked by uid 99); 1 Sep 2009 10:49:31 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 01 Sep 2009 10:49:31 +0000 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; Tue, 01 Sep 2009 10:49:29 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id BD012238889B; Tue, 1 Sep 2009 10:49:09 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r809964 - in /continuum/trunk/continuum-webapp/src: main/java/org/apache/maven/continuum/web/action/AddProjectAction.java test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java Date: Tue, 01 Sep 2009 10:49:09 -0000 To: commits@continuum.apache.org From: jzurbano@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090901104909.BD012238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jzurbano Date: Tue Sep 1 10:49:09 2009 New Revision: 809964 URL: http://svn.apache.org/viewvc?rev=809964&view=rev Log: [CONTINUUM-2347] - "Project Group is required and all projects must be in a project group" is displayed when adding Ant/Shell Projects merge r 809962:809963 from 1.3.x branch Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java Modified: continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java?rev=809964&r1=809963&r2=809964&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java (original) +++ continuum/trunk/continuum-webapp/src/main/java/org/apache/maven/continuum/web/action/AddProjectAction.java Tue Sep 1 10:49:09 2009 @@ -66,7 +66,7 @@ private Collection projectGroups; - private int selectedProjectGroup; + private static int selectedProjectGroup; private String projectGroupName; @@ -144,6 +144,11 @@ addActionError( authzE.getMessage() ); return REQUIRES_AUTHORIZATION; } + + if ( this.getSelectedProjectGroup() == 0 ) + { + return INPUT; + } String projectNameTrim = projectName.trim(); String versionTrim = projectVersion.trim(); @@ -221,6 +226,8 @@ } projectGroups = new ArrayList(); + + selectedProjectGroup = 0; Collection allProjectGroups = getContinuum().getAllProjectGroups(); Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java?rev=809964&r1=809963&r2=809964&view=diff ============================================================================== --- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java (original) +++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java Tue Sep 1 10:49:09 2009 @@ -20,11 +20,13 @@ */ import java.util.ArrayList; +import java.util.Collection; import java.util.List; import org.apache.maven.continuum.web.action.stub.AddProjectActionStub; import org.apache.maven.continuum.Continuum; import org.apache.maven.continuum.model.project.Project; +import org.apache.maven.continuum.model.project.ProjectGroup; import org.jmock.Mock; import org.jmock.MockObjectTestCase; @@ -45,6 +47,12 @@ action = new AddProjectActionStub(); continuumMock = new Mock( Continuum.class ); action.setContinuum( (Continuum) continuumMock.proxy() ); + + Collection projectGroups = new ArrayList(); + ProjectGroup projectGroup = new ProjectGroup(); + projectGroups.add( projectGroup ); + + action.setProjectGroups( projectGroups ); } public void testAddProjectNullValues() @@ -57,6 +65,30 @@ action.validate(); } + /** + * Test add of project with no project groups available + * + * @throws Exception + */ + public void testAddProjectNoProjectGroups() + throws Exception + { + Collection projectGroups = new ArrayList(); + + String scmUrl = "scm:svn:http://project/scm/url/test/build.xml"; + action.setProjectGroups( projectGroups ); + + List projects = createProjectList(); + + action.setProjectName( "Ant Test Project" ); + action.setProjectVersion( "1.0-SNAPSHOT" ); + action.setProjectScmUrl( scmUrl ); + action.setProjectType( "ant" ); + action.setBuildDefintionTemplateId( 1 ); + + assertEquals( action.add(), "input" ); + } + /** * Test add of Ant project *