From 96c99628aab4b63d71e660b661120596868a7f25 Mon Sep 17 00:00:00 2001 From: Brett Porter Date: Thu, 14 Jan 2010 06:04:54 +0000 Subject: [PATCH] ensure test is not skipped and clarify meaning (can't test searching with no access, it wouldn't appear in the list) git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@899070 13f79535-47bb-0310-9956-ffa450edef68 --- .../testng/org/apache/archiva/web/test/SearchTest.java | 7 ++++--- .../apache/archiva/web/test/parent/AbstractSearchTest.java | 4 ++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java index 163e6ae45..d10700985 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java @@ -19,6 +19,8 @@ package org.apache.archiva.web.test; * under the License. */ +import java.io.File; + import org.apache.archiva.web.test.parent.AbstractSearchTest; import org.testng.annotations.Test; @@ -80,10 +82,9 @@ public class SearchTest assertLinkPresent( "test" ); } - @Test (dependsOnMethods = { "testAddManagedRepoValidValues" } ) - public void testSearchExistingArtifactUsingAdvancedSearchNoAccessToRepository() + public void testSearchExistingArtifactUsingAdvancedSearchNotInRepository() { - searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, "managedrepo1", null, null ); + searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, "snapshots", null, null ); assertTextPresent( "No results found" ); assertTextNotPresent( "Results" ); assertTextNotPresent( "Hits: 1 to 1 of 1" ); diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java index 5d8c5ee8f..5b787b502 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java @@ -107,6 +107,10 @@ public abstract class AbstractSearchTest setFieldValue( "rowCount", rowCount ); } + if ( repositoryId != null ) + { + selectValue( "filteredSearch_repositoryId", repositoryId ); + } clickSubmitWithLocator( "filteredSearch_0" ); } } -- 2.39.5