On Wed, Apr 27, 2011 at 12:23 PM, Brett Porter <[email protected]> wrote:
> > On 26/04/2011, at 5:18 PM, [email protected] wrote: > > > > > Modified: > continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties > > URL: > http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties?rev=1096681&r1=1096680&r2=1096681&view=diff > > > ============================================================================== > > --- > continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties > (original) > > +++ > continuum/trunk/continuum-webapp-test/src/test/resources/testng.properties > Tue Apr 26 07:18:48 2011 > > @@ -319,8 +319,8 @@ PROJECTUSER_DEFAULTPROJECTGROUP_FULLNAME > > ######################## > > BUILD_AGENT_NAME2=http://localhost:9595/continuum-buildagent/xmlrpc > > BUILD_AGENT_DESCRIPTION2=Agent_description2 > > -BUILD_AGENT_NAME=http://localhost:9595 > > +BUILD_AGENT_NAME=http://localhost:9090 > > BUILD_AGENT_DESCRIPTION=Agent_description > > -BUILD_AGENT_NAME3=http://localhost:9595/xmlrpc > > +BUILD_AGENT_NAME3=http://localhost:9191/xmlrpc > > BUILD_AGENT_DESCRIPTION3=Agent_description3 > > BUILD_AGENT_GROUPNAME=agent_groupname > > port change intentional? > Yes. > > > > > > Modified: > continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java > > URL: > http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java?rev=1096681&r1=1096680&r2=1096681&view=diff > > > ============================================================================== > > --- > continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java > (original) > > +++ > continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java > Tue Apr 26 07:18:48 2011 > > @@ -199,12 +199,12 @@ public class MavenOneProjectTest > > clickLinkWithXPath( > "//tbody/tr['0']/td['10']/a/img[@alt='Delete']" ); > > assertTextPresent( "Delete Continuum Project" ); > > clickButtonWithValue( "Delete" ); > > - assertPage( "Continuum - Project Group" ); > > - assertLinkNotPresent( M1_PROJ_GRP_NAME ); > > + assertProjectGroupsSummaryPage(); > > + clickLinkWithText( M1_PROJ_GRP_NAME ); > > > > // remove group for next test > > removeProjectGroup( M1_PROJ_GRP_NAME ); > > - > > + /* > > // delete project - "Delete Project(s)" button > > addMaven1Project( M1_PROJ_GRP_NAME ); > > clickLinkWithText( M1_PROJ_GRP_NAME ); > > @@ -218,7 +218,7 @@ public class MavenOneProjectTest > > if ( !isExisting ) > > { > > removeProjectGroup( M1_PROJ_GRP_NAME ); > > - } > > + }*/ > > } > > why is this commented out (same in Maven 2)? > I commented it out for the meantime because it's failing due to another problem which I fixed in the succeeding commit > > > > Added: > continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/RegexPatternConstants.java > > URL: > http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/RegexPatternConstants.java?rev=1096681&view=auto > > > ============================================================================== > > --- > continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/RegexPatternConstants.java > (added) > > +++ > continuum/trunk/continuum-webapp/src/main/java/org/apache/continuum/web/util/RegexPatternConstants.java > Tue Apr 26 07:18:48 2011 > > @@ -0,0 +1,15 @@ > > +package org.apache.continuum.web.util; > > + > > +public class RegexPatternConstants > > +{ > > + public static final String NAME_REGEX = "[a-zA-Z0-9\\s_.:-]*"; > > + > > + public static final String GROUP_ID_REGEX = "[a-zA-Z0-9.\\s]*"; > > + > > + public static final String VERSION_REGEX = "[a-zA-Z0-9.-]*"; > > + > > + public static final String SCM_URL_REGEX = > "[a-zA-Z0-9_.:${}#~=@\\\\/|\\[\\]-]*"; > > + > > + public static final String DESCRIPTION_REGEX = "[a-zA-Z0-9\\s_.-]*"; > > + > > +} > > License file missing... > > Aren't there existing validators for URLs? How does the name/description > regex deal with internationalisation? It seems very restrictive - > descriptions could contain <> and just need to be escaped... > > Ok, will check this again. Thanks! -- Marica > - Brett > > -- > Brett Porter > [email protected] > http://brettporter.wordpress.com/ > >
