From: Olivier Lamy Date: Tue, 9 Oct 2012 07:13:09 +0000 (+0000) Subject: move webapp test with old ui to retired. X-Git-Tag: archiva-1.4-M4~797 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4051ba2db6aa954786eee89da2e882d665acdef8;p=archiva.git move webapp test with old ui to retired. git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1395874 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt b/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt deleted file mode 100644 index 21fb72940..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt +++ /dev/null @@ -1,34 +0,0 @@ -ReadMe ----------- -Run selenium tests in src/test/testng with Maven and TestNG - - mvn clean install - -Run Selenium tests in src/test/testng against an existing Archiva instance - - Start Archiva - - Configure admin user for archiva (match values in src/test/resources/testng.properties ) - - modify src/test/resources/testng.properties as needed - - mvn clean install -Dcontainer-existing - -The Cargo installations are stored outside of target to avoid multiple downloads. -To remove the Cargo installations and re-download them next run, use: - - mvn -Pclean-cargo clean - -Internet Explorer and Safari users must disable their popup blockers. Using *iexplore as -the browser requires running as an Administrator on Windows 7/Vista, or alternatively you -can use *iexploreproxy. - - - - -IMPORTANT: - -When writing Selenium tests for artifact upload, please avoid using the "test" syllable/word for -the groupId or artifactId (ex. test.group:testAddArtifactValidValues:1.0) as this is used for the -search tests. The tests explicitly assert the returned number of hits for searching an artifact with -a groupId or artifactId containing the word "test", so if you upload or add a new artifact which has -the term "test", the number of hits will be different and the search tests will fail. - -See org.apache.archiva.web.test.SearchTest.java or read the related thread discussion at -http://old.nabble.com/Selenium-tests-failure-in-trunk-td27830786.html - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/pom.xml deleted file mode 100644 index 2567da666..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/pom.xml +++ /dev/null @@ -1,600 +0,0 @@ - - - - 4.0.0 - - org.apache.archiva - archiva-web - 1.4-M3-SNAPSHOT - - archiva-webapp-test - pom - Archiva Web :: Application Tests - - - - org.testng - testng - test - - - commons-io - commons-io - - - org.apache.archiva - archiva-webapp - war - - - org.codehaus.plexus - plexus-utils - - - org.codehaus.plexus - plexus-slf4j-logging - - - plexus-component-api - org.codehaus.plexus - - - - - org.seleniumhq.selenium.client-drivers - selenium-java-client-driver - test - - - commons-logging - commons-logging - - - - - - - jdom - jdom - - - jaxen - jaxen - - - - - org.apache.derby - derby - - - javax.mail - mail - - - javax.activation - activation - - - - - src/test/testng - - - src/test/resources - true - - **/* - - - - - - - org.codehaus.mojo - selenium-maven-plugin - - - org.seleniumhq.selenium - selenium-server - ${selenium-server.version} - - - - org.seleniumhq.selenium - selenium-remote-driver - ${selenium-server.version} - - - - org.seleniumhq.selenium - selenium-api - ${selenium-server.version} - - - - - org.apache.rat - apache-rat-plugin - - - src/test/resources/appserver-base/** - src/test/resources/repository/** - src/test/resources/local-repo/** - src/test/resources/projects/** - src/test/resources/snapshots/** - src/test/tomcat*/conf/catalina.policy - - - - - - - - maven-resources-plugin - - - - testResources - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - 1.5 - 1.5 - true - - - - - testCompile - - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - false - - - - listener - org.apache.archiva.web.test.listener.CaptureScreenShotsListener - - - excludegroups - - ${excluded.groups} - - - alphabetical - - - - integration-tests - integration-test - - test - - - - - browser - ${selenium.browser} - - - baseUrl - ${baseUrl} - - - maxWaitTimeInMs - ${maxWaitTimeInMs} - - - - - - - - - - - - create-container - - - !container - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - unzip-archiva-webapp - generate-resources - - unpack - - - - - ${project.groupId} - archiva-webapp - ${project.version} - war - - - ${project.build.directory}/${container.name}conf/webapps/archiva - true - - - - prepare-provided-dependencies - generate-resources - - copy-dependencies - - - - org.apache.derby,javax.mail,javax.activation - false - true - false - ${project.build.directory}/providedDependencies - - - - - - org.apache.maven.plugins - maven-antrun-plugin - - - generate-resources - - run - - - - - - - - - - - - - - - - - - - - - - - - - - copy-container-conf - package - - - - - - - - - - - - - - - - - - - - run - - - - check-archiva-loaded - integration-test - - - - - - - - run - - - - - - org.codehaus.cargo - cargo-maven2-plugin - - - start-container - pre-integration-test - - start - - - - stop-container - post-integration-test - - stop - - - - - ${cargo.wait} - - ${container.name} - - ${container.url} - ${user.home}/.cargo - - ${project.build.directory}/logs/${container.name}.log - ${project.build.directory}/logs/${container.name}.out - ${cargo.timeout} - - ${project.build.directory}/appserver-base - ${project.build.directory}/appserver-base - ${project.build.directory} - ${project.build.directory} - - - - ${project.build.directory}/${container.name}conf - existing - - ${container.test.port} - ${cargo.jvm.args} - - - - - - - - - existing-container - - - !baseUrl - - - - http://localhost:${container.test.port}/archiva/ - - - - start-selenium - - - !seleniumHost - - - - localhost - 4444 - - - - - org.codehaus.mojo - selenium-maven-plugin - - - pre-integration-test - - start-server - - - true - ${seleniumPort} - true - - - - - - - - - tomcat5x - - - tomcat5 - - - - tomcat5x - ${tomcat5x.version} - - ${apache.mirror.url}/tomcat/tomcat-5/v${tomcat5x.version}/bin/apache-tomcat-${tomcat5x.version}.zip - - - - - tomcat6x - - - !container - - - - tomcat6x - ${tomcat6x.version} - - ${apache.mirror.url}/tomcat/tomcat-6/v${tomcat6x.version}/bin/apache-tomcat-${tomcat6x.version}.zip - - - - - firefox - - - !browser - - - - *firefox - - - - - chrome - - - browser - chrome - - - - *googlechrome - requiresUpload - - - - iexplore - - - browser - iexplore - - - - *iexplore - requiresUpload - - - - safari - - - browser - safari - - - - *safari - requiresUpload - - - - otherbrowser - - - browser - other - - - - *custom ${browserPath} - requiresUpload - - - - headless - - - - org.codehaus.mojo - selenium-maven-plugin - - - xvfb - validate - - xvfb - - - - - - - - - debug - - - - -Xdebug -Xnoagent -Djava.compiler=NONE - -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=${cargo.debug.port} - -Xmx512m -XX:MaxPermSize=256m - - 8000 - - 3600000 - - - - ci-server - - - - org.apache.maven.plugins - maven-antrun-plugin - - - cleanup-files - - run - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/archiva.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/archiva.xml deleted file mode 100644 index a95ad86e2..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/archiva.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - false - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml deleted file mode 100644 index 0be86ebbd..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/shared.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/shared.xml deleted file mode 100644 index 9afb83352..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/shared.xml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar deleted file mode 100644 index d98bcfb34..000000000 Binary files a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar and /dev/null differ diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 deleted file mode 100644 index 7359be6f9..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -ea7dea9244b2a0975cfa117dc34fe18e \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 deleted file mode 100644 index 45ec67894..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -1039566ff5361d07eccd1243c45929b96441c7d6 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom deleted file mode 100644 index 606e1b194..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom +++ /dev/null @@ -1,54 +0,0 @@ - - 4.0.0 - test - test - jar - 1.0 - test - http://maven.apache.org - - - - Test License - http://www.test.org/test.html - - - - - - test user list - http://test.net/lists/listinfo/test-user - http://test.net/lists/listinfo/test-user - http://www.test-archive.com/test-user%40lists.test.net/ - - - test developer list - http://test.net/lists/listinfo/test-dev - http://test.net/lists/listinfo/test-dev - http://www.test-archive.com/test-dev%40lists.test.net/ - - - - - - test.group.id - testArtifactId - 1.0 - - - junit - junit - 3.8.1 - test - - - - - - test -file://localhost/Users/brett/scm/archiva/archiva/archiva-modules/archiva-web/archiva-webapp-test/src/test/it-resources/appserver-base/data/repositories/internal - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 deleted file mode 100644 index 3b20276cd..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -f80c7c493716de649a99db00cd2ff34c \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 deleted file mode 100644 index d7c09225e..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -4b95c6fa09d1e02efdb69129f53f025e33bc8958 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml deleted file mode 100644 index 68287fd4e..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - test - test - 1.0 - - - 1.0 - - 20100114015837 - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 deleted file mode 100644 index 4bb9667e4..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -dab1b8c2475fe839f387ceaef0d82b30 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 deleted file mode 100644 index f00268387..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -4e5b414d5419121ef75131cb52235a9abbf2095a \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/_7.cfs b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/_7.cfs deleted file mode 100644 index e95ea7eb8..000000000 Binary files a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/_7.cfs and /dev/null differ diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/deletable b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/deletable deleted file mode 100644 index 593f4708d..000000000 Binary files a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/deletable and /dev/null differ diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/segments b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/segments deleted file mode 100644 index d9d4f014f..000000000 Binary files a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/segments and /dev/null differ diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/local-repo/settings.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/local-repo/settings.xml deleted file mode 100644 index 23b66a9db..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/local-repo/settings.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - snapshots - admin - admin1 - - - - - repositories - - - snapshots - snapshots-repository - http://localhost:9696/archiva/repository/snapshots/ - - false - - - true - - - - - - snapshots - snapshots-repository - http://localhost:9696/archiva/repository/snapshot/ - - false - - - true - - - - - - - repositories - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/bad-dependency.log b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/bad-dependency.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/bad-dependency2.log b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/bad-dependency2.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml deleted file mode 100644 index 24fc2aa46..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 4.0.0 - org.apache.archiva - bad-dependency - 1.0 - jar - Bad Dependency - - - org.apache.archiva.web.test - bad-dependency - 1.0 - - - org.apache.archiva.web.test - foo-bar - 1.2-SNAPSHOT - - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/dependency-in-proxied.log b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/dependency-in-proxied.log deleted file mode 100644 index e69de29bb..000000000 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml deleted file mode 100644 index 82606837b..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - 4.0.0 - org.apache.archiva - dependency-in-proxied - 1.0 - jar - Dependency In Proxied - - - - com.lowagie - itext - 1.3 - - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/.datarefresh b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/.datarefresh deleted file mode 100644 index c53a40aad..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/.datarefresh +++ /dev/null @@ -1,7 +0,0 @@ -#Last Scan Information, managed by Archiva. DO NOT EDIT -#Thu Apr 19 17:04:36 PHT 2007 -scan.included.files=12 -scan.skipped.files=0 -scan.finished.timestamp=1176973476967 -scan.consumed.files=20 -scan.started.timestamp=1176973467414 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.jar.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.jar.md5 deleted file mode 100644 index 158138e09..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -0360f14347d5502114ba7afe4ea2e07f \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.jar.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.jar.sha1 deleted file mode 100644 index c9524a069..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -4a667b9923fb936409b96c8242bebc2f96f374f5 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom deleted file mode 100644 index 9d419ea6d..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom +++ /dev/null @@ -1,25 +0,0 @@ - - 4.0.0 - org.apache.maven.archiva.web.test - artifact-a - jar - 1.0 - artifact-a - http://maven.apache.org - - - org.apache.maven.archiva.web.test - artifact-b - 2.0 - - - - - - org.apache.maven.wagon - wagon-webdav - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom.md5 deleted file mode 100644 index 93cdd6f43..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -cdf69ffbcb888aacea6cfeaf479fefd1 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom.sha1 deleted file mode 100644 index 293b6c1f4..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/1.0/artifact-a-1.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -f6a384b1ab62ed45ae7dee1a059815e94bbc7fa6 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml deleted file mode 100644 index 113676922..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.archiva.web.test - artifact-a - 1.0 - - - 1.0 - - 20070417090928 - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.md5 deleted file mode 100644 index a02aa88a4..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -bc87573a595a2c387b5baa4ad7d06743 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.sha1 deleted file mode 100644 index 11bee708c..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -e9ecaaa14a3c09b07206980c15749a631dbc986a \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.jar.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.jar.md5 deleted file mode 100644 index 3bb4fd4e6..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -16a308257949f23afa5d1f1dec41aa44 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.jar.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.jar.sha1 deleted file mode 100644 index e5d0934b1..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -36a3a9cc35b8ca0d73998d7b39d290b489800a22 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom deleted file mode 100644 index 218543673..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom +++ /dev/null @@ -1,25 +0,0 @@ - - 4.0.0 - org.apache.maven.archiva.web.test - artifact-b - jar - 2.0 - artifact-b - http://maven.apache.org - - - org.apache.maven.archiva.web.test - artifact-c - 3.0 - - - - - - org.apache.maven.wagon - wagon-webdav - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom.md5 deleted file mode 100644 index 5fabe5807..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -be5b8f8539a62b5935793ebeb87215fd \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom.sha1 deleted file mode 100644 index 6eb9715a0..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/2.0/artifact-b-2.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -012a658d4a4f70aa3e8dd4b2db67020817b7dfcc \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml deleted file mode 100644 index 60b171df5..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.archiva.web.test - artifact-b - 2.0 - - - 2.0 - - 20070417090908 - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.md5 deleted file mode 100644 index 80c703319..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -bedfccc27fc7dc262d5c99a7aa8b83d8 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.sha1 deleted file mode 100644 index 42390adcc..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -4902ea6b16838ff26f9136460c4394b0ad7cc7f5 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.jar.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.jar.md5 deleted file mode 100644 index edc258a75..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -853a10a201f8a296e37e856615c5349c \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.jar.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.jar.sha1 deleted file mode 100644 index aafda15fa..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -5155da8820ed77c43e983c1244d94a3b27bf08f7 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom deleted file mode 100644 index 8299fbf11..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom +++ /dev/null @@ -1,26 +0,0 @@ - - 4.0.0 - org.apache.maven.archiva.web.test - artifact-c - jar - 3.0 - artifact-c - http://maven.apache.org - - - junit - junit - 3.8.1 - test - - - - - - org.apache.maven.wagon - wagon-webdav - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom.md5 deleted file mode 100644 index d225acc75..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -4df0417579b1492f37da14316adb85af \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom.sha1 deleted file mode 100644 index 1f2435ee6..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/3.0/artifact-c-3.0.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -c3b007acd9c17b80753b39a4121255965e7e2e65 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml deleted file mode 100644 index 1d7394c7a..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.archiva.web.test - artifact-c - 3.0 - - - 3.0 - - 20070417090835 - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.md5 deleted file mode 100644 index 8c0378271..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -74d58d97e78d5e51cc02c489c5edba0d \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.sha1 deleted file mode 100644 index 535860369..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -5c7571eb35248be0f65758783b036e8f7899c146 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.jar.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.jar.md5 deleted file mode 100644 index 9d902f06e..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -55f498a518e1151ce2e54daa674691de \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.jar.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.jar.sha1 deleted file mode 100644 index b351a034e..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -730551bde461564d3f8a7e0178ef9bc54a86d2dd \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom deleted file mode 100644 index 478f8fd50..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom +++ /dev/null @@ -1,25 +0,0 @@ - - 4.0.0 - org.apache.maven.archiva.web.test - artifact-s - jar - 0.1 - artifact-s - http://maven.apache.org - - - org.apache.maven.archiva.web.test - artifact-a - 1.0 - - - - - - org.apache.maven.wagon - wagon-webdav - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom.md5 deleted file mode 100644 index b49dc167a..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -746ba2848229dbc1c9683ece0e7f02c8 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom.sha1 deleted file mode 100644 index ae029df5c..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/0.1/artifact-s-0.1.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -0d068f63069a86d982075a1dca7fe74fd95a29df \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml deleted file mode 100644 index ddcad75d9..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.archiva.web.test - artifact-s - 0.1 - - - 0.1 - - 20070417090721 - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.md5 deleted file mode 100644 index f6bd69743..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -baa0ad0afaba9cee66ec262b38f796b6 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.sha1 deleted file mode 100644 index c341e6296..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -dea84d579f673d2d87c7bd47e4318cdf8e59e4d0 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/.datarefresh b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/.datarefresh deleted file mode 100644 index c53a40aad..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/.datarefresh +++ /dev/null @@ -1,7 +0,0 @@ -#Last Scan Information, managed by Archiva. DO NOT EDIT -#Thu Apr 19 17:04:36 PHT 2007 -scan.included.files=12 -scan.skipped.files=0 -scan.finished.timestamp=1176973476967 -scan.consumed.files=20 -scan.started.timestamp=1176973467414 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar deleted file mode 100644 index 033956d43..000000000 Binary files a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar and /dev/null differ diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar.md5 deleted file mode 100644 index 0a3eeb690..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar.md5 +++ /dev/null @@ -1 +0,0 @@ -306d556e6e5e4d604dc854d09ddcdefd \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar.sha1 deleted file mode 100644 index 39c5c3061..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -afb6586f5eb4c63dd5735a0bed11c99c7fac6755 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom deleted file mode 100644 index d580176ff..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom +++ /dev/null @@ -1,9 +0,0 @@ - - 4.0.0 - org.apache.maven.archiva.web.test - foo-bar - 1.0-SNAPSHOT - - deployed - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom.md5 deleted file mode 100644 index 6caf8be40..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom.md5 +++ /dev/null @@ -1 +0,0 @@ -8e896baea663a45d7bd2737f8e464481 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom.sha1 deleted file mode 100644 index a3bbc7ea1..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom.sha1 +++ /dev/null @@ -1 +0,0 @@ -e37897c617d78dedd978766a2db318d301e80105 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml deleted file mode 100644 index ab1eb426d..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.archiva.web.test - foo-bar - 1.0-SNAPSHOT - - - 1 - - 20070425105840 - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml.md5 deleted file mode 100644 index 76ef1e4b3..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -add4f71a005137e9a296c5b192e900c2 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml.sha1 deleted file mode 100644 index ebe7cf339..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -b505e302169e04fc821bf571da7435b1e42ef8d7 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml deleted file mode 100644 index 8f00ecefa..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - org.apache.maven.archiva.web.test - foo-bar - 1.0-SNAPSHOT - - - 1.0-SNAPSHOT - - 20070425105840 - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.md5 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.md5 deleted file mode 100644 index f6270d9c8..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.md5 +++ /dev/null @@ -1 +0,0 @@ -f3b657fb48d2e82fee5fada169756938 \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.sha1 b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.sha1 deleted file mode 100644 index 7f4812f9f..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.sha1 +++ /dev/null @@ -1 +0,0 @@ -f4629e609deb95cefdcdddc6dd8c2942d1c3e47f \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties deleted file mode 100644 index fe4cb6183..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties +++ /dev/null @@ -1,143 +0,0 @@ -# -# 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. -# - -# properties for integration tests - -ADMIN_USERNAME=admin -ADMIN_FULLNAME=Administrator -ADMIN_EMAIL=admin@localhost -ADMIN_PASSWORD=admin1 - -SELENIUM_HOST=localhost -SELENIUM_PORT=4444 -SELENIUM_BROWSER=*firefox - -# Search, Artifact Management -SEARCH_BAD_ARTIFACT=asdf -# Existing Artifact -ARTIFACT_GROUPID=test -ARTIFACT_ARTIFACTID=test -ARTIFACT_VERSION=1.0 -ARTIFACT_PACKAGING=jar -ARTIFACT_CLASSNAME=test.App - -# Artifact for testing add artifact with valid values -VALIDARTIFACT_GROUPID=addArtifactValidValues -VALIDARTIFACT_ARTIFACTID=addArtifactValidValues-artifact - -# Artifact for upload action in audit log report - MRM-1304 -AUDITLOGARTIFACT_GROUPID=group.auditLogUpload -AUDITLOGARTIFACT_ARTIFACTID=auditLogUpload-artifact -AUDITLOG_EXPECTED_ARTIFACT=group/auditLogUpload/auditLogUpload-artifact/1.0/auditLogUpload-artifact-1.0.jar - -# Reports -REPOSITORY_NAME=internal -START_DATE=05/01/2009 -END_DATE=05/30/2009 - -# User Management -# For password and new password -USERROLE_EMAIL=admin@localhost -USERROLE_PASSWORD=password1 -NEW_USERROLE_PASSWORD=password123 - -# Guest Role -GUEST_USERNAME=guest_user -GUEST_FULLNAME=Guest -# Registered User Role -REGISTERED_USERNAME=reg_user -REGISTERED_FULLNAME=Registered User -# System Administrator -SYSAD_USERNAME=sys_admin -SYSAD_FULLNAME=System Administrator -# User Administrator -USERADMIN_USERNAME=user_admin -USERADMIN_FULLNAME=User Administrator -# Global Repository Manager -GLOBALREPOMANAGER_USERNAME=globalrepo_manager -GLOBALREPOMANAGER_FULLNAME=Global Repository Manager -# Global Repository Observer -GLOBALREPOOBSERVER_USERNAME=globalrepo_observer -GLOBALREPOOBSERVER_FULLNAME=Global Repository Observer -# Repository Manager - internal -REPOMANAGER_INTERNAL_USERNAME=repomanager_internal -REPOMANAGER_INTERNAL_FULLNAME=Repository Manager - internal -# Repository Manager - snapshots -REPOMANAGER_SNAPSHOTS_USERNAME=repomanager_snapshots -REPOMANAGER_SNAPSHOTS_FULLNAME=Repository Manager - snapshots -# Repository Observer - internal -REPOOBSERVER_INTERNAL_USERNAME=repoobserver_internal -REPOOBSERVER_INTERNAL_FULLNAME=Repository Observer - internal -# Repository Observer - snapshots -REPOOBSERVER_SNAPSHOTS_USERNAME=repoobserver_snapshots -REPOOBSERVER_SNAPSHOTS_FULLNAME=Repository Observer - snapshots - -# Add Artifact -GROUPID=test -ARTIFACTID=test -VERSION=1.0 -PACKAGING=jar -ARTIFACTFILEPATH=test -REPOSITORYID=internal - -GROUPID1=delete -ARTIFACTID1=delete -VERSION1=1.0 -PACKAGING1=jar -ARTIFACTFILEPATH1=test -REPOSITORYID1=internal - -GROUPID_DOTNETARTIFACT=dotNetTypes -ARTIFACTID_DOTNETARTIFACT=dotNetTypes -PACKAGING_DOTNETARTIFACT=library - -SNAPSHOT_GROUPID=org.apache.archiva -SNAPSHOT_ARTIFACTID=archiva-test -SNAPSHOT_VERSION=1.0-SNAPSHOT -SNAPSHOT_PACKAGING=jar -SNAPSHOT_ARTIFACTFILEPATH=src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar -SNAPSHOT_REPOSITORYID=snapshots - -ADD_REMOVE_GROUPID=artifact.dummy -ADD_REMOVE_ARTIFACTID=artifact-dummy - -# REPOSITORIES -# Manage Repositories -MANAGED_IDENTIFIER=testing1 -MANAGED_NAME=Testing Managed Repository -MANAGED_DIRECTORY= -MANAGED_INDEX_DIRECTORY= -MANAGED_TYPE= -MANAGED_CRON= -MANAGED_REPOPURGE_DAYSOLDERTHAN= -MANAGED_REPOPURGE_RETENTIONCOUNT= - -# Network Proxies -NETWORKPROXY_IDENTIFIER=networkproxytest -NETWORKPROXY_PROTOCOL=http -NETWORKPROXY_HOSTNAME= -NETWORKPROXY_PORT=8080 -NETWORKPROXY_USERNAME=admin -NETWORKPROXY_PASSWORD=admin123 - -# Browse - MRM-1278 test -SNAPSHOTS_REPOSITORY=snapshots -RELEASES_REPOSITORY=releases - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java deleted file mode 100644 index 4d4facf33..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java +++ /dev/null @@ -1,102 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArchivaTest; -import org.testng.Assert; -import org.testng.annotations.Test; - -@Test( groups = { "appearance" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) -public class AppearanceTest - extends AbstractArchivaTest -{ - public void testAddAppearanceEmptyValues() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "", "", "", false ); - assertTextPresent( "You must enter a name" ); - } - - @Test( dependsOnMethods = { "testAddAppearanceEmptyValues" } ) - public void testAddAppearanceInvalidValues() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "<>~+[ ]'\"", "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"", - "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"", false ); - assertTextPresent( - "Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( "You must enter a URL" ); - assertTextPresent( "You must enter a URL for your logo" ); - } - - @Test( dependsOnMethods = { "testAddAppearanceInvalidValues" } ) - public void testAddAppearanceInvalidOrganisationName() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "<>~+[ ]'\"", "http://www.apache.org/", "http://www.apache.org/images/asf_logo_wide.gifs", - false ); - assertTextPresent( - "Organisation name must only contain alphanumeric characters, white-spaces(' '), equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - } - - public void testAddAppearanceInvalidOrganisationUrl() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "The Apache Software Foundation", "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"", - "http://www.apache.org/images/asf_logo_wide.gifs", false ); - assertTextPresent( "You must enter a URL." ); - } - - @Test - public void testAddAppearanceInvalidOrganisationLogo() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "The Apache Software Foundation", "http://www.apache.org/", - "/home/user/abcXYZ0129._/\\~:?!&=-<> ~+[ ]'\"", false ); - assertTextPresent( "You must enter a URL for your logo." ); - } - - @Test - public void testAddAppearanceValidValues() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "The Apache Software Foundation", "http://www.apache.org/", - "http://www.apache.org/images/asf_logo_wide.gifs", true ); - assertTextPresent( "The Apache Software Foundation" ); - } - - @Test( dependsOnMethods = { "testAddAppearanceValidValues" } ) - public void testEditAppearance() - { - goToAppearancePage(); - - clickLinkWithText( "Edit" ); - addEditAppearance( "Apache Software Foundation", "http://www.apache.org/", - "http://www.apache.org/images/asf_logo_wide.gifs", true ); - assertTextPresent( "Apache Software Foundation" ); - } - -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java deleted file mode 100644 index 378cfcb9d..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArchivaTest; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeSuite; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Optional; -import org.testng.annotations.Parameters; -import org.testng.annotations.Test; - -public class ArchivaAdminTest - extends AbstractArchivaTest -{ - - @Override - @AfterTest - public void close() - throws Exception - { - super.close(); - } - - @Override - @BeforeSuite - public void open() - throws Exception - { - super.open(); - } - - @BeforeTest - @Parameters( { "baseUrl", "browser", "maxWaitTimeInMs", "seleniumHost", "seleniumPort" } ) - public void initializeArchiva( String baseUrl, String browser, int maxWaitTimeInMs, - @Optional( "localhost" ) String seleniumHost, @Optional( "4444" ) int seleniumPort ) - throws Exception - { - super.open( baseUrl, browser, seleniumHost, seleniumPort, Integer.toString( maxWaitTimeInMs ) ); - - getSelenium().open( baseUrl ); - // if not admin user created create one - if ( isElementPresent( "adminCreateForm" ) ) - { - assertCreateAdmin(); - String fullname = getProperty( "ADMIN_FULLNAME" ); - String username = getProperty( "ADMIN_USERNAME" ); - String mail = getProperty( "ADMIN_EMAIL" ); - String password = getProperty( "ADMIN_PASSWORD" ); - submitAdminData( fullname, mail, password ); - assertUserLoggedIn( username ); - clickLinkWithLocator( "logoutLink" ); - } - else - { - login( getAdminUsername(), getAdminPassword() ); - } - - // take care about repositories : internal - } - - @Test( groups = { "about" }, alwaysRun = true ) - public void testHome() - { - getSelenium().open( baseUrl ); - assertPage( "Apache Archiva \\ Quick Search" ); - } -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java deleted file mode 100644 index b4156bb61..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java +++ /dev/null @@ -1,206 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArtifactManagementTest; -import org.testng.annotations.Test; - -@Test( groups = { "artifactmanagement" }, dependsOnGroups = { "about" } ) -public class ArtifactManagementTest - extends AbstractArtifactManagementTest -{ - - @Test( alwaysRun = true, dependsOnGroups = "about" ) - public void testAddArtifactNullValues() - { - goToAddArtifactPage(); - clickButtonWithValue( "Submit", false ); - //assertTextPresent( "Please add a file to upload." ); - assertTextPresent( "You must enter a version." ); - assertTextPresent( "You must enter a groupId." ); - assertTextPresent( "You must enter an artifactId." ); - assertTextPresent( "You must enter a version" ); - assertTextPresent( "You must enter a packaging" ); - } - - @Test( dependsOnMethods = { "testAddArtifactNullValues" }, alwaysRun = true ) - public void testAddArtifactNoGroupId() - { - addArtifact( " ", getArtifactId(), getVersion(), getPackaging(), getArtifactFilePath(), getRepositoryId(), - false ); - assertTextPresent( "You must enter a groupId." ); - } - - @Test( dependsOnMethods = { "testAddArtifactNoGroupId" }, alwaysRun = true ) - public void testAddArtifactNoArtifactId() - { - addArtifact( getGroupId(), " ", getVersion(), getPackaging(), getArtifactFilePath(), getRepositoryId(), false ); - assertTextPresent( "You must enter an artifactId." ); - } - - @Test( dependsOnMethods = { "testAddArtifactNoGroupId" }, alwaysRun = true ) - public void testAddArtifactNoVersion() - { - addArtifact( getGroupId(), getArtifactId(), " ", getPackaging(), getArtifactFilePath(), getRepositoryId(), - false ); - assertTextPresent( "You must enter a version." ); - } - - @Test( dependsOnMethods = { "testAddArtifactNoGroupId" }, alwaysRun = true ) - public void testAddArtifactInvalidVersion() - { - addArtifact( getGroupId(), getArtifactId(), "asdf", getPackaging(), getArtifactFilePath(), getRepositoryId(), - true ); - assertTextPresent( "Invalid version." ); - } - - @Test( dependsOnMethods = { "testAddArtifactNoGroupId" }, alwaysRun = true ) - public void testAddArtifactNoPackaging() - { - addArtifact( getGroupId(), getArtifactId(), getVersion(), " ", getArtifactFilePath(), getRepositoryId(), - false ); - assertTextPresent( "You must enter a packaging." ); - } - - @Test( dependsOnMethods = { "testAddArtifactNoGroupId" }, alwaysRun = true ) - public void testAddArtifactNoFilePath() - { - addArtifact( getGroupId(), getArtifactId(), getVersion(), getPackaging(), " ", getRepositoryId(), true ); - assertTextPresent( "Please add a file to upload." ); - } - - @Test( groups = "requiresUpload" ) - public void testAddArtifactValidValues() - { - String groupId = getProperty( "VALIDARTIFACT_GROUPID" ); - String artifactId = getProperty( "VALIDARTIFACT_ARTIFACTID" ); - - addArtifact( groupId, artifactId, getVersion(), getPackaging(), getArtifactFilePath(), getRepositoryId(), - true ); - assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + getVersion() - + "' was successfully deployed to repository 'internal'" ); - } - - @Test( groups = "requiresUpload" ) - public void testDotNetTypes() - { - String groupId = getProperty( "GROUPID_DOTNETARTIFACT" ); - String artifactId = getProperty( "ARTIFACTID_DOTNETARTIFACT" ); - String packaging = getProperty( "PACKAGING_DOTNETARTIFACT" ); - - addArtifact( groupId, artifactId, getVersion(), packaging, getArtifactFilePath(), getRepositoryId(), true ); - assertTextPresent( "Artifact '" + groupId + ":" + artifactId + ":" + getVersion() - + "' was successfully deployed to repository 'internal'" ); - getSelenium().open( baseUrl + "/browse/" + groupId + "/" + artifactId + "/" + getVersion() ); - waitPage(); - - assertTextPresent( "library" ); - String basePath = - "/archiva/repository/internal/" + groupId + "/" + artifactId + "/" + getVersion() + "/" + artifactId + "-" - + getVersion(); - assertLinkPresent( ".NET Library" ); - assertElementPresent( "//a[@href='" + basePath + ".dll']" ); - assertElementPresent( "//a[@href='" + basePath + ".pom']" ); - } - - // MRM-747 - @Test( groups = "requiresUpload" ) - public void testAddArtifactBlockRedeployments() - { - addArtifact( getGroupId(), getArtifactId(), getVersion(), getPackaging(), getArtifactFilePath(), - getRepositoryId(), true ); - assertTextPresent( "Overwriting released artifacts in repository '" + getRepositoryId() + "' is not allowed." ); - } - - @Test( groups = "requiresUpload" ) - public void testDeleteArtifact() - { - // prep - String groupId = getProperty( "GROUPID1" ); - String artifactId = getProperty( "ARTIFACTID1" ); - String version = getProperty( "VERSION1" ); - String packaging = getProperty( "PACKAGING1" ); - String repositoryId = getProperty( "REPOSITORYID1" ); - // TODO: do this differently as it only works in Firefox's chrome mode - addArtifact( groupId, artifactId, version, packaging, getArtifactFilePath(), repositoryId, true ); - assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deployed to repository 'internal'" ); - - deleteArtifact( "delete", "delete", "1.0", "internal", true ); - assertTextPresent( "Artifact 'delete:delete:1.0' was successfully deleted from repository 'internal'" ); - } - - @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" } ) - public void testDeleteArtifactNoGroupId() - { - deleteArtifact( " ", "delete", "1.0", "internal" ); - assertTextPresent( "You must enter a groupId." ); - } - - @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" } ) - public void testDeleteArtifactNoArtifactId() - { - deleteArtifact( "delete", " ", "1.0", "internal" ); - assertTextPresent( "You must enter an artifactId." ); - } - - @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" } ) - public void testDeleteArtifactNoVersion() - { - deleteArtifact( "delete", "delete", " ", "internal", false ); - assertTextPresent( "You must enter a version." ); - } - - @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" } ) - public void testDeleteArtifactInvalidVersion() - { - deleteArtifact( "delete", "delete", "asdf", "internal", true ); - assertTextPresent( "Invalid version." ); - } - - // HTML select should have the proper value, else it will cause a selenium error: Option with label 'customValue' not found - @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" } ) - public void testDeleteArtifactInvalidValues() - { - deleteArtifact( "<> \\/~+[ ]'\"", "<> \\/~+[ ]'\"", "<>", "internal" ); - assertTextPresent( - "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( - "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - // as it's a validation on server side it's not available here but tested in testDeleteArtifactInvalidVersion - //assertTextPresent( "Invalid version." ); - } - - - @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" } ) - public void testDeleteArtifactInvalidGroupId() - { - deleteArtifact( "<> \\/~+[ ]'\"", "delete", "1.0", "internal" ); - assertTextPresent( - "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - @Test( alwaysRun = true, dependsOnMethods = { "testAddArtifactNullValues" } ) - public void testDeleteArtifactInvalidArtifactId() - { - deleteArtifact( "delete", "<> \\/~+[ ]'\"", "1.0", "internal" ); - assertTextPresent( - "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java deleted file mode 100644 index 6732ee97c..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java +++ /dev/null @@ -1,197 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArchivaTest; -import org.testng.annotations.Test; - -@Test( groups = { "auditlogsreport" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } ) -public class AuditLogsReportTest - extends AbstractArchivaTest -{ - private void goToAuditLogReports() - { - getSelenium().open( "/archiva/report/queryAuditLogReport.action" ); - } - - private void assertAuditLogsReportPage() - { - assertPage( "Apache Archiva \\ Audit Log Report" ); - assertTextPresent( "Audit Log Report" ); - - assertElementPresent( "repository" ); - assertElementPresent( "groupId" ); - assertElementPresent( "artifactId" ); - assertElementPresent( "startDate" ); - assertElementPresent( "endDate" ); - assertElementPresent( "rowCount" ); - assertButtonWithValuePresent( "View Audit Log" ); - } - - @Test( dependsOnMethods = { "testWithCorrectUsernamePassword" } ) - public void testAuditLogsReport() - { - goToAuditLogReports(); - assertAuditLogsReportPage(); - assertTextPresent( "Latest Events" ); - } - - @Test( dependsOnMethods = { "testWithCorrectUsernamePassword" } ) - public void testViewAuditLogsNoDataFound() - { - goToAuditLogReports(); - assertAuditLogsReportPage(); - - setFieldValue( "groupId", "non.existing" ); - submit(); - - assertPage( "Apache Archiva \\ Audit Log Report" ); - assertTextPresent( "Results" ); - assertTextPresent( "No audit logs found." ); - } - - // TODO: add test for adding via WebDAV - @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" ) - public void testViewAuditLogsDataFound() - { - goToAuditLogReports(); - assertAuditLogsReportPage(); - - selectValue( "repository", "internal" ); - setFieldValue( "groupId", getProperty( "VALIDARTIFACT_GROUPID" ) ); - submit(); - - assertAuditLogsReportPage(); - assertTextPresent( "Results" ); - assertTextNotPresent( "No audit logs found." ); - assertTextPresent( - getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "." + getProperty( - "ARTIFACT_PACKAGING" ) ); - assertTextPresent( "Uploaded File" ); - assertTextPresent( "internal" ); - assertTextPresent( "admin" ); - } - - // TODO: add test for adding via WebDAV - @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" ) - public void testViewAuditLogsOnlyArtifactIdIsSpecified() - { - goToAuditLogReports(); - assertAuditLogsReportPage(); - - selectValue( "repository", "internal" ); - setFieldValue( "artifactId", getProperty( "AUDITLOGARTIFACT_ARTIFACTID" ) ); - submit(); - - assertAuditLogsReportPage(); - assertTextPresent( "If you specify an artifact ID, you must specify a group ID" ); - assertTextNotPresent( "Results" ); - assertTextNotPresent( "No audit logs found." ); - assertTextNotPresent( - getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "." + getProperty( - "ARTIFACT_PACKAGING" ) ); - assertTextNotPresent( "Uploaded File" ); - } - - // TODO: add test for adding via WebDAV - @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" ) - public void testViewAuditLogsForAllRepositories() - { - goToAuditLogReports(); - assertAuditLogsReportPage(); - - selectValue( "repository", "all" ); - submit(); - - assertAuditLogsReportPage(); - assertTextPresent( "Results" ); - assertTextNotPresent( "No audit logs found." ); - assertTextPresent( - getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "." + getProperty( - "ARTIFACT_PACKAGING" ) ); - assertTextPresent( "Uploaded File" ); - assertTextPresent( "internal" ); - assertTextPresent( "admin" ); - } - - @Test( dependsOnMethods = { "testAddArtifactValidValues", "testUserWithRepoManagerInternalRole" }, - groups = "requiresUpload" ) - public void testViewAuditLogsViewAuditEventsForManageableRepositoriesOnly() - { - String groupId = getProperty( "SNAPSHOT_GROUPID" ); - String artifactId = getProperty( "SNAPSHOT_ARTIFACTID" ); - String version = getProperty( "SNAPSHOT_VERSION" ); - String repo = getProperty( "SNAPSHOT_REPOSITORYID" ); - String packaging = getProperty( "SNAPSHOT_PACKAGING" ); - - addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repo, true ); - assertTextPresent( - "Artifact '" + groupId + ":" + artifactId + ":" + version + "' was successfully deployed to repository '" - + repo + "'" ); - - clickLinkWithText( "Logout" ); - - login( getProperty( "REPOMANAGER_INTERNAL_USERNAME" ), getUserRoleNewPassword() ); - - goToAuditLogReports(); - assertAuditLogsReportPage(); - - selectValue( "repository", "all" ); - submit(); - - assertAuditLogsReportPage(); - assertTextPresent( "Results" ); - assertTextNotPresent( "No audit logs found." ); - assertTextPresent( - getProperty( "VALIDARTIFACT_ARTIFACTID" ) + "-" + getProperty( "ARTIFACT_VERSION" ) + "." + packaging ); - assertTextPresent( "Uploaded File" ); - assertTextPresent( "internal" ); - assertTextPresent( "admin" ); - - assertTextNotPresent( artifactId + "-" + version + "." + packaging ); - clickLinkWithText( "Logout" ); - login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) ); - } - - // MRM-1304 - @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = "requiresUpload" ) - public void testViewAuditLogsReportForGroupId() - { - String groupId = getProperty( "AUDITLOGARTIFACT_GROUPID" ); - String artifactId = getProperty( "AUDITLOGARTIFACT_ARTIFACTID" ); - String version = getProperty( "VERSION" ); - String packaging = getProperty( "PACKAGING" ); - String repositoryId = getProperty( "REPOSITORYID" ); - String expectedArtifact = getProperty( "AUDITLOG_EXPECTED_ARTIFACT" ); - - addArtifact( groupId, artifactId, version, packaging, getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ), repositoryId, - true ); - - goToAuditLogReports(); - - selectValue( "repository", repositoryId ); - setFieldValue( "groupId", groupId ); - submit(); - - assertAuditLogsReportPage(); - assertTextPresent( expectedArtifact ); - assertTextPresent( repositoryId ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java deleted file mode 100644 index 12fc57cee..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java +++ /dev/null @@ -1,274 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractBrowseTest; -import org.testng.Assert; -import org.testng.annotations.Test; - -import java.io.File; - -@Test( groups = { "browse" }, dependsOnMethods = { "testAddArtifactNullValues" } ) -public class BrowseTest - extends AbstractBrowseTest -{ - public void testBrowseArtifactPageTabs() - { - goToBrowsePage(); - clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" ); - - assertTextPresent( "Info" ); - assertTextPresent( "Dependencies" ); - assertTextPresent( "Dependency Tree" ); - assertTextPresent( "Used By" ); - assertTextPresent( "Mailing Lists" ); - assertTextPresent( "Metadata" ); - } - - public void testBrowseArtifact() - { - goToBrowsePage(); - assertBrowsePage(); - } - - @Test( dependsOnMethods = { "testAddArtifactValidValues" }, groups = { "requiresUpload" } ) - public void testClickArtifactFromBrowse() - { - goToBrowsePage(); - assertBrowsePage(); - clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" ); - assertPage( "Apache Archiva \\ Browse Repository" ); - assertTextPresent( "Artifacts" ); - } - - // MRM-1278 - @Test( groups = { "requiresUpload" } ) - public void testCorrectRepositoryInBrowse() - { - String releasesRepo = getProperty( "RELEASES_REPOSITORY" ); - - // create releases repository first - goToRepositoriesPage(); - clickLinkWithText( "Add" ); - addManagedRepository( getProperty( "RELEASES_REPOSITORY" ), "Releases Repository", - new File( getBasedir(), "target/repository/releases" ).getPath(), "", - "Maven 2.x Repository", "0 0 * * * ?", "", "", true ); - assertTextPresent( "Releases Repository" ); - - String snapshotsRepo = getProperty( "SNAPSHOTS_REPOSITORY" ); - - String path = - "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar"; - // TODO: do this differently as uploading doesn't work on browsers other than *chrome (below as well) - // upload a snapshot artifact to repository 'releases' - addArtifact( "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar", path, releasesRepo, true ); - assertTextPresent( - "Artifact 'archiva:archiva-webapp:1.0-SNAPSHOT' was successfully deployed to repository '" + releasesRepo - + "'" ); - - goToBrowsePage(); - assertBrowsePage(); - assertGroupsPage( "archiva/" ); - assertArtifactsPage( "archiva-webapp/" ); - assertArtifactInfoPage( "1.0-SNAPSHOT/", releasesRepo, "archiva", "archiva-webapp", "1.0-SNAPSHOT", "jar" ); - - // upload a snapshot artifact to repository 'snapshots' - addArtifact( "continuum", "continuum-core", "1.0-SNAPSHOT", "jar", path, snapshotsRepo, true ); - assertTextPresent( - "Artifact 'continuum:continuum-core:1.0-SNAPSHOT' was successfully deployed to repository '" + snapshotsRepo - + "'" ); - - goToBrowsePage(); - assertBrowsePage(); - assertGroupsPage( "continuum/" ); - assertArtifactsPage( "continuum-core/" ); - assertArtifactInfoPage( "1.0-SNAPSHOT/", snapshotsRepo, "continuum", "continuum-core", "1.0-SNAPSHOT", "jar" ); - } - - // MRM-1353 - @Test( groups = { "requiresUpload" } ) - public void testBuildNumberOfSnapshotArtifact() - { - String snapshotsRepo = getProperty( "SNAPSHOTS_REPOSITORY" ); - - String path = - "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar"; - // TODO: do this differently as uploading doesn't work on browsers other than *chrome (below as well) - // upload a snapshot artifact to repository 'releases' - addArtifact( "archiva", "archiva-multiple-artifacts", "1.0-SNAPSHOT", "jar", path, snapshotsRepo, true ); - assertTextPresent( - "Artifact 'archiva:archiva-multiple-artifacts:1.0-SNAPSHOT' was successfully deployed to repository '" - + snapshotsRepo + "'" ); - - goToBrowsePage(); - assertBrowsePage(); - assertGroupsPage( "archiva/" ); - assertArtifactsPage( "archiva-multiple-artifacts/" ); - assertArtifactInfoPage( "1.0-SNAPSHOT/", snapshotsRepo, "archiva", "archiva-multiple-artifacts", "1.0-SNAPSHOT", - "jar" ); - - addArtifact( "archiva", "archiva-multiple-artifacts", "1.0-SNAPSHOT", "jar", path, snapshotsRepo, true ); - assertTextPresent( - "Artifact 'archiva:archiva-multiple-artifacts:1.0-SNAPSHOT' was successfully deployed to repository '" - + snapshotsRepo + "'" ); - - goToBrowsePage(); - assertBrowsePage(); - assertGroupsPage( "archiva/" ); - assertArtifactsPage( "archiva-multiple-artifacts/" ); - assertArtifactInfoPage( "1.0-SNAPSHOT/", snapshotsRepo, "archiva", "archiva-multiple-artifacts", "1.0-SNAPSHOT", - "jar" ); - - String firstSnapshotVersion = getText( "//div[@id='download']/div[@id='accordion']/p[2]/a/" ); - Assert.assertTrue( firstSnapshotVersion.endsWith( "-1" ) ); - - String secondSnapshotVersion = getText( "//div[@id='download']/div[@id='accordion']/p[1]/a/" ); - Assert.assertTrue( secondSnapshotVersion.endsWith( "-2" ) ); - } - - public void testAddMetadataPropertyEmpty() - { - goToBrowsePage(); - clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" ); - clickLinkWithText( "Metadata" ); - - assertTextPresent( "No metadata content." ); - assertButtonWithValuePresent( "Add" ); - - clickButtonWithValue( "Add" ); - - waitPage(); - - assertTextPresent( "Property Name and Property Value are required." ); - } - - @Test( dependsOnMethods = { "testAddMetadataPropertyEmpty" } ) - public void testAddMetadataProperty() - { - addMetadataProperty(); - } - - @Test( dependsOnMethods = { "testAddMetadataProperty", "testWithCorrectUsernamePassword" } ) - public void testDeleteMetadataProperty() - { - deleteMetadataProperty(); - } - - @Test( dependsOnMethods = { "testDeleteMetadataProperty" } ) - public void testMetadataAccessWithRepositoryObserverRole() - { - addMetadataProperty(); - - logout(); - - goToBrowsePage(); - clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" ); - clickLinkWithText( "Metadata" ); - - waitPage(); - - assertTextNotPresent( "No metadata content." ); - assertButtonWithValueNotPresent( "Add" ); - assertTextNotPresent( "Add Property" ); - assertImgWithAltNotPresent( "Delete" ); - - login( getAdminUsername(), getAdminPassword() ); - - deleteMetadataProperty(); - } - - private void addMetadataProperty() - { - goToBrowsePage(); - clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" ); - clickLinkWithText( "Metadata" ); - - assertTextPresent( "No metadata content." ); - assertButtonWithValuePresent( "Add" ); - assertTextPresent( "Add Property" ); - - setFieldValue( "propertyName", "foo" ); - setFieldValue( "propertyValue", "bar" ); - - clickButtonWithValue( "Add" ); - - waitPage(); - - assertTextNotPresent( "No metadata content." ); - assertTextPresent( "foo=bar" ); - } - - private void deleteMetadataProperty() - { - goToBrowsePage(); - clickLinkWithText( getProperty( "ARTIFACT_GROUPID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_ARTIFACTID" ) + "/" ); - clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" ); - clickLinkWithText( "Metadata" ); - - assertTextPresent( "foo=bar" ); - assertButtonWithValuePresent( "Add" ); - assertTextPresent( "Add Property" ); - - clickImgWithAlt( "Delete" ); - - waitPage(); - - assertTextNotPresent( "foo=bar" ); - assertTextPresent( "Property successfully deleted." ); - assertImgWithAltNotPresent( "Delete" ); - assertTextPresent( "No metadata content." ); - } - - private void assertArtifactInfoPage( String version, String artifactInfoRepositoryId, String artifactInfoGroupId, - String artifactInfoArtifactId, String artifactInfoVersion, - String artifactInfoPackaging ) - { - clickLinkWithText( version ); - assertPage( "Apache Archiva \\ Browse Repository" ); - assertTextPresent( artifactInfoRepositoryId ); - assertTextPresent( artifactInfoGroupId ); - assertTextPresent( artifactInfoArtifactId ); - assertTextPresent( artifactInfoVersion ); - assertTextPresent( artifactInfoPackaging ); - } - - private void assertArtifactsPage( String artifactId ) - { - clickLinkWithText( artifactId ); - assertPage( "Apache Archiva \\ Browse Repository" ); - assertTextPresent( "Versions" ); - } - - private void assertGroupsPage( String groupId ) - { - clickLinkWithText( groupId ); - assertPage( "Apache Archiva \\ Browse Repository" ); - assertTextPresent( "Artifacts" ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/CSRFSecurityTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/CSRFSecurityTest.java deleted file mode 100644 index 5a55ed72f..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/CSRFSecurityTest.java +++ /dev/null @@ -1,132 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArchivaTest; -import org.testng.annotations.Test; - -/** - * Test all actions affected with CSRF security issue. - */ -@Test( groups = { "csrf" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) -public class CSRFSecurityTest - extends AbstractArchivaTest -{ - public void testCSRFDeleteRepository() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/deleteRepository.action?repoid=test&method%3AdeleteContents=Delete+Configuration+and+Contents" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFDeleteArtifact() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/deleteArtifact!doDelete.action?groupId=1&artifactId=1&version=1&repositoryId=snapshots" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFAddRepositoryGroup() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/addRepositoryGroup.action?repositoryGroup.id=csrfgrp" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFDeleteRepositoryGroup() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/deleteRepositoryGroup.action?repoGroupId=test&method%3Adelete=Confirm" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFDisableProxyConnector() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/disableProxyConnector!disable.action?target=maven2-repository.dev.java.net&source=internal" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFDeleteProxyConnector() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/deleteProxyConnector!delete.action?target=maven2-repository.dev.java.net&source=snapshots" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFDeleteLegacyArtifactPath() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/deleteLegacyArtifactPath.action?path=jaxen%2Fjars%2Fjaxen-1.0-FCS-full.jar" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFSaveNetworkProxy() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/saveNetworkProxy.action?mode=add&proxy.id=ntwrk&proxy.protocol=http&" + - "proxy.host=test&proxy.port=8080&proxy.username=&proxy.password=" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFDeleteNetworkProxy() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/deleteNetworkProxy!delete.action?proxyid=myproxy" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFAddFileTypePattern() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/repositoryScanning!addFiletypePattern.action?pattern=**%2F*.rum&fileTypeId=artifacts" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFRemoveFileTypePattern() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/repositoryScanning!removeFiletypePattern.action?pattern=**%2F*.rum&fileTypeId=artifacts" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testCSRFUpdateKnownConsumers() - { - getSelenium().open( baseUrl ); - getSelenium().open( baseUrl + "/admin/repositoryScanning!updateKnownConsumers.action?enabledKnownContentConsumers=auto-remove&" + - "enabledKnownContentConsumers=auto-rename&enabledKnownContentConsumers=create-missing-checksums&" + - "enabledKnownContentConsumers=index-content&enabledKnownContentConsumers=metadata-updater&" + - "enabledKnownContentConsumers=repository-purge&enabledKnownContentConsumers=update-db-artifact&" + - "enabledKnownContentConsumers=validate-checksums" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java deleted file mode 100644 index afa9940af..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArchivaTest; -import org.testng.annotations.Test; - -@Test( groups = { "findartifact" }, dependsOnGroups = {"about"}, sequential = true ) -public class FindArtifactTest - extends AbstractArchivaTest -{ - @Test(alwaysRun = true) - public void testFindArtifactNullValues() - { - goToFindArtifactPage(); - clickButtonWithValue( "Search" ); - assertTextPresent( "You must select a file, or enter the checksum. If the file was given and you receive this message, there may have been an error generating the checksum." ); - } - - @Test(alwaysRun = true) - public void testFindArtifactUsingChecksum() - { - goToFindArtifactPage(); - setFieldValue( "checksumSearch_q", "8e896baea663a45d7bd2737f8e464481" ); - clickButtonWithValue( "Search" ); - assertTextPresent( "No results found" ); - } - - // TODO: test using file upload on Firefox versions that support getAsBinary (ie, no applet) -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java deleted file mode 100644 index 36e176670..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArtifactManagementTest; -import org.testng.annotations.Test; - -@Test( groups = { "legacysupport" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) -public class LegacySupportTest - extends AbstractArtifactManagementTest -{ - public void testAddLegacyArtifact_NullValues() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "", "", "", "", "", "", false ); - assertTextPresent( "You must enter a legacy path." ); - assertTextPresent( "You must enter a groupId." ); - assertTextPresent( "You must enter an artifactId." ); - assertTextPresent( "You must enter a version." ); - assertTextPresent( "You must enter a type." ); - } - - public void testAddLegacyArtifact_NullLegacyPath() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "", "test", "test", "1.0-SNAPSHOT", "testing", "jar", false ); - assertTextPresent( "You must enter a legacy path." ); - } - - public void testAddLegacyArtifact_NullGroupId() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test", "", "test", "1.0-SNAPSHOT", "testing", "jar", false ); - assertTextPresent( "You must enter a groupId." ); - } - - public void testAddLegacyArtifact_NullArtifactId() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test", "test", "", "1.0-SNAPSHOT", "testing", "jar", false ); - assertTextPresent( "You must enter an artifactId." ); - } - - public void testAddLegacyArtifact_NullVersion() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test", "test", "test", "", "testing", "jar", false ); - assertTextPresent( "You must enter a version." ); - } - - public void testAddLegacyArtifact_NullType() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test", "test", "test", "1.0-SNAPSHOT", "testing", "", false ); - assertTextPresent( "You must enter a type." ); - } - - public void testAddLegacyArtifact_InvalidValues() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "<> ~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"" , "<> \\/~+[ ]'\"", - false ); - assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - public void testAddLegacyArtifact_InvalidLegacyPath() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "<> ~+[ ]'\"" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "jar", false ); - assertTextPresent( "Legacy path must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." ); - } - - public void testAddLegacyArtifact_InvalidGroupId() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test" , "<> \\/~+[ ]'\"" , "test" , "1.0-SNAPSHOT" , "testing" , "jar", false ); - assertTextPresent( "Group id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - public void testAddLegacyArtifact_InvalidArtifactId() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test" , "test" , "<> \\/~+[ ]'\"" , "1.0-SNAPSHOT" , "testing" , "jar", false ); - assertTextPresent( "Artifact id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - public void testAddLegacyArtifact_InvalidVersion() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test" , "test" , "test" , "<> \\/~+[ ]'\"" , "testing" , "jar", false ); - assertTextPresent( "Version must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - public void testAddLegacyArtifact_InvalidType() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "testing" , "<> \\/~+[ ]'\"", false ); - assertTextPresent( "Type must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - public void testAddLegacyArtifact_InvalidClassifier() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test" , "test" , "test" , "1.0-SNAPSHOT" , "<> \\/~+[ ]'\"" , "jar", false ); - assertTextPresent( "Classifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java deleted file mode 100644 index 73db410a7..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java +++ /dev/null @@ -1,123 +0,0 @@ -package org.apache.archiva.web.test; - -/* - * 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.web.test.parent.AbstractArchivaTest; -import org.testng.annotations.AfterTest; -import org.testng.annotations.BeforeTest; -import org.testng.annotations.Test; - -/* - * Bug in TestNG. TESTNG-285: @Test(sequential=true) works incorrectly for classes with inheritance - * http://code.google.com/p/testng/source/browse/trunk/CHANGES.txt - * Waiting 5.9 release. It's comming soon. - */ -/** - * Based on LoginTest of Emmanuel Venisse test. - * - * @author José Morales Martínez - * - */ - -@Test( groups = { "login" }, dependsOnGroups = {"about"}) -public class LoginTest - extends AbstractArchivaTest -{ - @Test(alwaysRun = true) - public void testWithBadUsername() - { - goToLoginPage(); - setFieldValue( "loginForm_username", "badUsername" ); - getSelenium().click( "loginSubmit" ); - //getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - waitPage(); - assertElementPresent( "//ul[@class=\'errorMessage\']" ); - //assertTextPresent( "You have entered an incorrect username and/or password" ); - } - - @Test( dependsOnMethods = { "testWithBadUsername" }, alwaysRun = true ) - public void testWithBadPassword() - { - goToLoginPage(); - setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) ); - setFieldValue( "loginForm_password", "badPassword" ); - getSelenium().click( "loginSubmit" ); - //getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - waitPage(); - //assertTextPresent( "You have entered an incorrect username and/or password" ); - //