You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/10/09 12:28:53 UTC
svn commit: r823505 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test:
java/org/apache/archiva/indexer/search/ resources/nexus-search-test-repo/com/
resources/nexus-search-test-repo/com/artifactid-numeric/
resources/nexus-search...
Author: oching
Date: Fri Oct 9 10:28:52 2009
New Revision: 823505
URL: http://svn.apache.org/viewvc?rev=823505&view=rev
Log:
[MRM-1254] Add more unit tests for searching artifacts
o added test for searching artifacts with numeric values in the artifactId using advanced search (MRM-981)
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java?rev=823505&r1=823504&r2=823505&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/java/org/apache/archiva/indexer/search/NexusRepositorySearchTest.java Fri Oct 9 10:28:52 2009
@@ -182,7 +182,7 @@
//TODO: search for class & package names
}
-
+
public void testQuickSearchWithPagination()
throws Exception
{
@@ -425,6 +425,41 @@
FileUtils.deleteDirectory( new File( getBasedir(), "/target/test-classes/" + TEST_REPO_2 + "/.indexer" ) );
assertFalse( new File( getBasedir(), "/target/test-classes/" + TEST_REPO_2 + "/.indexer" ).exists() );
}
+
+ // MRM-981 - artifactIds with numeric characters aren't found in advanced search
+ public void testAdvancedSearchArtifactIdHasNumericChar()
+ throws Exception
+ {
+ List<File> files = new ArrayList<File>();
+ files.add( new File( getBasedir(), "/target/test-classes/" + TEST_REPO_1 +
+ "/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar" ) );
+ files.add( new File( getBasedir(), "/target/test-classes/" + TEST_REPO_1 +
+ "/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar" ) );
+ createIndex( TEST_REPO_1, files );
+
+ List<String> selectedRepos = new ArrayList<String>();
+ selectedRepos.add( TEST_REPO_1 );
+
+ config.addManagedRepository( createRepositoryConfig( TEST_REPO_1 ) );
+
+ SearchFields searchFields = new SearchFields();
+ searchFields.setArtifactId( "artifactid-numeric" );
+ searchFields.setRepositories( selectedRepos );
+
+ archivaConfigControl.expectAndReturn( archivaConfig.getConfiguration(), config, 1 );
+
+ archivaConfigControl.replay();
+
+ SearchResults results = search.search( "user", searchFields, null );
+
+ archivaConfigControl.verify();
+
+ assertNotNull( results );
+ assertEquals( 2, results.getTotalHits() );
+
+ FileUtils.deleteDirectory( new File( getBasedir(), "/target/test-classes/" + TEST_REPO_1 + "/.indexer" ) );
+ assertFalse( new File( getBasedir(), "/target/test-classes/" + TEST_REPO_1 + "/.indexer" ).exists() );
+ }
// TODO: add test when an existing index already exists
}
Added: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.jar?rev=823505&view=auto
==============================================================================
(empty)
Added: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom?rev=823505&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric/1.0/artifactid-numeric-1.0.pom Fri Oct 9 10:28:52 2009
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com</groupId>
+ <artifactId>artifactid-numeric</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <name>ArtifactID numeric - NOT</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Added: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.jar?rev=823505&view=auto
==============================================================================
(empty)
Added: archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom?rev=823505&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-indexer/src/test/resources/nexus-search-test-repo/com/artifactid-numeric123/1.0/artifactid-numeric123-1.0.pom Fri Oct 9 10:28:52 2009
@@ -0,0 +1,17 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com</groupId>
+ <artifactId>artifactid-numeric123</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0</version>
+ <name>ArtifactID numeric</name>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>