Apache
/
archiva
mirror of https://github.com/apache/archiva.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make unit test able to run on path with space. Warn dev to relocate. 

Verify that Validator will fail with a space in reponame.

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1370368 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
skygo 2012-08-07 17:04:26 +00:00
parent a1c611039f
commit 729f7da56e
2 changed files with 56 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/AbstractRepositoryAdminTest.java
View File

@ -51,7 +51,7 @@ public abstract class AbstractRepositoryAdminTest
{
protected Logger log = LoggerFactory.getLogger( getClass() );
public static final String APPSERVER_BASE_PATH = System.getProperty( "appserver.base" );
public static final String APPSERVER_BASE_PATH = AbstractRepositoryAdminTest.fixPath( System.getProperty( "appserver.base" ) );
@Inject
protected MockAuditListener mockAuditListener;
@ -73,7 +73,19 @@ public abstract class AbstractRepositoryAdminTest
AuditInformation auditInformation = new AuditInformation( getFakeUser(), "archiva-localhost" );
return auditInformation;
}
// make a nice repo path to allow unit test to run
private static String fixPath ( String path )
{
String SPACE = " ";
if ( path.contains( SPACE ) )
{
LoggerFactory.getLogger( AbstractRepositoryAdminTest.class.getName() ).error(
"You are building and testing with {appserver.base}: \n " + path + " containing space. Consider relocating." );
}
return path.replaceAll( SPACE, "&20");
}
protected User getFakeUser()
{
SimpleUser user = new SimpleUser()

42
archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/test/java/org/apache/archiva/admin/repository/ValidatorTest.java Normal file
View File

@ -0,0 +1,42 @@
package org.apache.archiva.admin.repository;
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
import org.apache.archiva.admin.model.managed.ManagedRepositoryAdmin;
import org.apache.archiva.test.utils.ArchivaSpringJUnit4ClassRunner;
import org.apache.commons.validator.GenericValidator;
import org.junit.Test;
import org.junit.runner.RunWith;
/**
* @author Eric Barboni
*/
@RunWith( ArchivaSpringJUnit4ClassRunner.class )
public class ValidatorTest
extends AbstractRepositoryAdminTest
{
@Test
public void testGenericValidator()
{
// Be sure M
assertFalse("A repo location cannot contains space",GenericValidator.matchRegexp( "/opt/ testme/",
ManagedRepositoryAdmin.REPOSITORY_LOCATION_VALID_EXPRESSION ));
}
}