From 4051ba2db6aa954786eee89da2e882d665acdef8 Mon Sep 17 00:00:00 2001 From: Olivier Lamy Date: Tue, 9 Oct 2012 07:13:09 +0000 Subject: [PATCH] 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 --- .../archiva-webapp-test/ReadMe.txt | 34 - .../archiva-web/archiva-webapp-test/pom.xml | 600 -------- .../resources/appserver-base/conf/archiva.xml | 8 - .../appserver-base/conf/repository.xml | 49 - .../resources/appserver-base/conf/shared.xml | 1 - .../internal/test/test/1.0/test-1.0.jar | Bin 1981 -> 0 bytes .../internal/test/test/1.0/test-1.0.jar.md5 | 1 - .../internal/test/test/1.0/test-1.0.jar.sha1 | 1 - .../internal/test/test/1.0/test-1.0.pom | 54 - .../internal/test/test/1.0/test-1.0.pom.md5 | 1 - .../internal/test/test/1.0/test-1.0.pom.sha1 | 1 - .../internal/test/test/maven-metadata.xml | 12 - .../internal/test/test/maven-metadata.xml.md5 | 1 - .../test/test/maven-metadata.xml.sha1 | 1 - .../src/test/resources/index/_7.cfs | Bin 5106 -> 0 bytes .../src/test/resources/index/deletable | Bin 4 -> 0 bytes .../src/test/resources/index/segments | Bin 27 -> 0 bytes .../test/resources/local-repo/settings.xml | 44 - .../bad-dependency/bad-dependency.log | 0 .../bad-dependency/bad-dependency2.log | 0 .../resources/projects/bad-dependency/pom.xml | 41 - .../dependency-in-proxied.log | 0 .../projects/dependency-in-proxied/pom.xml | 41 - .../test/resources/repository/.datarefresh | 7 - .../artifact-a/1.0/artifact-a-1.0.jar.md5 | 1 - .../artifact-a/1.0/artifact-a-1.0.jar.sha1 | 1 - .../test/artifact-a/1.0/artifact-a-1.0.pom | 25 - .../artifact-a/1.0/artifact-a-1.0.pom.md5 | 1 - .../artifact-a/1.0/artifact-a-1.0.pom.sha1 | 1 - .../web/test/artifact-a/maven-metadata.xml | 11 - .../test/artifact-a/maven-metadata.xml.md5 | 1 - .../test/artifact-a/maven-metadata.xml.sha1 | 1 - .../artifact-b/2.0/artifact-b-2.0.jar.md5 | 1 - .../artifact-b/2.0/artifact-b-2.0.jar.sha1 | 1 - .../test/artifact-b/2.0/artifact-b-2.0.pom | 25 - .../artifact-b/2.0/artifact-b-2.0.pom.md5 | 1 - .../artifact-b/2.0/artifact-b-2.0.pom.sha1 | 1 - .../web/test/artifact-b/maven-metadata.xml | 11 - .../test/artifact-b/maven-metadata.xml.md5 | 1 - .../test/artifact-b/maven-metadata.xml.sha1 | 1 - .../artifact-c/3.0/artifact-c-3.0.jar.md5 | 1 - .../artifact-c/3.0/artifact-c-3.0.jar.sha1 | 1 - .../test/artifact-c/3.0/artifact-c-3.0.pom | 26 - .../artifact-c/3.0/artifact-c-3.0.pom.md5 | 1 - .../artifact-c/3.0/artifact-c-3.0.pom.sha1 | 1 - .../web/test/artifact-c/maven-metadata.xml | 11 - .../test/artifact-c/maven-metadata.xml.md5 | 1 - .../test/artifact-c/maven-metadata.xml.sha1 | 1 - .../artifact-s/0.1/artifact-s-0.1.jar.md5 | 1 - .../artifact-s/0.1/artifact-s-0.1.jar.sha1 | 1 - .../test/artifact-s/0.1/artifact-s-0.1.pom | 25 - .../artifact-s/0.1/artifact-s-0.1.pom.md5 | 1 - .../artifact-s/0.1/artifact-s-0.1.pom.sha1 | 1 - .../web/test/artifact-s/maven-metadata.xml | 11 - .../test/artifact-s/maven-metadata.xml.md5 | 1 - .../test/artifact-s/maven-metadata.xml.sha1 | 1 - .../src/test/resources/snapshots/.datarefresh | 7 - .../1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar | Bin 773 -> 0 bytes .../1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar.md5 | 1 - .../foo-bar-1.0-SNAPSHOT.jar.sha1 | 1 - .../1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom | 9 - .../1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.pom.md5 | 1 - .../foo-bar-1.0-SNAPSHOT.pom.sha1 | 1 - .../foo-bar/1.0-SNAPSHOT/maven-metadata.xml | 11 - .../1.0-SNAPSHOT/maven-metadata.xml.md5 | 1 - .../1.0-SNAPSHOT/maven-metadata.xml.sha1 | 1 - .../web/test/foo-bar/maven-metadata.xml | 11 - .../web/test/foo-bar/maven-metadata.xml.md5 | 1 - .../web/test/foo-bar/maven-metadata.xml.sha1 | 1 - .../src/test/resources/testng.properties | 143 -- .../archiva/web/test/AppearanceTest.java | 102 -- .../archiva/web/test/ArchivaAdminTest.java | 85 -- .../web/test/ArtifactManagementTest.java | 206 --- .../archiva/web/test/AuditLogsReportTest.java | 197 --- .../apache/archiva/web/test/BrowseTest.java | 274 ---- .../archiva/web/test/CSRFSecurityTest.java | 132 -- .../archiva/web/test/FindArtifactTest.java | 47 - .../archiva/web/test/LegacySupportTest.java | 142 -- .../apache/archiva/web/test/LoginTest.java | 123 -- .../web/test/MergingRepositoriesTest.java | 102 -- .../archiva/web/test/NetworkProxiesTest.java | 148 -- .../apache/archiva/web/test/ReportsTest.java | 83 -- .../web/test/RepositoryScanningTest.java | 224 --- .../archiva/web/test/RepositoryTest.java | 354 ----- .../apache/archiva/web/test/SearchTest.java | 141 -- .../archiva/web/test/UserRolesTest.java | 242 ---- .../web/test/VirtualRepositoryTest.java | 70 - .../archiva/web/test/XPathExpressionUtil.java | 242 ---- .../archiva/web/test/XSSSecurityTest.java | 254 ---- .../listener/CaptureScreenShotsListener.java | 109 -- .../web/test/parent/AbstractArchivaTest.java | 746 ---------- .../AbstractArtifactManagementTest.java | 82 -- .../parent/AbstractArtifactReportsTest.java | 80 -- .../web/test/parent/AbstractBrowseTest.java | 40 - .../AbstractMergingRepositoriesTest.java | 74 - .../test/parent/AbstractRepositoryTest.java | 358 ----- .../web/test/parent/AbstractSearchTest.java | 117 -- .../web/test/parent/AbstractSeleniumTest.java | 481 ------- .../conf/Catalina/localhost/archiva.xml | 30 - .../conf/Catalina/localhost/host-manager.xml | 32 - .../conf/Catalina/localhost/manager.xml | 36 - .../src/test/tomcat5x/conf/catalina.policy | 172 --- .../test/tomcat5x/conf/catalina.properties | 85 -- .../src/test/tomcat5x/conf/context.xml | 31 - .../src/test/tomcat5x/conf/logging.properties | 74 - .../src/test/tomcat5x/conf/server-minimal.xml | 44 - .../src/test/tomcat5x/conf/server.xml | 384 ------ .../src/test/tomcat5x/conf/tomcat-users.xml | 29 - .../src/test/tomcat5x/conf/web.xml | 1183 ---------------- .../conf/Catalina/localhost/archiva.xml | 30 - .../conf/Catalina/localhost/host-manager.xml | 34 - .../conf/Catalina/localhost/manager.xml | 38 - .../src/test/tomcat6x/conf/catalina.policy | 7 - .../test/tomcat6x/conf/catalina.properties | 81 -- .../src/test/tomcat6x/conf/context.xml | 35 - .../src/test/tomcat6x/conf/logging.properties | 46 - .../src/test/tomcat6x/conf/server.xml | 68 - .../src/test/tomcat6x/conf/tomcat-users.xml | 36 - .../src/test/tomcat6x/conf/web.xml | 1205 ----------------- 119 files changed, 10190 deletions(-) delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/ReadMe.txt delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/pom.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/archiva.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/repository.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/conf/shared.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.jar.sha1 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/1.0/test-1.0.pom.sha1 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/appserver-base/data/repositories/internal/test/test/maven-metadata.xml.sha1 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/_7.cfs delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/deletable delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/index/segments delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/local-repo/settings.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/bad-dependency.log delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/bad-dependency2.log delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/bad-dependency/pom.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/dependency-in-proxied.log delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/projects/dependency-in-proxied/pom.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/.datarefresh delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-a/maven-metadata.xml.sha1 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-b/maven-metadata.xml.sha1 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-c/maven-metadata.xml.sha1 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/repository/org/apache/maven/archiva/web/test/artifact-s/maven-metadata.xml.sha1 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/.datarefresh delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 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 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.md5 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/maven-metadata.xml.sha1 delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/resources/testng.properties delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AppearanceTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArchivaAdminTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ArtifactManagementTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/AuditLogsReportTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/BrowseTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/CSRFSecurityTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/FindArtifactTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LegacySupportTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/LoginTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XPathExpressionUtil.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XSSSecurityTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractMergingRepositoriesTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml delete mode 100644 archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/web.xml 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 d98bcfb34434b5ae8ff87c158fc99cf249413e55..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1981 zcmWIWW@h1H0D*uWT^le1N^k;cU)K;vT~9wZ{Q#&k4hDaqvd^bI1JZ!fH9#zatjyQZ z&(qB{I7H9a?X&Nh(>~t1dKY=Ub+yi&Ilno`;EM5sr$stm=T7K&>pF3;KUoqsMNIpE zO2y7O-9f_MLBS<+wbqKra0^W~4ic>qJ{|NKDC1>Z>~-Lgr|U{pRe?s4*!5F#CcI3m zV*A+kY){Od7zUWTFrCi|bXQ4gaS4*sK|XwbY|1Y`Mg|6MCI$vRm=ec=0=?v%#Ny)I zKws~}4g$5e*ZU@I*}C;>bhLly1sU5A7QrLV0Sklp=WTl%v^{6iq&(L8X>uYqKbZdn zK2ljLvaou_@jWvuf2V!_{rod`q|D<3j*Qu6t5!rtly7MC?bGecZ96oRYpP}X2{V3c zo}H&x=u39(<9d2l<;AHVaV4gPsrIip?+R}8`Xo8i*gxycgCA~vz2$~dTRXU0xFoaA zy4P#WYhCVY@!^(Q*uw==?s@1uEpf;xA(HmQ3~=H}~8K7Lg1o5Y>$ zm8Bu|9Z7fd3*PKrvDoo#y_$qq@ypxq0=}KGU-j3>%xFRHVouRj!SY(4-koSs)DB`v zS-Pnq?ZIM|%Ucq*?#!?^nXr7jpC6mfN8gLf&M2p}{9Mex;rf<00Xj=mjtjY#-*VXD zlab7N^yY_5Ew?+;Mo-^Z7Zo$M3z+0xyb*K6jdOL&m;B81r{cIHhaWl7$xy!$vmUa_j>MEn`zG7 zE*`XLZ`s<1`nxxGSTmGZOgMRQp;d5REpz^Q_lk4fdv5qnZr6VO`-?^2&mU8s*@+&N ztCNf0*LsxCI5*;g#;x3Kw>K0%VA&thx@hfB{+(|Zce11${#^Yr?n(H%^3Vwy*3rSg zn{C=JuP$-m)YjoMz4z^1b}Z+{DFv^Un&ZB(YweuOt?*C|KZI(Uze5p~=-u%_<7ri=CWLBM=xbmciuS}!rmue=lLcP5gU)yxXxy(?%w(!!0 zv+sicS>9iNM}5}R((N3o%^qjdF@CMnj3?@Uvea$EKsEUQ~0G|kiLpL=8CzxkoF?P2MQ z16+1h6b7CN1;$`B5UUf4$%3N%g4Cjt%+%uGGXJyQx?Vb-zJVUALO%HFc%OY7#K-<= zkI-iko?cO&vuk^N*Yxm;#xy&N^ziWT?l=|H-DUjwa}MuUo*kFEKY4T81m}1Mb$jm+ z>h?0aEHv3Wp$1qiF*1oT<1SZ$&I1AghPRF&8mW|pX~SO5f)sTI0S&KivgCmaDT#bJj`Ou91P0y2+f_C zn$et&X#%JWK$x%_hY4uLU@sG31}$m)gwGgg34sU`?CBC=+8!2+Faf&l 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 e95ea7eb8a4a9d3a16c9db4d9419d3ef752b296f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5106 zcmdT{y>BB$6yMoTJL}k&OXv`S0txBl^?rJH(?#e`x+2%)ghYjAcV`pdUF^l{3kjm2 zqv9_>qM)FlprD|*f`WpA0we@TP*6}%Q1B-Z-kaHRj5%++@LQwN*eSfM`?q;;*NXLnXd(u z-h3mVbmuz(r9VFkC>{D)K~8VK zW6~*D#l{62=Ob1VeRftcqEA^hA$CS<_8Obkqsf@G%F!csFnXH_X-tn9X&+7}k1K9P zJ1!!kRu74F(sVGeLrttkhioob!(kuMdbU3)M&*bV#L5BIpx$n}gN9vACl6RYyT^yB zX#S8Mj>d;%L4nr)RHY& zE9a-Li&+^&AURW{93g^uA}5ec z6FO+7i8I7n1CkC&>a}%zTJVV6(y*T^l(6dL`Q6J zOi$Q&K&Sc9=!6d5V%cEE>KRmsUD2ll&v6%EAE5JqPCMi!u;K_S4!7boRvfV6pq1?l zdiLoC(V(l&bD#v6xXE)(>7i~PcUe7}O{QmErR%$H?1ogmDo?uJ3taMq^sCkWrtxak-*S~x3&R~D<-rYO55AHkrcQ#fp>fDCIclgHKjCctv zomhAcgKBc@oE|@VW*cy>R1D_E>aE4MMToo7o!vP}vR&VC*CbXx2o{Nz_W@poSUC_2 zx&pBvUx!%0on>O30-V&J-7swPvWtb*3@)G8Gk(V={ zMPWhdFb;<)a0fYKjFw8D5h~uzSw?VRVY>&3bSRTo0jI^C9@Ma3x$8-qMDdS6ebNw_&EhARFwqNiK>S zi^gpmXMk>_3GIddj@9{)U5qL(b`SJx=^8|typd0sOE_UJG%j|)E$Jf4&G=lz@wvde ziz?{Oh1FjW7Ft{U8i13t3)8kWh~B!eVzvesGYTEmPq1A5Wq{vnt1oV$wdzC`TB|}v zuEoE2kg03$k~U1Z*(Gi8{g%OZi4f~uxOz}j=Eu$!-wxRp-v{{?wk>~QX{d7Pz+?w4 zUHWTk2M4@#h%B@(d#iD6Tu2osfal}}`iAG^1`dnoq!8c?6awhn;7y<-1ke!z1`g2l Y&cCD?q~)d>(g`G4KbOzWL{(G%1+l2Zi~s-t 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 593f4708db84ac8fd0f5cc47c634f38c013fe9e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4 LcmZQzU|;|M00aO5 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 d9d4f014f6c2ccc1337d89943229869ab905f822..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27 gcmezW|Nnmm21X%H(ffZH7#KK!n2{;o97wSM0E@i_uK)l5 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 033956d4326c4267c5fb7d87a2faad78952d8a1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 773 zcmWIWW@Zs#-~hr$jWf*{kN_tG3xls~h@-BjpPT-_Qw$8u3<2Kk93T};P-Ou)HH!dM zz%~0i`gyv!28ZbRx_$ONbK1vSSMMUPx31Q?Gv_x48C)@b@U%$J%U8$K_hRWP7S0(j zB{ecwra#mCk)|g8R6Ja4`jTg2+7-`KUuS+Q`dGvWcEz$yz7t)5c7QO*63f?R&%Kg|==a{g6-oor}t9Qp7yeayn_n*ar`%7;b99he^vQz79 zS-G~*$F9g}!R>WfMa$>z1I2~$xm@>JpxfpHaey}?lL!N9RKns36qTp|9yg$fMc0ZP zxS)tc09zmvt`#X-K_+l9;En`@35S79NR%LSV2c!lj;Bx^kSIcU5)?_u0RW051mI>w ZL@ZL21$eWvffTU - 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" ); - //
  • - assertElementPresent( "//ul[@class=\'errorMessage\']" ); - } - - @Test( dependsOnMethods = { "testWithBadPassword" }, alwaysRun = true ) - public void testWithEmptyUsername() - { - goToLoginPage(); - setFieldValue( "loginForm_password", "password" ); - getSelenium().click( "loginSubmit" ); - //getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - waitPage(); - //assertTextPresent( "User Name is required" ); - assertElementPresent( "//tr[@errorFor=\'loginForm_username\']"); - } - - @Test( dependsOnMethods = { "testWithEmptyUsername" }, alwaysRun = true ) - public void testWithEmptyPassword() - { - goToLoginPage(); - setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) ); - getSelenium().click( "loginSubmit" ); - //getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - waitPage(); - //assertTextPresent( "You have entered an incorrect username and/or password" ); - assertElementPresent( "//ul[@class=\'errorMessage\']" ); - } - - @Test( groups = { "loginSuccess" }, dependsOnMethods = { "testWithEmptyPassword" }, alwaysRun = true ) - public void testWithCorrectUsernamePassword() - { - goToLoginPage(); - setFieldValue( "loginForm_username", getProperty( "ADMIN_USERNAME" ) ); - setFieldValue( "loginForm_password", getProperty( "ADMIN_PASSWORD" ) ); - getSelenium().click( "loginSubmit" ); - //getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - waitPage(); - //assertTextPresent( "Logout" ); - assertElementPresent( "logoutLink" ); - //assertTextPresent( "Edit Details" ); - assertElementPresent( "editUserLink" ); - assertTextPresent( getProperty( "ADMIN_USERNAME" ) ); - } - - @BeforeTest - public void open() - throws Exception - { - super.open(); - } - - @Override - @AfterTest - public void close() - throws Exception - { - super.close(); - } -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.java deleted file mode 100644 index a93748b43..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/MergingRepositoriesTest.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.AbstractMergingRepositoriesTest; -import org.testng.annotations.Test; - -@Test(groups = {"merging"}, dependsOnMethods = {"testWithCorrectUsernamePassword"}, sequential = true) -public class MergingRepositoriesTest - extends AbstractMergingRepositoriesTest -{ - - public void testAddStagingRepository() - { - goToRepositoriesPage(); - getSelenium().open( "/archiva/admin/addRepository.action" ); - addStagingRepository( "merging-repo", "merging-repo", getRepositoryDir() + "merging-repo/", "", - "Maven 2.x Repository", "0 0 * * * ?", "", "" ); - assertTextPresent( "merging-repo" ); - } - - // here we upload an artifact to the staging repository - @Test(dependsOnMethods = {"testAddStagingRepository"}, groups = "requiresUpload" ) - public void testAddArtifactToStagingRepository() - { - addArtifact( getGroupId(), getArtifactId(), getVersion(), getPackaging(), getValidArtifactFilePath(), - "merging-repo-stage", true ); - assertTextPresent( "Artifact '" + getGroupId() + ":" + getArtifactId() + ":" + getVersion() + - "' was successfully deployed to repository 'merging-repo-stage'" ); - } - - // here we test the merging (no conflicts artifacts are available) - @Test(dependsOnMethods = {"testAddArtifactToStagingRepository"}) - public void testMerging() - { - goToRepositoriesPage(); - clickButtonWithValue( "Merge" ); - assertTextPresent( "No conflicting artifacts" ); - clickButtonWithValue( "Merge All" ); - assertTextPresent( "Repository 'merging-repo-stage' successfully merged to 'merging-repo'." ); - } - - // check audit updating is done properly or not - @Test(dependsOnMethods = {"testMerging"}) - public void testAuditLogs() - { - goToAuditLogReports(); - assertTextPresent( "Merged Artifact" ); - assertTextPresent( "merging-repo" ); - } - - // merging is done by skipping conflicts - @Test(dependsOnMethods = {"testMerging"}) - public void testMergingWithSkippingConflicts() - { - goToRepositoriesPage(); - clickButtonWithValue( "Merge" ); - assertTextPresent( "WARNING: The following are the artifacts in conflict." ); - clickButtonWithValue( "Merge With Skip" ); - assertTextPresent( "Repository 'merging-repo-stage' successfully merged to 'merging-repo'." ); - } - - // merging all - @Test(dependsOnMethods = {"testMerging"}) - public void testMergingWithOutSkippingConflicts() - { - goToRepositoriesPage(); - clickButtonWithValue( "Merge" ); - assertTextPresent( "WARNING: The following are the artifacts in conflict." ); - clickButtonWithValue( "Merge All" ); - assertTextPresent( "Repository 'merging-repo-stage' successfully merged to 'merging-repo'." ); - } - - // change the configuaration first and try to upload existing artifact to the repository - @Test(dependsOnMethods = {"testAddArtifactToStagingRepository"}) - public void testConfigurationChangesOfStagingRepository() - { - editManagedRepository(); - addArtifact( getGroupId(), getArtifactId(), getVersion(), getPackaging(), getValidArtifactFilePath(), - "merging-repo-stage", true ); - assertTextPresent( - "Overwriting released artifacts in repository '" + "merging-repo-stage" + "' is not allowed." ); - } - -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java deleted file mode 100644 index 71b445778..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/NetworkProxiesTest.java +++ /dev/null @@ -1,148 +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.AbstractRepositoryTest; -import org.testng.annotations.Test; - -@Test( groups = { "networkproxies" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } ) -public class NetworkProxiesTest - extends AbstractRepositoryTest -{ - @Test( dependsOnMethods = { "testDeleteRepositoryGroup" } ) - public void testAddNetworkProxyNullValues() - { - goToNetworkProxiesPage(); - addNetworkProxy( "", "", "", "", "", "" ); - assertTextPresent( "You must enter an identifier." ); - assertTextPresent( "You must enter a protocol." ); - assertTextPresent( "You must enter a host." ); - } - - @Test( dependsOnMethods = { "testAddNetworkProxyNullValues" } ) - public void testAddNetworkProxyNullIdentifier() - { - goToNetworkProxiesPage(); - addNetworkProxy( "", "http", "localhost", "8080", "", "" ); - assertTextPresent( "You must enter an identifier." ); - } - - @Test( dependsOnMethods = { "testAddNetworkProxyNullIdentifier" } ) - public void testAddNetworkProxyNullProtocol() - { - goToNetworkProxiesPage(); - addNetworkProxy( "testing123", "", "localhost", "8080", "", "" ); - assertTextPresent( "You must enter a protocol." ); - } - - @Test( dependsOnMethods = { "testAddNetworkProxyNullProtocol" } ) - public void testAddNetworkProxiesNullHostname() - { - goToNetworkProxiesPage(); - addNetworkProxy( "testing123", "http", "", "8080", "", "" ); - assertTextPresent( "You must enter a host." ); - } - - @Test (dependsOnMethods = { "testAddNetworkProxiesNullHostname" } ) - public void testAddNetworkProxiesInvalidValues() - { - goToNetworkProxiesPage(); - addNetworkProxy( "<> \\/~+[ ]'\"", "<> ~+[ ]'\"", "<> ~+[ ]'\"", "0", "<> ~+[ ]'\"", ""); - assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." ); - assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( "Port needs to be larger than 1" ); - assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." ); - } - - @Test (dependsOnMethods = { "testAddNetworkProxiesInvalidValues" } ) - public void testAddNetworkProxiesInvalidIdentifier() - { - goToNetworkProxiesPage(); - addNetworkProxy( "<> \\/~+[ ]'\"", "http", "localhost", "8080", "", ""); - assertTextPresent( "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - @Test (dependsOnMethods = { "testAddNetworkProxiesInvalidIdentifier" } ) - public void testAddNetworkProxiesInvalidProtocol() - { - goToNetworkProxiesPage(); - addNetworkProxy( "testing123", "<> ~+[ ]'\"", "localhost", "8080", "", ""); - assertTextPresent( "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." ); - } - - @Test (dependsOnMethods = { "testAddNetworkProxiesInvalidProtocol" } ) - public void testAddNetworkProxiesInvalidHostname() - { - goToNetworkProxiesPage(); - addNetworkProxy( "testing123", "http", "<> ~+[ ]'\"", "8080", "", ""); - assertTextPresent( "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - } - - @Test (dependsOnMethods = { "testAddNetworkProxiesInvalidHostname" } ) - public void testAddNetworkProxiesInvalidPort() - { - goToNetworkProxiesPage(); - addNetworkProxy( "testing123", "http", "localhost", "0", "", ""); - assertTextPresent( "Port needs to be larger than 1" ); - } - - @Test (dependsOnMethods = { "testAddNetworkProxiesInvalidPort" } ) - public void testAddNetworkProxiesInvalidUsername() - { - goToNetworkProxiesPage(); - addNetworkProxy( "testing123", "http", "localhost", "8080", "<> ~+[ ]'\"", ""); - assertTextPresent( "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." ); - } - - @Test (dependsOnMethods = { "testAddNetworkProxiesInvalidUsername" } ) - public void testAddNetworkProxiesValidValues() - { - goToNetworkProxiesPage(); - addNetworkProxy( "testing123", "http", "localhost", "8080", "", "" ); - assertPage( "Apache Archiva \\ Administration - Network Proxies" ); - assertTextPresent( "testing123" ); - } - - @Test( dependsOnMethods = { "testAddNetworkProxiesValidValues" } ) - public void testEditNetworkProxy() - { - editNetworkProxies( "proxy.host", "localhost" ); - assertPage( "Apache Archiva \\ Administration - Network Proxies" ); - assertTextPresent( "localhost" ); - } - - @Test( dependsOnMethods = { "testEditNetworkProxy" } ) - public void testDeleteNetworkProxy() - { - deleteNetworkProxy(); - assertPage( "Apache Archiva \\ Administration - Network Proxies" ); - assertTextPresent( "There are no network proxies configured yet." ); - } - - @Test( dependsOnMethods = { "testDeleteNetworkProxy" } ) - public void testAddNetworkProxyAfterDelete() - { - addNetworkProxy( "testing123", "http", "localhost", "8080", "", "" ); - assertPage( "Apache Archiva \\ Administration - Network Proxies" ); - assertTextPresent( "testing123" ); - } - -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java deleted file mode 100644 index 89f7b64fa..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/ReportsTest.java +++ /dev/null @@ -1,83 +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.AbstractArtifactReportsTest; -import org.testng.annotations.Test; - -@Test( groups = { "reports" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } ) -public class ReportsTest - extends AbstractArtifactReportsTest -{ - // TODO Tests for repository with defects - - public void testRepoStatisticsWithoutRepoCompared() - { - goToReportsPage(); - clickButtonWithValue( "View Statistics" ); - assertTextPresent( "Please select a repository (or repositories) from the list." ); - } - - @Test( dependsOnMethods = { "testRepoStatisticsWithoutRepoCompared" } ) - public void testRepositoryStatisticsWithoutDate() - { - String repositoryName = getProperty( "REPOSITORY_NAME" ); - compareRepositories( "label=" + repositoryName, "", "" ); - // TODO - // assertTextPresent( "Statistics Report" ); - } - - @Test( dependsOnMethods = { "testRepoStatisticsWithoutRepoCompared" } ) - public void testRepositoryStatisticsEndEarlierThanStart() - { - String repositoryName = getProperty( "REPOSITORY_NAME" ); - String startDate = getProperty( "END_DATE" ); - String endDate = getProperty( "START_DATE" ); - compareRepositories( "label=" + repositoryName, startDate, endDate ); - // assertTextPresent( "Statistics for Repository '" + repositoryName + "'" ); - assertPage( "Apache Archiva \\ Reports" ); - assertTextPresent( "Start Date must be earlier than the End Date" ); - } - - public void testRepositoryStatistics() - { - String repositoryName = getProperty( "REPOSITORY_NAME" ); - String startDate = getProperty( "START_DATE" ); - String endDate = getProperty( "END_DATE" ); - compareRepositories( "label=" + repositoryName, startDate, endDate ); - // assertTextPresent( "Statistics for Repository '" + repositoryName + "'" ); - // assertPage( "Apache Archiva \\ Reports" ); - // assertTextPresent( "Statistics Report" ); - } - - /* - * @Test( dependsOnMethods = { "testRepositoryStatistics" } ) public void - * testRepositoriesStatisticComparisonReport() { //goToReportsPage(); clickButtonWithValue( "-->>" , false ); - * clickButtonWithValue( "View Statistics" ); assertTextPresent( "Statistics Report" ); } public void - * testRepositoryHealthWithoutDefect() { goToReportsPage(); String groupId = getProperty( "ARTIFACT_GROUPID" ); - * getSelenium().type( "generateReport_groupId" , groupId ); clickButtonWithValue( "Show Report" ); assertPage( - * "Apache Archiva \\ Reports" ); assertTextPresent( "The operation generated an empty report." ); } public void - * testRepositoryHealthWithoutGroupId() { goToReportsPage(); clickButtonWithValue( "Show Report" ); assertPage( - * "Apache Archiva \\ Reports" ); assertTextPresent( "The operation generated an empty report." ); //TODO As of the - * creation of the tests, GroupId is not a required field in showing the reports of repository health. GroupId - * should be required I think. } - */ - -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java deleted file mode 100644 index f37a158be..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryScanningTest.java +++ /dev/null @@ -1,224 +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.AbstractRepositoryTest; -import org.testng.Assert; -import org.testng.annotations.Test; - -@Test( groups = { "reposcan" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) -public class RepositoryScanningTest - extends AbstractRepositoryTest -{ - public void testAddArtifactFileType_NullValue() - { - goToRepositoryScanningPage(); - clickAddIcon( "newpattern_0" ); - assertTextPresent( "Unable to process blank pattern." ); - } - - @Test - public void testAddArtifactFileType() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_0", "**/*.dll" ); - clickAddIcon( "newpattern_0" ); - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[1]/table.13.0" ), "**/*.dll" ); - } - - @Test( dependsOnMethods = { "testAddArtifactFileType" } ) - public void testAddArtifactFileType_ExistingValue() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_0", "**/*.zip" ); - clickAddIcon( "newpattern_0" ); - Assert.assertEquals( getErrorMessageText(), "File type [artifacts] already contains pattern [**/*.zip]" ); - } - - @Test( dependsOnMethods = { "testAddArtifactFileType" } ) - public void testDeleteArtifactFileType() - { - goToRepositoryScanningPage(); - String path = "//div[@id='contentArea']/div/div/table/tbody/tr[14]/td/code"; - assertElementPresent( path ); - Assert.assertEquals( getSelenium().getText( path ), "**/*.dll" ); - clickDeleteIcon( "**/*.dll" ); - assertElementNotPresent( path ); - } - - @Test( dependsOnMethods = { "testDeleteArtifactFileType" } ) - public void testAddAutoRemove_NullValue() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_1", "" ); - clickAddIcon( "newpattern_1" ); - assertTextPresent( "Unable to process blank pattern." ); - } - - @Test( dependsOnMethods = { "testAddAutoRemove_NullValue" } ) - public void testAddAutoRemove_ExistingValue() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_1", "**/*-" ); - clickAddIcon( "newpattern_1" ); - Assert.assertEquals( getErrorMessageText(), "File type [auto-remove] already contains pattern [**/*-]" ); - } - - @Test( dependsOnMethods = { "testAddAutoRemove_NullValue" } ) - public void testAddAutoRemove() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_1", "**/*.test" ); - clickAddIcon( "newpattern_1" ); - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[2]/table.3.0" ), "**/*.test" ); - } - - @Test( dependsOnMethods = { "testAddAutoRemove" } ) - public void testDeleteAutoRemove() - { - goToRepositoryScanningPage(); - String path = "//div[@id='contentArea']/div/div[2]/table/tbody/tr[4]/td/code"; - assertElementPresent( path ); - Assert.assertEquals( getSelenium().getText( path ), "**/*.test" ); - clickDeleteIcon( "**/*.test" ); - assertElementNotPresent( path ); - } - - @Test( dependsOnMethods = { "testDeleteAutoRemove" } ) - public void testAddIgnoredArtifacts_NullValue() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_2", "" ); - clickAddIcon( "newpattern_2" ); - Assert.assertEquals( getErrorMessageText(), - "Unable to process blank pattern." ); - } - - @Test - public void testAddIgnoredArtifacts_ExistingValue() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_2", "**/*.sh" ); - clickAddIcon( "newpattern_2" ); - Assert.assertEquals( getErrorMessageText(), "File type [ignored] already contains pattern [**/*.sh]" ); - } - - @Test - public void testAddIgnoredArtifacts() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_2", "**/*.log" ); - clickAddIcon( "newpattern_2" ); - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[3]/table.6.0" ), "**/*.log" ); - } - - @Test( dependsOnMethods = { "testAddIgnoredArtifacts" } ) - public void testDeleteIgnoredArtifacts() - { - goToRepositoryScanningPage(); - String pattern = "**/*.log"; - String path = "//div[@id='contentArea']/div/div[3]/table/tbody/tr[7]/td/code"; - assertElementPresent( path ); - Assert.assertEquals( getSelenium().getText( path ), pattern ); - clickDeleteIcon( pattern ); - assertElementNotPresent( path ); - } - - // - @Test( dependsOnMethods = { "testDeleteIgnoredArtifacts" } ) - public void testAddIndexableContent_NullValue() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_3", "" ); - clickAddIcon( "newpattern_3" ); - Assert.assertEquals( getErrorMessageText(), - "Unable to process blank pattern." ); - } - - @Test - public void testAddIndexableContent_ExistingValue() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_3", "**/*.xml" ); - clickAddIcon( "newpattern_3" ); - Assert.assertEquals( getErrorMessageText(), - "File type [indexable-content] already contains pattern [**/*.xml]" ); - } - - @Test - public void testAddIndexableContent() - { - goToRepositoryScanningPage(); - setFieldValue( "newpattern_3", "**/*.html" ); - clickAddIcon( "newpattern_3" ); - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[4]/table.9.0" ), "**/*.html" ); - } - - @Test( dependsOnMethods = { "testAddIndexableContent" } ) - public void testDeleteIndexableContent() - { - goToRepositoryScanningPage(); - String pattern = "**/*.html"; - String path = "//div[@id='contentArea']/div/div[4]/table/tbody/tr[10]/td/code"; - assertElementPresent( path ); - Assert.assertEquals( getSelenium().getText( path ), pattern ); - clickDeleteIcon( pattern ); - assertElementNotPresent( path ); - } - - @Test( dependsOnMethods = { "testDeleteIndexableContent" } ) - public void testUpdateConsumers() - { - goToRepositoryScanningPage(); - checkField( "enabledKnownContentConsumers" ); - checkField( "//input[@name='enabledKnownContentConsumers' and @value='auto-rename']" ); - clickButtonWithValue( "Update Consumers" ); - assertPage( "Apache Archiva \\ Administration - Repository Scanning" ); - } - - @Test( dependsOnMethods = { "testUpdateConsumers" } ) - public void testUpdateConsumers_UnsetAll() - { - goToRepositoryScanningPage(); - getSelenium().uncheck( "enabledKnownContentConsumers" ); - getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='auto-rename']" ); - getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='create-missing-checksums']" ); - getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='index-content']" ); - getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='metadata-updater']" ); - getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='repository-purge']" ); - getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='validate-checksums']" ); - clickButtonWithValue( "Update Consumers" ); - - assertPage( "Apache Archiva \\ Administration - Repository Scanning" ); - } - - private void clickAddIcon( String fieldId ) - { - String xPath = "//preceding::td/input[@id='" + fieldId + "']//following::td/a/img"; - clickLinkWithLocator( xPath ); - } - - private void clickDeleteIcon( String pattern ) - { - String xPath = "//preceding::td/code[contains(text(),'" + pattern + "')]//following::td/a/img"; - clickLinkWithLocator( xPath ); - } - -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java deleted file mode 100644 index b51bc0694..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/RepositoryTest.java +++ /dev/null @@ -1,354 +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.AbstractRepositoryTest; -import org.testng.annotations.Test; - -@Test( groups = { "repository" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) -public class RepositoryTest - extends AbstractRepositoryTest -{ - @Test - public void testAddManagedRepoValidValues() - { - goToRepositoriesPage(); - getSelenium().open( "/archiva/admin/addRepository.action" ); - addManagedRepository( "managedrepo1", "Managed Repository Sample 1", getRepositoryDir() + "repository/", "", - "Maven 2.x Repository", "0 0 * * * ?", "", "", true ); - clickButtonWithValue( "Save" ); - assertTextPresent( "Managed Repository Sample 1" ); - assertRepositoriesPage(); - } - - @Test( dependsOnMethods = { "testAddManagedRepoValidValues" } ) - public void testAddManagedRepoInvalidValues() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "<> \\/~+[ ]'\"", "<>\\~+[]'\"", "<> ~+[ ]'\"", "<> ~+[ ]'\"", "Maven 2.x Repository", "", - "-1", "101", false ); - assertTextPresent( - "Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( - "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( - "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( - "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100." ); - assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0." ); - assertTextPresent( "Cron expression is required." ); - } - - @Test - public void testAddManagedRepoInvalidIdentifier() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "<> \\/~+[ ]'\"", "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", - "1", false ); - assertTextPresent( - "Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - } - - @Test - public void testAddManagedRepoInvalidRepoName() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "<>\\~+[]'\"", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", - "1", "1", false ); - assertTextPresent( - "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." ); - } - - @Test - public void testAddManagedRepoInvalidDirectory() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "name", "<> ~+[ ]'\"", "/.index", "Maven 2.x Repository", "0 0 * * * ?", - "1", "1", false ); - assertTextPresent( - "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - } - - @Test - public void testAddManagedRepoInvalidIndexDir() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "name", "/home", "<> ~+[ ]'\"", "Maven 2.x Repository", "0 0 * * * ?", "1", - "1", false ); - assertTextPresent( - "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - } - - @Test - public void testAddManagedRepoInvalidRetentionCount() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", - "101", false ); - assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100." ); - } - - @Test - public void testAddManagedRepoInvalidDaysOlder() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "-1", - "1", false ); - assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0." ); - } - - @Test - public void testAddManagedRepoBlankValues() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "", "", "", "", "Maven 2.x Repository", "", "", "", false ); - assertTextPresent( "You must enter a repository identifier." ); - assertTextPresent( "You must enter a repository name." ); - assertTextPresent( "You must enter a directory." ); - assertTextPresent( "Cron expression is required." ); - } - - @Test - public void testAddManagedRepoNoIdentifier() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "", "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "", false ); - assertTextPresent( "You must enter a repository identifier." ); - } - - @Test - public void testAddManagedRepoNoRepoName() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "", - false ); - assertTextPresent( "You must enter a repository name." ); - } - - @Test - public void testAddManagedRepoNoDirectory() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "name", "", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "", "", - false ); - assertTextPresent( "You must enter a directory." ); - } - - @Test - public void testAddManagedRepoNoCron() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - - addManagedRepository( "identifier", "name", "/home", "/.index", "Maven 2.x Repository", "", "", "", false ); - - assertTextPresent( "Cron expression is required." ); - } - - @Test - public void testAddManagedRepoForEdit() - { - getSelenium().open( "/archiva/admin/addRepository.action" ); - addManagedRepository( "managedrepo", "Managed Repository Sample", getRepositoryDir() + "local-repo/", "", - "Maven 2.x Repository", "0 0 * * * ?", "", "", true ); - clickButtonWithValue( "Save" ); - assertTextPresent( "Managed Repository Sample" ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidValues() - { - editManagedRepository( "<>\\~+[]'\"", "<> ~+[ ]'\"", "<> ~+[ ]'\"", "Maven 2.x Repository", "", "-1", "101" ); - assertTextPresent( - "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( - "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( - "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100." ); - assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0." ); - assertTextPresent( "Cron expression is required." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidRepoName() - { - editManagedRepository( "<>\\~+[]'\"", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "1" ); - assertTextPresent( - "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidDirectory() - { - editManagedRepository( "name", "<> ~+[ ]'\"", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "1" ); - assertTextPresent( - "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidIndexDir() - { - editManagedRepository( "name", "/home", "<> ~+[ ]'\"", "Maven 2.x Repository", "0 0 * * * ?", "1", "1" ); - assertTextPresent( - "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidCronBadText() - { - editManagedRepository( "name", "/home", "/.index", "Maven 2.x Repository", "asdf", "1", "1" ); - assertTextPresent( "Invalid cron expression." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidCronBadValue() - { - editManagedRepository( "name", "/home", "/.index", "Maven 2.x Repository", "60 0 * * * ?", "1", "1" ); - assertTextPresent( "Invalid cron expression." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidCronTooManyElements() - { - editManagedRepository( "name", "/home", "/.index", "Maven 2.x Repository", "* * * * * * * *", "1", "1" ); - assertTextPresent( "Invalid cron expression." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidRetentionCount() - { - editManagedRepository( "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "1", "101" ); - assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100." ); - } - - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepoInvalidDaysOlder() - { - editManagedRepository( "name", "/home", "/.index", "Maven 2.x Repository", "0 0 * * * ?", "-1", "1" ); - assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0." ); - } - - // TODO - @Test( dependsOnMethods = { "testAddManagedRepoForEdit" } ) - public void testEditManagedRepo() - { - editManagedRepository( "repository.name", "Managed Repo" ); - assertTextPresent( "Managed Repository Sample" ); - } - - // TODO - @Test( dependsOnMethods = { "testEditManagedRepo" }, enabled = false ) - public void testDeleteManageRepo() - { - deleteManagedRepository(); - // assertTextNotPresent( "managedrepo" ); - } - - @Test( dependsOnMethods = { "testAddRemoteRepoValidValues" } ) - public void testAddRemoteRepoNullValues() - { - getSelenium().open( "/archiva/admin/addRemoteRepository.action" ); - addRemoteRepository( "", "", "", "", "", "", "Maven 2.x Repository", false ); - assertTextPresent( "You must enter a repository identifier." ); - assertTextPresent( "You must enter a repository name." ); - assertTextPresent( "You must enter a url." ); - } - - @Test - public void testAddRemoteRepositoryNullIdentifier() - { - getSelenium().open( "/archiva/admin/addRemoteRepository.action" ); - addRemoteRepository( "", "Remote Repository Sample", "http://repository.codehaus.org/org/codehaus/mojo/", "", - "", "", "Maven 2.x Repository", false ); - assertTextPresent( "You must enter a repository identifier." ); - } - - @Test( dependsOnMethods = { "testAddRemoteRepositoryNullIdentifier" } ) - public void testAddRemoteRepoNullName() - { - addRemoteRepository( "remoterepo", "", "http://repository.codehaus.org/org/codehaus/mojo/", "", "", "", - "Maven 2.x Repository", false ); - assertTextPresent( "You must enter a repository name." ); - } - - @Test - public void testAddRemoteRepoNullURL() - { - getSelenium().open( "/archiva/admin/addRemoteRepository.action" ); - addRemoteRepository( "remoterepo", "Remote Repository Sample", "", "", "", "", "Maven 2.x Repository", false ); - assertTextPresent( "You must enter a url." ); - } - - @Test( dependsOnMethods = { "testAddRemoteRepoNullURL" } ) - public void testAddProxyConnectorValidValues() - throws Exception - { - getSelenium().open( "/archiva/admin/addProxyConnector.action" ); - addProxyConnector( "(direct connection)", "internal", "remoterepo" ); - assertTextPresent( "remoterepo" ); - assertTextPresent( "Remote Repository Sample" ); - } - - @Test - public void testAddRemoteRepoValidValues() - { - getSelenium().open( "/archiva/admin/addRemoteRepository.action" ); - addRemoteRepository( "remoterepo", "Remote Repository Sample", - "http://repository.codehaus.org/org/codehaus/mojo/", "", "", "", "Maven 2.x Repository", - true ); - assertTextPresent( "Remote Repository Sample" ); - } - - // *** BUNDLED REPOSITORY TEST *** - - @Test( dependsOnMethods = { "testWithCorrectUsernamePassword" }, alwaysRun = true ) - public void testBundledRepository() - { - String repo1 = baseUrl + "repository/internal/"; - String repo2 = baseUrl + "repository/snapshots/"; - - assertRepositoryAccess( repo1 ); - assertRepositoryAccess( repo2 ); - - getSelenium().open( "/archiva" ); - } - - private void assertRepositoryAccess( String repo ) - { - getSelenium().open( "/archiva" ); - goToRepositoriesPage(); - assertLinkPresent( repo ); - clickLinkWithText( repo ); - assertPage( "Collection: /" ); - assertTextPresent( "Collection: /" ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java deleted file mode 100644 index 7f61dc033..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/SearchTest.java +++ /dev/null @@ -1,141 +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.AbstractSearchTest; -import org.testng.annotations.Test; - -@Test( groups = { "search" }, dependsOnGroups = { "about" }, sequential = true ) -public class SearchTest - extends AbstractSearchTest -{ - - @Test( alwaysRun = true ) - public void testSearchNonExistingArtifact() - throws Exception - { - searchForArtifact( getProperty( "SEARCH_BAD_ARTIFACT" ) ); - assertTextPresent( "No results found" ); - } - - // TODO: make search tests more robust especially when comparing/asserting number of hits - @Test( alwaysRun = true ) - public void testSearchExistingArtifact() - { - searchForArtifact( "artifactId:" + getProperty( "ARTIFACT_ARTIFACTID" ) ); - //assertTextPresent( "Results" ); - assertElementPresent( "resultsBox" ); - assertTextPresent( "1 to 1 of 1" ); - assertLinkPresent( "test" ); - } - - @Test( alwaysRun = true ) - public void testViewSearchedArtifact() - { - searchForArtifact( getProperty( "ARTIFACT_ARTIFACTID" ) ); - clickLinkWithLocator( "//span[@class=\"artifact-title\"]/a[text()='" + getProperty( "ARTIFACT_ARTIFACTID" ) + "']" ); - assertPage( "Apache Archiva \\ Browse Repository" ); - assertTextPresent( getProperty( "ARTIFACT_ARTIFACTID" ) ); - clickLinkWithText( getProperty( "ARTIFACT_VERSION" ) + "/" ); - assertPage( "Apache Archiva \\ Browse Repository" ); - } - - @Test( alwaysRun = true ) - public void testSearchWithMultipleKeywords() - { - String groupId = getProperty( "ADD_REMOVE_GROUPID" ); - String version = getProperty( "SNAPSHOT_VERSION" ); - String packaging = getProperty( "SNAPSHOT_PACKAGING" ); - String filePath = getProperty( "SNAPSHOT_ARTIFACTFILEPATH" ); - String repoId = getProperty( "SNAPSHOT_REPOSITORYID" ); - - String existingArtifactId = getProperty( "ADD_REMOVE_ARTIFACTID" ); - String multiKeywords = existingArtifactId.replace( "-", " " ); - - addArtifact( groupId, existingArtifactId, version, packaging, filePath, repoId, true ); - - // verify artifact is existing - searchForArtifact( existingArtifactId ); - assertTextPresent( "Results" ); - assertTextPresent( "Hits: 1 to 1 of 1" ); - assertLinkPresent( existingArtifactId ); - - // search for existing artifact using multiple keywords - searchForArtifact( multiKeywords ); - assertTextPresent( "Results" ); - assertTextPresent( "Hits: 1 to 1 of 1" ); - assertLinkPresent( existingArtifactId ); - } - - @Test( alwaysRun = true ) - public void testSearchNonExistingArtifactInAdvancedSearch() - { - searchForArtifactAdvancedSearch( null, getProperty( "SEARCH_BAD_ARTIFACT" ), null, null, null, null ); - assertTextPresent( "No results found" ); - } - - @Test( alwaysRun = true ) - public void testSearchNoSearchCriteriaSpecifiedInAdvancedSearch() - { - searchForArtifactAdvancedSearch( null, null, null, null, null, null ); - assertTextPresent( "Advanced Search - At least one search criteria must be provided." ); - } - - @Test( alwaysRun = true ) - public void testSearchExistingArtifactUsingAdvancedSearchArtifactId() - { - searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, - getProperty( "REPOSITORYID" ), null, null ); - assertTextPresent( "Results" ); - assertTextPresent( "Hits: 1 to 1 of 1" ); - assertLinkPresent( "test" ); - } - - @Test( alwaysRun = true ) - public void testSearchExistingArtifactUsingAdvancedSearchGroupId() - { - searchForArtifactAdvancedSearch( getProperty( "GROUPID" ), null, null, getProperty( "REPOSITORYID" ), null, - null ); - assertTextPresent( "Results" ); - assertTextPresent( "Hits: 1 to 1 of 1" ); - assertLinkPresent( "test" ); - } - - @Test( alwaysRun = true ) - public void testSearchExistingArtifactAllCriteriaSpecifiedInAdvancedSearch() - { - searchForArtifactAdvancedSearch( getProperty( "GROUPID" ), getProperty( "ARTIFACT_ARTIFACTID" ), - getProperty( "ARTIFACT_VERSION" ), getProperty( "REPOSITORYID" ), - getProperty( "ARTIFACT_CLASSNAME" ), null ); - assertTextPresent( "Results" ); - assertTextPresent( "Hits: 1 to 1 of 1" ); - assertLinkPresent( "test" ); - } - - @Test( alwaysRun = true ) - public void testSearchExistingArtifactUsingAdvancedSearchNotInRepository() - { - searchForArtifactAdvancedSearch( null, getProperty( "ARTIFACT_ARTIFACTID" ), null, "snapshots", null, null ); - assertTextPresent( "No results found" ); - assertTextNotPresent( "Results" ); - assertTextNotPresent( "Hits: 1 to 1 of 1" ); - assertLinkNotPresent( "test" ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java deleted file mode 100644 index 3aa365896..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/UserRolesTest.java +++ /dev/null @@ -1,242 +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 = {"userroles"}, dependsOnMethods = {"testWithCorrectUsernamePassword"} ) -public class UserRolesTest - extends AbstractArchivaTest -{ - - private static final String EDIT_ROLES = "Roles"; - - public void testBasicAddDeleteUser() - { - username = getProperty( "GUEST_USERNAME" ); - fullname = getProperty( "GUEST_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - deleteUser( username, fullname, getUserEmail() ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - @Test( dependsOnMethods = {"testBasicAddDeleteUser"} ) - public void testUserWithGuestRole() - { - username = getProperty( "GUEST_USERNAME" ); - fullname = getProperty( "GUEST_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkUserRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - assertTextPresent( "Password successfully changed" ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - @Test( dependsOnMethods = {"testUserWithGuestRole"} ) - public void testUserWithRegisteredUserRole() - { - username = getProperty( "REGISTERED_USERNAME" ); - fullname = getProperty( "REGISTERED_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkUserRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - assertTextPresent( "Password successfully changed" ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - @Test( dependsOnMethods = {"testUserWithRegisteredUserRole"} ) - public void testUserWithSysAdminUserRole() - { - username = getProperty( "SYSAD_USERNAME" ); - fullname = getProperty( "SYSAD_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkUserRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - assertTextPresent( "Password successfully changed" ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - @Test( dependsOnMethods = {"testUserWithSysAdminUserRole"} ) - public void testUserWithUserAdminUserRole() - { - username = getProperty( "USERADMIN_USERNAME" ); - fullname = getProperty( "USERADMIN_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkUserRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - assertTextPresent( "Password successfully changed" ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - @Test( dependsOnMethods = {"testUserWithUserAdminUserRole"} ) - public void testUserWithGlobalRepoManagerRole() - { - username = getProperty( "GLOBALREPOMANAGER_USERNAME" ); - fullname = getProperty( "GLOBALREPOMANAGER_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkUserRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - assertTextPresent( "Password successfully changed" ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - @Test( dependsOnMethods = {"testUserWithGlobalRepoManagerRole"} ) - public void testUserWithGlobalRepoObserverRole() - { - username = getProperty( "GLOBALREPOOBSERVER_USERNAME" ); - fullname = getProperty( "GLOBALREPOOBSERVER_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkUserRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - assertTextPresent( "Password successfully changed" ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - @Test( dependsOnMethods = {"testUserWithGlobalRepoObserverRole"} ) - public void testUserWithRepoManagerInternalRole() - { - username = getProperty( "REPOMANAGER_INTERNAL_USERNAME" ); - fullname = getProperty( "REPOMANAGER_INTERNAL_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkResourceRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - assertTextPresent( "Password successfully changed" ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - /* - * @Test (dependsOnMethods = { "testUserWithRepoManagerInternalRole" } ) public void - * testUserWithRepoManagerSnapshotsRole() { username = getProperty("REPOMANAGER_SNAPSHOTS_USERNAME"); fullname = - * getProperty("REPOMANAGER_SNAPSHOTS_FULLNAME"); createUser(username, fullname, getUserEmail(), - * getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); - * checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); clickLinkWithText("Logout"); - * login(username, getUserRolePassword()); changePassword( getUserRolePassword(), getUserRoleNewPassword()); // this - * section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); - * clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); login(username, - * getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( - * getAdminUsername() , getAdminPassword() ); } - */ - - @Test( dependsOnMethods = {"testUserWithRepoManagerInternalRole"} ) - public void testUserWithRepoObserverInternalRole() - { - username = getProperty( "REPOOBSERVER_INTERNAL_USERNAME" ); - fullname = getProperty( "REPOOBSERVER_INTERNAL_FULLNAME" ); - - createUser( username, fullname, getUserEmail(), getUserRolePassword(), true ); - clickLinkWithText( username ); - clickLinkWithText( EDIT_ROLES ); - checkResourceRoleWithValue( fullname ); - clickButtonWithValue( "Submit" ); - - logout(); - login( username, getUserRolePassword() ); - changePassword( getUserRolePassword(), getUserRoleNewPassword() ); - - // this section will be removed if issue from redback after changing password will be fixed. - getSelenium().goBack(); - logout(); - // assertTextPresent("You are already logged in."); - - login( username, getUserRoleNewPassword() ); - assertLeftNavMenuWithRole( fullname ); - logout(); - login( getAdminUsername(), getAdminPassword() ); - } - - /* - * @Test (dependsOnMethods = { "testUserWithRepoObserverInternalRole" } ) public void - * testUserWithRepoObserverSnapshotsRole() { username = getProperty( "REPOOBSERVER_SNAPSHOTS_USERNAME" ); fullname = - * getProperty( "REPOOBSERVER_SNAPSHOTS_FULLNAME" ); createUser(username, fullname, getUserEmail(), - * getUserRolePassword(), true); clickLinkWithText( username ); clickLinkWithText( "Edit Roles" ); - * checkResourceRoleWithValue( fullname ); clickButtonWithValue( "Submit" ); clickLinkWithText("Logout"); - * login(username, getUserRolePassword()); changePassword( getUserRolePassword(), getUserRoleNewPassword()); // this - * section will be removed if issue from redback after changing password will be fixed. getSelenium().goBack(); - * clickLinkWithText("Logout"); //assertTextPresent("You are already logged in."); login(username, - * getUserRoleNewPassword()); assertLeftNavMenuWithRole( fullname ); clickLinkWithText("Logout"); login( - * getAdminUsername() , getAdminPassword() ); } - */ -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java deleted file mode 100644 index 9df08da44..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/VirtualRepositoryTest.java +++ /dev/null @@ -1,70 +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.AbstractRepositoryTest; -import org.testng.annotations.Test; -import org.testng.Assert; - -@Test( groups = { "virtualrepository" }, dependsOnMethods = { "testWithCorrectUsernamePassword" } ) -public class VirtualRepositoryTest - extends AbstractRepositoryTest -{ - @Test - public void testAddRepositoryGroupNullValue() - { - addRepositoryGroup( " ", false ); - assertTextPresent( "Identifier field is required." ); - } - - @Test( dependsOnMethods = { "testWithCorrectUsernamePassword" } ) - public void testAddRepositoryGroupValidValue() - { - addRepositoryGroup( "testing", true ); - Assert.assertEquals( getSelenium().getText( "//div[@id='contentArea']/div[2]/div/div[1]/p[1]" ), "testing" ); - } - - @Test( dependsOnMethods = { "testAddRepositoryGroupValidValue" } ) - public void testAddRepositoryToRepositoryGroup() - { - addRepositoryToRepositoryGroup( "testing", "internal" ); - Assert.assertEquals( getSelenium().getText( "//div[@id='contentArea']/div[2]/div/div[3]/div[2]/p[1]" ), - "internal" ); - } - - @Test( dependsOnMethods = { "testAddRepositoryToRepositoryGroup" } ) - public void testDeleteRepositoryOfRepositoryGroup() - { - goToRepositoryGroupsPage(); - deleteRepositoryInRepositoryGroups(); - assertTextPresent( "Repository Groups" ); - assertTextNotPresent( "No Repository Groups Defined." ); - Assert.assertFalse( getSelenium().isElementPresent( "//div[@id='contentArea']/div[2]/div/div[3]/div[2]/p[1]" ) ); - } - - @Test( dependsOnMethods = { "testDeleteRepositoryOfRepositoryGroup" } ) - public void testDeleteRepositoryGroup() - { - goToRepositoryGroupsPage(); - deleteRepositoryGroup( "testing" ); - assertTextPresent( "No Repository Groups Defined." ); - } - -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XPathExpressionUtil.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XPathExpressionUtil.java deleted file mode 100644 index 5dd77ca83..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XPathExpressionUtil.java +++ /dev/null @@ -1,242 +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. - */ - -/** - * Utility class for creating xpath expressions - */ -public class XPathExpressionUtil -{ - public static final String CONTAINS = "contains"; - - public static final String AND = " and "; - - public static final String CURRENT_NODE = "./"; - - public static final String PARENT_NODE = "../"; - - public static final String GRANDPARENT_NODE = "../../"; - - public static final String ELEMENT_ANY_LEVEL = "//"; - - public static final String TABLE_COLUMN = "td"; - - public static final String TABLE_ROW = "tr"; - - public static final String START_NODE_TEST = "["; - - public static final String END_NODE_TEST = "]"; - - public static final String ANCHOR = "a"; - - public static final String IMG = "img"; - - public static final String LIST = "ul"; - - public static final String LINE = "li"; - - public static String getList( String[] values ) - { - String xpathExpression = ""; - - if ( values.length > 0 ) - { - xpathExpression += ELEMENT_ANY_LEVEL; - xpathExpression += LIST; - xpathExpression += START_NODE_TEST; - - for ( int nIndex = 0; nIndex < values.length; nIndex++ ) - { - xpathExpression += ( ( nIndex > 0 ) ? AND : "" ); - xpathExpression += contains( LINE + position( nIndex + 1 ), values[nIndex] ); - } - - xpathExpression += END_NODE_TEST; - } - - return xpathExpression; - } - - /** - * expression for acquiring an element in one of the table columns - * - * @param element the node element - * @param elementIndex column index of the element, used for skipping - * @param columnValues the values to be matched in each column, element column is included - * @return - */ - public static String getColumnElement( String element, int elementIndex, String[] columnValues ) - { - return getColumnElement( element, elementIndex, null, columnValues ); - } - - /** - * expression for acquiring an element in one of the table columns - * - * @param element the node element - * @param elementIndex column index of the element, used for skipping - * @param elementValue the matched element value - * @param columnValues the values to be matched in each column, element column is included - * @return - */ - public static String getColumnElement( String element, int elementIndex, String elementValue, String[] columnValues ) - { - return getColumnElement( element, elementIndex, elementValue, "TEXT", columnValues ); - } - - /** - * expression for acquiring an element in one of the table columns - * - * @param element the node element - * @param elementIndex column index of the element, used for skipping - * @param imageName the matched image name - * @param columnValues the values to be matched in each column, element column is included - * @return - */ - public static String getImgColumnElement( String element, int elementIndex, String imageName, String[] columnValues ) - { - return getColumnElement( element, elementIndex, imageName, IMG, columnValues ); - } - - /** - * expression for acquiring an element in one of the table columns - * - * @param element the node element - * @param elementIndex column index of the element, used for skipping - * @param imageName the matched image name - * @param columnValues the values to be matched in each column, element column is included - * @return - */ - private static String getColumnElement( String element, int elementIndex, String elementValue, - String elementValueType, String[] columnValues ) - { - String xpathExpression = null; - - if ( ( columnValues != null ) && ( columnValues.length > 0 ) ) - { - xpathExpression = ELEMENT_ANY_LEVEL + element; - xpathExpression += START_NODE_TEST; - - if ( elementValue != null ) - { - if ( "TEXT".equals( elementValueType ) ) - { - xpathExpression += contains( elementValue ); - xpathExpression += ( columnValues.length > 0 ) ? AND : ""; - } - } - - // we are two levels below the table row element ( tr/td/ ) - xpathExpression += matchColumns( GRANDPARENT_NODE, columnValues, elementIndex ); - - xpathExpression += END_NODE_TEST; - } - - if ( IMG.equals( elementValueType ) ) - { - xpathExpression += "/img[contains(@src, '" + elementValue + "')]"; - } - - return xpathExpression; - } - - /** - * expression for acquiring the table row that matches all column values with the same order as the list - * - * @param columnValues the matched list of columnValues - * @return - */ - public static String getTableRow( String[] columnValues ) - { - String xpathExpression = null; - - if ( ( columnValues != null ) && ( columnValues.length > 0 ) ) - { - xpathExpression = new String( ELEMENT_ANY_LEVEL + TABLE_ROW + START_NODE_TEST ); - xpathExpression += matchColumns( columnValues ); - xpathExpression += END_NODE_TEST; - } - - return xpathExpression; - } - - private static String matchColumns( String[] columnValues ) - { - return matchColumns( columnValues, -1 ); - } - - private static String matchColumns( String[] columnValues, int skipIndex ) - { - return matchColumns( null, columnValues, skipIndex ); - } - - private static String matchColumns( String parent, String[] columnValues, int skipIndex ) - { - String xpathExpression = ""; - - for ( int nIndex = 0; nIndex < columnValues.length; nIndex++ ) - { - if ( ( skipIndex != nIndex ) || ( skipIndex == -1 ) ) - { - // prepend "and" if index > 0 - xpathExpression += ( ( nIndex > 0 ) ? AND : "" ); - xpathExpression += contains( parent, TABLE_COLUMN + position( nIndex + 1 ), columnValues[nIndex] ); - } - } - - return xpathExpression; - } - - private static String position( int nIndex ) - { - return new String( "[" + nIndex + "]" ); - } - - private static String contains( String parent, String element, String matchedString ) - { - String finalElement = ( parent != null ) ? parent : ""; - finalElement += element; - - return contains( finalElement, matchedString ); - } - - private static String contains( String matchedString ) - { - return contains( ".", matchedString ); - } - - private static String contains( String axis, String matchedString ) - { - return new String( CONTAINS + "(" + axis + "," + "'" + matchedString + "')" ); - } - - private static String equals( String parent, String element, String matchedString ) - { - String finalElement = ( parent != null ) ? parent : ""; - finalElement += element; - - return equals( finalElement, matchedString ); - } - - private static String equals( String axis, String matchedString ) - { - return new String( axis + "==" + "'" + matchedString + "'" ); - } -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XSSSecurityTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XSSSecurityTest.java deleted file mode 100644 index 0f05752c9..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/XSSSecurityTest.java +++ /dev/null @@ -1,254 +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 XSS security issue. - */ -@Test( groups = { "xss" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) -public class XSSSecurityTest - extends AbstractArchivaTest -{ - public void testDeleteArtifactImmunityToURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/deleteArtifact!doDelete.action?groupId=\"/>1&artifactId=\"/>1&version=\"/>1&repositoryId=\"/>1" ); - assertDeleteArtifactPage(); - assertTextPresent( "Invalid version." ); - assertTextPresent( - "User is not authorized to delete artifacts in repository '\"/>1'." ); - 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( - "Repository id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertElementValue( "//input[@id='deleteArtifact_groupId']", "\"/>1" ); - assertElementValue( "//input[@id='deleteArtifact_artifactId']", "\"/>1" ); - assertElementValue( "//input[@id='deleteArtifact_version']", "\"/>1" ); - assertElementValue( "//select[@id='deleteArtifact_repositoryId']", "internal" ); - } - - public void testDeleteArtifactImmunityToEncodedURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/deleteArtifact!doDelete.action?groupId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&artifactId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&version=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&repositoryId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E" ); - assertDeleteArtifactPage(); - assertTextPresent( "Invalid version." ); - assertTextPresent( - "User is not authorized to delete artifacts in repository '\"/>1'." ); - 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( - "Repository id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertElementValue( "//input[@id='deleteArtifact_groupId']", "\"/>1" ); - assertElementValue( "//input[@id='deleteArtifact_artifactId']", "\"/>1" ); - assertElementValue( "//input[@id='deleteArtifact_version']", "\"/>1" ); - assertElementValue( "//select[@id='deleteArtifact_repositoryId']", "internal" ); - } - - public void testEditAppearanceImmunityToURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/admin/configureAppearance.action?organisationName=&organisationUrl=&organisationLogo=" ); - assertAppearancePage(); - assertXpathCount( "//td[text()=\"\"]", 1 ); - assertXpathCount( "//code[text()=\"\"]", 2 ); - - } - - public void testEditAppearanceImmunityToEncodedURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/admin/configureAppearance.action?organisationName=%3Cscript%3Ealert('xss')%3C%2Fscript%3E&organisationUrl=%3Cscript%3Ealert('xss')%3C%2Fscript%3E&organisationLogo=%3Cscript%3Ealert('xss')%3C%2Fscript%3E" ); - assertAppearancePage(); - assertXpathCount( "//td[text()=\"\"]", 1 ); - assertXpathCount( "//code[text()=\"\"]", 2 ); - } - - public void testAddLegacyArtifactImmunityToURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/admin/addLegacyArtifactPath!commit.action?legacyArtifactPath.path=\"/>1&groupId=\"/>1&artifactId=\"/>1&version=\"/>1&classifier=\"/>1&type=\"/>1" ); - assertAddLegacyArtifactPathPage(); - 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(-)." ); - assertElementValue( "//input[@id='addLegacyArtifactPath_legacyArtifactPath_path']", - "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_artifactId']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_version']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_groupId']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_classifier']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_type']", "\"/>1" ); - } - - public void testAddLegacyArtifactImmunityToEncodedURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/admin/addLegacyArtifactPath!commit.action?legacyArtifactPath.path=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&groupId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&artifactId=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&version=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&classifier=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E&type=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E" ); - assertAddLegacyArtifactPathPage(); - 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(-)." ); - assertElementValue( "//input[@id='addLegacyArtifactPath_legacyArtifactPath_path']", - "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_artifactId']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_version']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_groupId']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_classifier']", "\"/>1" ); - assertElementValue( "//input[@id='addLegacyArtifactPath_type']", "\"/>1" ); - } - - public void testDeleteNetworkProxyImmunityToURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/admin/deleteNetworkProxy!confirm.action?proxyid=\"/>1" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - public void testDeleteNetworkProxyImmunityToEncodedURLCrossSiteScripting() - { - getSelenium().open( - "/archiva/admin/deleteNetworkProxy!confirm.action?proxyid=%22%2F%3E1%3Cscript%3Ealert('xss')%3C%2Fscript%3E" ); - assertTextPresent( "Security Alert - Invalid Token Found" ); - assertTextPresent( "Possible CSRF attack detected! Invalid token found in the request." ); - } - - @Test - public void testAddManagedRepositoryImmunityToInputFieldCrossSiteScripting() - { - // TODO: these are evaluated client side now - we should force it to do server-side to make sure (though this could probably be tested in the webapp tests instead) - getSelenium().open( "/archiva/admin/addRepository.action" ); - addManagedRepository( "test\">", "test\">", - "test\">", "test\">", - "Maven 2.x Repository", "", "-1", "101", false ); - // xss inputs are blocked by validation. - assertTextPresent( - "Identifier must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( - "Directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( - "Repository Name must only contain alphanumeric characters, white-spaces(' '), forward-slashes(/), open-parenthesis('('), close-parenthesis(')'), underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( - "Index directory must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( "Repository Purge By Retention Count needs to be between 1 and 100." ); - assertTextPresent( "Repository Purge By Days Older Than needs to be larger than 0." ); - assertTextPresent( "Cron expression is required." ); - } - - @Test - public void testAddManagedRepositoryImmunityToInputFieldCrossSiteScriptingCron() - { - // separate test because cron is evaluated server side, not client side - getSelenium().open( "/archiva/admin/addRepository.action" ); - addManagedRepository( "id", "name", "/home", "/.index", "Maven 2.x Repository", - "", "1", "1", true ); - assertTextPresent( "Invalid cron expression." ); - } - - public void testEditAppearanceImmunityToInputFieldCrossSiteScripting() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "test", "test", - "test", false ); - // xss inputs are blocked by validation. - 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." ); - } - - public void testEditAppearanceImmunityToCrossSiteScriptingRendering() - { - goToAppearancePage(); - clickLinkWithText( "Edit" ); - addEditAppearance( "xss", "http://\">test", - "http://\">test", false ); - // escaped html/url prevents cross-site scripting exploits -// assertXpathCount( "//td[text()=\"xss\"]", 1 ); -// assertXpathCount( "//code[text()='http://\">test']", 2 ); - // Javascript catches this instead now - assertTextPresent( "You must enter a URL." ); - assertTextPresent( "You must enter a URL for your logo." ); - } - - public void testAddLegacyArtifactPathImmunityToInputFieldCrossSiteScripting() - { - goToLegacySupportPage(); - clickLinkWithText( "Add" ); - addLegacyArtifactPath( "test", "test", - "test", "test", - "test", "test", false ); - // xss inputs are blocked by validation. - 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 testAddNetworkProxyImmunityToInputFieldCrossSiteScripting() - { - goToNetworkProxiesPage(); - addNetworkProxy( "test", "test", - "test", "test", - "test", "" ); - // xss inputs are blocked by validation. - assertTextPresent( - "Proxy id must only contain alphanumeric characters, underscores(_), dots(.), and dashes(-)." ); - assertTextPresent( - "Protocol must only contain alphanumeric characters, forward-slashes(/), back-slashes(\\), dots(.), colons(:), and dashes(-)." ); - assertTextPresent( - "Host must only contain alphanumeric characters, equals(=), question-marks(?), exclamation-points(!), ampersands(&), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), colons(:), tildes(~), and dashes(-)." ); - assertTextPresent( "Invalid field value for field \"proxy.port\"." ); - assertTextPresent( - "Username must only contain alphanumeric characters, at's(@), forward-slashes(/), back-slashes(\\), underscores(_), dots(.), and dashes(-)." ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java deleted file mode 100644 index 1cc89ed76..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/listener/CaptureScreenShotsListener.java +++ /dev/null @@ -1,109 +0,0 @@ -package org.apache.archiva.web.test.listener; - -/* - * 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 com.thoughtworks.selenium.Selenium; -import org.apache.archiva.web.test.parent.AbstractSeleniumTest; -import org.apache.commons.io.FileUtils; -import org.testng.ITestResult; -import org.testng.TestListenerAdapter; - -import java.io.File; -import java.io.IOException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.regex.Pattern; - -public class CaptureScreenShotsListener - extends TestListenerAdapter -{ - @Override - public void onTestSkipped( ITestResult tr ) - { - System.out.println( "Test " + tr.getName() + " -> Skipped" ); - super.onTestSkipped( tr ); - } - - @Override - public void onTestFailure( ITestResult tr ) - { - captureError( tr ); - System.out.println( "Test " + tr.getName() + " -> Failed" ); - super.onTestFailure( tr ); - } - - @Override - public void onTestSuccess( ITestResult tr ) - { - System.out.println( "Test " + tr.getName() + " -> Success" ); - super.onTestFailure( tr ); - } - - private void captureError( ITestResult tr ) - { - SimpleDateFormat sdf = new SimpleDateFormat( "yyyy.MM.dd-HH_mm_ss" ); - String time = sdf.format( new Date() ); - File targetPath = new File( "target", "screenshots" ); - StackTraceElement stackTrace[] = tr.getThrowable().getStackTrace(); - String cName = tr.getTestClass().getName(); - int index = getStackTraceIndexOfCallingClass( cName, stackTrace ); - String methodName = stackTrace[index].getMethodName(); - int lNumber = stackTrace[index].getLineNumber(); - String lineNumber = Integer.toString( lNumber ); - String className = cName.substring( cName.lastIndexOf( '.' ) + 1 ); - targetPath.mkdirs(); - Selenium selenium = AbstractSeleniumTest.getSelenium(); - String fileBaseName = methodName + "_" + className + ".java_" + lineNumber + "-" + time; - try - { - selenium.windowMaximize(); - File fileName = new File( targetPath, fileBaseName + ".png" ); - selenium.captureEntirePageScreenshot( fileName.getAbsolutePath(), "background=#FFFFFF" ); - } - catch ( RuntimeException e ) - { - System.out.println( "Error when take screenshot for test " + tr.getName() + ": " + e.getMessage() ); - } - try - { - File fileName = new File( targetPath, fileBaseName + ".html" ); - FileUtils.writeStringToFile( fileName, selenium.getHtmlSource() ); - } - catch ( IOException ioe ) - { - System.out.println( ioe.getMessage() ); - } - } - - private int getStackTraceIndexOfCallingClass( String nameOfClass, StackTraceElement stackTrace[] ) - { - boolean match = false; - int i = 0; - do - { - String className = stackTrace[i].getClassName(); - match = Pattern.matches( nameOfClass, className ); - i++; - } - while ( match == false ); - i--; - return i; - } -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java deleted file mode 100644 index bf02d1f6c..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArchivaTest.java +++ /dev/null @@ -1,746 +0,0 @@ -package org.apache.archiva.web.test.parent; - -import org.apache.archiva.web.test.XPathExpressionUtil; - -import java.io.File; -import java.io.IOException; - -/* - * 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. - */ - -public abstract class AbstractArchivaTest - extends AbstractSeleniumTest -{ - protected String username; - - protected String fullname; - - protected static String getErrorMessageText() - { - return getSelenium().getText( "//ul[@class='errorMessage']/li/span" ); - } - - public String getUserEmail() - { - String email = getProperty( "USERROLE_EMAIL" ); - return email; - } - - public String getUserRolePassword() - { - String password = getProperty( "USERROLE_PASSWORD" ); - return password; - } - - public String getUserRoleNewPassword() - { - String password_new = getProperty( "NEW_USERROLE_PASSWORD" ); - return password_new; - } - - public String getBasedir() - { - String basedir = System.getProperty( "basedir" ); - - if ( basedir == null ) - { - basedir = new File( "" ).getAbsolutePath(); - } - - return basedir; - } - - public String getAdminUsername() - { - String adminUsername = getProperty( "ADMIN_USERNAME" ); - return adminUsername; - } - - public String getAdminPassword() - { - String adminPassword = getProperty( "ADMIN_PASSWORD" ); - return adminPassword; - } - - public void assertCreateAdmin() - { - assertElementPresent( "adminCreateForm" ); - //assertPage( "Apache Archiva \\ Create Admin User" ); - //assertTextPresent( "Username" ); - assertFieldValue( "admin", "user.username" ); - //assertTextPresent( "Full Name*" ); - assertElementPresent( "user.fullName" ); - //assertTextPresent( "Email Address*" ); - assertElementPresent( "user.email" ); - //assertTextPresent( "Password*" ); - assertElementPresent( "user.password" ); - //assertTextPresent( "Confirm Password*" ); - assertElementPresent( "user.confirmPassword" ); - //assertButtonWithValuePresent( "Create Admin" ); - } - - public void submitAdminData( String fullname, String email, String password ) - { - setFieldValue( "user.fullName", fullname ); - setFieldValue( "user.email", email ); - setFieldValue( "user.password", password ); - setFieldValue( "user.confirmPassword", password ); - submit(); - } - - // Go to Login Page - public void goToLoginPage() - { - getSelenium().open( baseUrl ); - // are we already logged in ? - if ( isElementPresent( "logoutLink" ) ) - { - // so logout - clickLinkWithLocator( "logoutLink" ); - clickLinkWithLocator( "loginLink" ); - } - else if ( isElementPresent( "loginLink" ) ) - { - clickLinkWithLocator( "loginLink" ); - } - assertLoginPage(); - } - - public void submitUserData( String username, String password, boolean rememberme, boolean success ) - { - - setFieldValue( "username", username ); - setFieldValue( "password", password ); - if ( rememberme ) - { - checkField( "rememberMe" ); - } - - submit(); - if ( success ) - { - assertUserLoggedIn( username ); - } - else - { - assertLoginPage(); - } - } - - public void assertLoginPage() - { - //assertPage( "Apache Archiva \\ Login Page" ); - //assertTextPresent( "Login" ); - assertElementPresent( "loginForm" ); - //assertTextPresent( "Register" ); - assertElementPresent( "registerLink" ); - //assertTextPresent( "Username" ); - assertElementPresent( "username" ); - //assertTextPresent( "Password" ); - assertElementPresent( "password" ); - //assertTextPresent( "Remember Me" ); - assertElementPresent( "rememberMe" ); - //assertButtonWithValuePresent( "Login" ); - assertButtonWithIdPresent( "loginSubmit" ); - //assertButtonWithValuePresent( "Cancel" ); - assertButtonWithIdPresent( "loginCancel" ); - //assertTextPresent( "Need an Account? Register!" ); - //assertTextPresent( "Forgot your Password? Request a password reset." ); - assertElementPresent( "registerLinkLoginPage" ); - assertElementPresent( "forgottenPasswordLink" ); - } - - // User Management - public void goToUserManagementPage() - { - getSelenium().open( "/archiva/security/userlist.action" ); - assertUserManagementPage(); - } - - public void assertUserManagementPage() - { - assertPage( "Apache Archiva \\ [Admin] User List" ); - assertTextPresent( "[Admin] List of Users in Role: Any" ); - assertTextPresent( "Navigation" ); - assertImgWithAlt( "First" ); - assertImgWithAlt( "Prev" ); - assertImgWithAlt( "Next" ); - assertImgWithAlt( "Last" ); - assertTextPresent( "Display Rows" ); - assertTextPresent( "Username" ); - assertTextPresent( "Full Name" ); - assertTextPresent( "Email" ); - assertTextPresent( "Permanent" ); - assertTextPresent( "Validated" ); - assertTextPresent( "Locked" ); - assertTextPresent( "Tasks" ); - assertTextPresent( "Tools" ); - assertTextPresent( "Tasks" ); - assertTextPresent( "The following tools are available for administrators to manipulate the user list." ); - assertButtonWithValuePresent( "Create New User" ); - assertButtonWithValuePresent( "Show Users In Role" ); - assertElementPresent( "roleName" ); - assertTextPresent( "Reports" ); - assertTextPresent( "Name" ); - assertTextPresent( "Types" ); - assertTextPresent( "User List" ); - assertTextPresent( "Roles Matrix" ); - } - - /* - * //User Role public void goToUserRolesPage() { clickLinkWithText( "User Roles" ); assertUserRolesPage(); } - */ - - public void assertUserRolesPage() - { - //assertPage( "Apache Archiva \\ [Admin] User Edit" ); - //[Admin] Rôles de l'utilisateur - - assertTextPresent( "[Admin] User Roles", "[Admin] R\u00F4les de l'utilisateur" ); - assertTextPresent( "Username", "Nom d'utilisateur" ); - assertTextPresent( "Full Name", "Nom complet" ); - String userRoles = - "Guest,Registered User,System Administrator,User Administrator,Global Repository Observer,Global Repository Manager,Repository Observer,Repository Manager,internal"; - String[] arrayRole = userRoles.split( "," ); - for ( String userroles : arrayRole ) - { - assertTextPresent( userroles ); - } - } - - public void assertDeleteUserPage( String username ) - { - assertTextPresent( "[Admin] User Delete", "[Admin] Suppression de l'utilisateur", "L'utilisateur suivant va \u00EAtre supprim\u00E9:" ); - assertTextPresent( "The following user will be deleted:" ); - assertTextPresent( "Username: " + username , "Nom d'utilisateur:" + username); - assertButtonWithIdPresent( "userDeleteSubmit" ); - } - - public void createUser( String userName, String fullName, String email, String password, boolean valid ) - { - createUser( userName, fullName, email, password, password, valid ); - } - - private void createUser( String userName, String fullName, String emailAd, String password, String confirmPassword, - boolean valid ) - { - // login( getAdminUsername() , getAdminPassword() ); - getSelenium().open( "/archiva/security/userlist.action" ); - clickButtonWithLocator( "userCreateButton", true ); - //clickButtonWithValue( "Create New User" ); - assertCreateUserPage(); - setFieldValue( "user.username", userName ); - setFieldValue( "user.fullName", fullName ); - setFieldValue( "user.email", emailAd ); - setFieldValue( "user.password", password ); - setFieldValue( "user.confirmPassword", confirmPassword ); - submit(); - - assertUserRolesPage(); - - //clickButtonWithValue( "Submit" ); - clickButtonWithName( "submitRolesButton", true ); - - if ( valid ) - { - String[] columnValues = { userName, fullName, emailAd }; - assertElementPresent( XPathExpressionUtil.getTableRow( columnValues ) ); - } - else - { - assertCreateUserPage(); - } - } - - public void deleteUser( String userName, String fullName, String emailAdd ) - { - deleteUser( userName, fullName, emailAdd, false, false ); - } - - public void deleteUser( String userName, String fullName, String emailAd, boolean validated, boolean locked ) - { - String[] columnValues = { userName, fullName, emailAd }; - // clickLinkWithText( "userlist" ); - clickLinkWithXPath( "//table[@id='ec_table']/tbody[2]/tr[3]/td[7]/a/img" ); - assertDeleteUserPage( userName ); - submit(); - assertElementNotPresent( XPathExpressionUtil.getTableRow( columnValues ) ); - } - - public void login( String username, String password ) - { - login( username, password, true, "Login Page" ); - } - - public void login( String username, String password, boolean valid, String assertReturnPage ) - { - if ( isElementPresent( "loginLink" ) ) - { - goToLoginPage(); - - submitLoginPage( username, password, false, valid, assertReturnPage ); - } - if ( valid ) - { - assertUserLoggedIn( username ); - } - } - - public void submitLoginPage( String username, String password ) - { - submitLoginPage( username, password, false, true, "Login Page" ); - } - - public void submitLoginPage( String username, String password, boolean validUsernamePassword ) - { - submitLoginPage( username, password, false, validUsernamePassword, "Login Page" ); - } - - public void submitLoginPage( String username, String password, boolean rememberMe, boolean validUsernamePassword, - String assertReturnPage ) - { - assertLoginPage(); - setFieldValue( "username", username ); - setFieldValue( "password", password ); - if ( rememberMe ) - { - checkField( "rememberMe" ); - } - //clickButtonWithValue( "Login" ); - clickButtonWithLocator( "loginSubmit" ); - if ( validUsernamePassword ) - { - assertUserLoggedIn( username ); - } - else - { - if ( "Login Page".equals( assertReturnPage ) ) - { - assertLoginPage(); - } - else - { - assertPage( assertReturnPage ); - } - } - } - - protected void assertUserLoggedIn( String username ) - { - //assertTextPresent( "Current User:" ); - assertTextPresent( username ); - //assertLinkPresent( "Edit Details" ); - assertElementPresent( "editUserLink" ); - assertElementPresent( "logoutLink" ); - //assertLinkPresent( "Logout" ); - //assertTextNotPresent( "Login" ); - assertElementNotPresent( "loginLink" ); - } - - // User Roles - public void assertUserRoleCheckBoxPresent( String value ) - { - getSelenium().isElementPresent( - "xpath=//input[@id='addRolesToUser_addNDSelectedRoles' and @name='addNDSelectedRoles' and @value='" + value - + "']" ); - } - - public void assertResourceRolesCheckBoxPresent( String value ) - { - getSelenium().isElementPresent( "xpath=//input[@name='addDSelectedRoles' and @value='" + value + "']" ); - } - - public void checkUserRoleWithValue( String value ) - { - assertUserRoleCheckBoxPresent( value ); - getSelenium().click( - "xpath=//input[@id='addRolesToUser_addNDSelectedRoles' and @name='addNDSelectedRoles' and @value='" + value - + "']" ); - } - - public void checkResourceRoleWithValue( String value ) - { - assertResourceRolesCheckBoxPresent( value ); - getSelenium().click( "xpath=//input[@name='addDSelectedRoles' and @value='" + value + "']" ); - } - - public void changePassword( String oldPassword, String newPassword ) - { - assertPage( "Apache Archiva \\ Change Password" ); - setFieldValue( "existingPassword", oldPassword ); - setFieldValue( "newPassword", newPassword ); - setFieldValue( "newPasswordConfirm", newPassword ); - clickButtonWithValue( "Change Password" ); - } - - public void assertCreateUserPage() - { - //assertPage( "Apache Archiva \\ [Admin] User Create" ); - //assertTextPresent( "[Admin] User Create" ); - assertTextPresent( "Username*:", "Nom d'utilisateur*:" ); - assertElementPresent( "user.username" ); - assertTextPresent( "Full Name*:", "Nom complet*:" ); - assertElementPresent( "user.fullName" ); - assertTextPresent( "Email Address*:", "Adresse email*:" ); - assertElementPresent( "user.email" ); - assertTextPresent( "Password*:", "Mot de passe*:" ); - assertElementPresent( "user.password" ); - assertTextPresent( "Confirm Password*:", "Confirmer le mot de passe*" ); - assertElementPresent( "user.confirmPassword" ); - //assertButtonWithValuePresent( "Create User" ); - assertButtonWithIdPresent( "userCreateSubmit" ); -// assertElementNotPresent( "userCreateSubmit" ); - } - - public void assertLeftNavMenuWithRole( String role ) - { - if ( role.equals( "Guest" ) || role.equals( "Registered User" ) || role.equals( "Global Repository Observer" ) - || role.equals( "Repository Observer - internal" ) || role.equals( "Repository Observer - snapshots" ) ) - { - assertTextPresent( "Search" ); - assertLinkPresent( "Find Artifact" ); - assertLinkPresent( "Browse" ); - assertLinkNotPresent( "Repositories" ); - } - else if ( role.equals( "User Administrator" ) ) - { - assertTextPresent( "Search" ); - assertLinkPresent( "Find Artifact" ); - assertLinkPresent( "Browse" ); - assertLinkPresent( "User Management" ); - assertLinkPresent( "User Roles" ); - assertLinkNotPresent( "Repositories" ); - } - else if ( role.equals( "Global Repository Manager" ) || role.equals( "Repository Manager - internal" ) - || role.equals( "Repository Manager - snapshots" ) ) - { - assertTextPresent( "Search" ); - assertLinkPresent( "Find Artifact" ); - assertLinkPresent( "Browse" ); - assertLinkPresent( "Upload Artifact" ); - assertLinkPresent( "Delete Artifact" ); - assertLinkNotPresent( "Repositories" ); - } - else - { - assertTextPresent( "Search" ); - String navMenu = - "Find Artifact,Browse,Reports,User Management,User Roles,Appearance,Upload Artifact,Delete Artifact,Repository Groups,Repositories,Proxy Connectors,Legacy Support,Network Proxies,Repository Scanning"; - String[] arrayMenu = navMenu.split( "," ); - for ( String navmenu : arrayMenu ) - { - assertLinkPresent( navmenu ); - } - } - } - - // Find Artifact - public void goToFindArtifactPage() - { - getSelenium().open( "/archiva/findArtifact.action" ); - assertFindArtifactPage(); - } - - public void assertFindArtifactPage() - { - //assertPage( "Apache Archiva \\ Find Artifact" ); - assertElementPresent( "searchBox" ); - //assertTextPresent( "Find Artifact" ); - //assertTextPresent( "Search for:" ); - //assertTextPresent( "Checksum:" ); - assertElementPresent( "quickSearchBox" ); - assertElementPresent( "checksumSearch" ); - //assertButtonWithValuePresent( "Search" ); - assertElementPresent( "checksumSearch_0" ); - } - - // Appearance - public void goToAppearancePage() - { - getSelenium().open( "/archiva/admin/configureAppearance.action" ); - assertAppearancePage(); - } - - public void assertAppearancePage() - { - assertPage( "Apache Archiva \\ Configure Appearance" ); - String appearance = - "Appearance,Organization Details,The logo in the top right of the screen is controlled by the following settings.,Organization Information,Name,URL,Logo URL"; - String[] arrayAppearance = appearance.split( "," ); - for ( String appear : arrayAppearance ) - { - assertTextPresent( appear ); - } - assertLinkPresent( "Edit" ); - assertLinkPresent( "Change your appearance" ); - } - - public void addEditAppearance( String name, String url, String logoUrl, boolean wait) - { - setFieldValue( "organisationName", name ); - setFieldValue( "organisationUrl", url ); - setFieldValue( "organisationLogo", logoUrl ); - clickButtonWithValue( "Save", wait ); - } - - public void goToHomePage() - { - getSelenium().open( "" ); - } - - // Upload Artifact - public void goToAddArtifactPage() - { - // must be logged as admin - getSelenium().open( "/archiva/upload.action" ); - assertAddArtifactPage(); - } - - public void assertAddArtifactPage() - { - assertPage( "Apache Archiva \\ Upload Artifact" ); - assertTextPresent( "Upload Artifact" ); - - String artifact = - "Upload Artifact,Group Id*:,Artifact Id*:,Version*:,Packaging*:,Classifier:,Generate Maven 2 POM,Artifact File*:,POM File:,Repository Id:"; - String[] arrayArtifact = artifact.split( "," ); - for ( String arrayartifact : arrayArtifact ) - { - assertTextPresent( arrayartifact ); - } - - String artifactElements = - "upload_groupId,upload_artifactId,upload_version,upload_packaging,upload_classifier,upload_generatePom,upload_artifact,upload_pom,upload_repositoryId,uploadSubmit"; - String[] arrayArtifactElements = artifactElements.split( "," ); - for ( String artifactelements : arrayArtifactElements ) - { - assertElementPresent( artifactelements ); - } - } - - public void addArtifact( String groupId, String artifactId, String version, String packaging, - String artifactFilePath, String repositoryId, boolean wait ) - { - addArtifact( groupId, artifactId, version, packaging, true, artifactFilePath, repositoryId, wait ); - } - - public void addArtifact( String groupId, String artifactId, String version, String packaging, boolean generatePom, - String artifactFilePath, String repositoryId, boolean wait ) - { - login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) ); - goToAddArtifactPage(); - setFieldValue( "groupId", groupId ); - setFieldValue( "artifactId", artifactId ); - setFieldValue( "version", version ); - setFieldValue( "packaging", packaging ); - - if ( generatePom ) - { - checkField( "generatePom" ); - } - - String path; - if ( artifactFilePath != null && artifactFilePath.trim().length() > 0 ) - { - File f = new File( artifactFilePath ); - try - { - path = f.getCanonicalPath(); - } - catch ( IOException e ) - { - path = f.getAbsolutePath(); - } - } - else - { - path = artifactFilePath; - } - - setFieldValue( "artifact", path ); - selectValue( "upload_repositoryId", repositoryId ); - - //clickButtonWithValue( "Submit" ); - clickButtonWithLocator( "uploadSubmit", wait ); - } - - public void goToRepositoriesPage() - { - if ( !getTitle().equals( "Apache Archiva \\ Administration - Repositories" ) ) - { - getSelenium().open( "/archiva/admin/repositories.action" ); - } - assertRepositoriesPage(); - } - - public void assertRepositoriesPage() - { - assertPage( "Apache Archiva \\ Administration - Repositories" ); - assertTextPresent( "Administration - Repositories" ); - assertTextPresent( "Managed Repositories" ); - assertTextPresent( "Remote Repositories" ); - } - - public void addManagedRepository( String identifier, String name, String directory, String indexDirectory, - String type, String cron, String daysOlder, String retentionCount, boolean wait) - { - // goToRepositoriesPage(); - // clickLinkWithText( "Add" ); - setFieldValue( "repository.id", identifier ); - setFieldValue( "repository.name", name ); - setFieldValue( "repository.location", directory ); - setFieldValue( "repository.indexDirectory", indexDirectory ); - selectValue( "repository.layout", type ); - setFieldValue( "repository.cronExpression", cron ); - setFieldValue( "repository.daysOlder", daysOlder ); - setFieldValue( "repository.retentionCount", retentionCount ); - // TODO - clickButtonWithValue( "Add Repository", wait ); - } - - // artifact management - public void assertDeleteArtifactPage() - { - assertPage( "Apache Archiva \\ Delete Artifact" ); - assertTextPresent( "Delete Artifact" ); - assertTextPresent( "Group Id*:" ); - assertTextPresent( "Artifact Id*:" ); - assertTextPresent( "Version*:" ); - assertTextPresent( "Repository Id:" ); - assertElementPresent( "groupId" ); - assertElementPresent( "artifactId" ); - assertElementPresent( "version" ); - assertElementPresent( "repositoryId" ); - assertButtonWithValuePresent( "Submit" ); - } - - // network proxies - public void goToNetworkProxiesPage() - { - clickLinkWithText( "Network Proxies" ); - assertNetworkProxiesPage(); - } - - public void assertNetworkProxiesPage() - { - assertPage( "Apache Archiva \\ Administration - Network Proxies" ); - assertTextPresent( "Administration - Network Proxies" ); - assertTextPresent( "Network Proxies" ); - assertLinkPresent( "Add Network Proxy" ); - } - - public void addNetworkProxy( String identifier, String protocol, String hostname, String port, String username, - String password ) - { - //goToNetworkProxiesPage(); - clickLinkWithText( "Add Network Proxy" ); - assertAddNetworkProxy(); - setFieldValue( "proxy.id", identifier ); - setFieldValue( "proxy.protocol", protocol ); - setFieldValue( "proxy.host", hostname ); - setFieldValue( "proxy.port", port ); - setFieldValue( "proxy.username", username ); - setFieldValue( "proxy.password", password ); - clickButtonWithValue( "Save Network Proxy" ); - } - - public void assertAddNetworkProxy() - { - assertPage( "Apache Archiva \\ Admin: Add Network Proxy" ); - assertTextPresent( "Admin: Add Network Proxy" ); - assertTextPresent( "Add network proxy:" ); - assertTextPresent( "Identifier*:" ); - assertTextPresent( "Protocol*:" ); - assertTextPresent( "Hostname*:" ); - assertTextPresent( "Port*:" ); - assertTextPresent( "Username:" ); - assertTextPresent( "Password:" ); - assertButtonWithValuePresent( "Save Network Proxy" ); - } - - // Legacy Support - public void goToLegacySupportPage() - { - getSelenium().open( "/archiva/admin/legacyArtifactPath.action" ); - assertLegacySupportPage(); - } - - public void assertLegacySupportPage() - { - assertPage( "Apache Archiva \\ Administration - Legacy Support" ); - assertTextPresent( "Administration - Legacy Artifact Path Resolution" ); - assertTextPresent( "Path Mappings" ); - assertLinkPresent( "Add" ); - } - - public void addLegacyArtifactPath( String path, String groupId, String artifactId, String version, - String classifier, String type, boolean wait ) - { - assertAddLegacyArtifactPathPage(); - setFieldValue( "legacyArtifactPath.path", path ); - setFieldValue( "groupId", groupId ); - setFieldValue( "artifactId", artifactId ); - setFieldValue( "version", version ); - setFieldValue( "classifier", classifier ); - setFieldValue( "type", type ); - clickButtonWithValue( "Add Legacy Artifact Path", wait ); - } - - public void assertAddLegacyArtifactPathPage() - { - assertPage( "Apache Archiva \\ Admin: Add Legacy Artifact Path" ); - assertTextPresent( "Admin: Add Legacy Artifact Path" ); - assertTextPresent( - "Enter the legacy path to map to a particular artifact reference, then adjust the fields as necessary." ); - String element = - "addLegacyArtifactPath_legacyArtifactPath_path,addLegacyArtifactPath_groupId,addLegacyArtifactPath_artifactId,addLegacyArtifactPath_version,addLegacyArtifactPath_classifier,addLegacyArtifactPath_type"; - String[] arrayElement = element.split( "," ); - for ( String arrayelement : arrayElement ) - { - assertElementPresent( arrayelement ); - } - assertButtonWithValuePresent( "Add Legacy Artifact Path" ); - } - - // add managed repository and its staging repository - public void addStagingRepository( String identifier, String name, String directory, String indexDirectory, - String type, String cron, String daysOlder, String retentionCount ) - { - setFieldValue( "repository.id", identifier ); - setFieldValue( "repository.name", name ); - setFieldValue( "repository.location", directory ); - setFieldValue( "repository.indexDirectory", indexDirectory ); - selectValue( "repository.layout", type ); - setFieldValue( "repository.cronExpression", cron ); - setFieldValue( "repository.daysOlder", daysOlder ); - setFieldValue( "repository.retentionCount", retentionCount ); - checkField( "stageNeeded" ); - - clickButtonWithValue( "Add Repository" ); - } - - protected void logout() - { - clickLinkWithText( "Logout" ); - assertTextNotPresent( "Current User:" ); - assertLinkNotPresent( "Edit Details" ); - assertLinkNotPresent( "Logout" ); - assertLinkPresent( "Login" ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java deleted file mode 100644 index 5869a0627..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactManagementTest.java +++ /dev/null @@ -1,82 +0,0 @@ -package org.apache.archiva.web.test.parent; - -/* - * 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. - */ - -public abstract class AbstractArtifactManagementTest - extends AbstractArchivaTest -{ - - public String getGroupId() - { - String groupId = getProperty( "GROUPID" ); - return groupId; - } - - public String getArtifactId() - { - String artifactId = getProperty( "ARTIFACTID" ); - return artifactId; - } - - public String getVersion() - { - String version = getProperty( "VERSION" ); - return version; - } - - public String getPackaging() - { - String packaging = getProperty( "PACKAGING" ); - return packaging; - } - - public String getArtifactFilePath() - { - return "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar"; - } - - public String getRepositoryId() - { - String repositoryId = getProperty( "REPOSITORYID" ); - return repositoryId; - } - - public void goToDeleteArtifactPage() - { - login( getProperty( "ADMIN_USERNAME" ), getProperty( "ADMIN_PASSWORD" ) ); - getSelenium().open( "/archiva/deleteArtifact.action" ); - assertDeleteArtifactPage(); - } - - public void deleteArtifact( String groupId, String artifactId, String version, String repositoryId ) - { - deleteArtifact( groupId, artifactId, version, repositoryId, false ); - } - - public void deleteArtifact( String groupId, String artifactId, String version, String repositoryId, boolean wait ) - { - goToDeleteArtifactPage(); - setFieldValue( "groupId", groupId ); - setFieldValue( "artifactId", artifactId ); - setFieldValue( "version", version ); - selectValue( "repositoryId", repositoryId ); - clickButtonWithValue( "Submit", wait ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java deleted file mode 100644 index e026f7805..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractArtifactReportsTest.java +++ /dev/null @@ -1,80 +0,0 @@ -package org.apache.archiva.web.test.parent; - -/* - * 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. - */ - -public abstract class AbstractArtifactReportsTest - extends AbstractArchivaTest -{ - - // Reports - public void goToReportsPage() - { - getSelenium().open( "/archiva/report/pickReport.action" ); - assertReportsPage(); - } - - public void assertReportsPage() - { - assertPage( "Apache Archiva \\ Reports" ); - assertTextPresent( "Reports" ); - assertTextPresent( "Repository Statistics" ); - assertTextPresent( "Repositories To Be Compared" ); - assertElementPresent( "availableRepositories" ); - assertButtonWithValuePresent( "v" ); - assertButtonWithValuePresent( "^" ); - assertButtonWithValuePresent( "<-" ); - assertButtonWithValuePresent( "->" ); - assertButtonWithValuePresent( "<<--" ); - assertButtonWithValuePresent( "-->>" ); - assertButtonWithValuePresent( "<*>" ); - assertElementPresent( "selectedRepositories" ); - assertButtonWithValuePresent( "v" ); - assertButtonWithValuePresent( "^" ); - assertTextPresent( "Row Count" ); - assertElementPresent( "rowCount" ); - assertTextPresent( "Start Date" ); - assertElementPresent( "startDate" ); - assertTextPresent( "End Date" ); - assertElementPresent( "endDate" ); - assertButtonWithValuePresent( "View Statistics" ); - assertTextPresent( "Repository Health" ); - assertTextPresent( "Row Count" ); - assertElementPresent( "rowCount" ); - assertTextPresent( "Group ID" ); - assertElementPresent( "groupId" ); - assertTextPresent( "Repository ID" ); - assertElementPresent( "repositoryId" ); - assertButtonWithValuePresent( "Show Report" ); - } - - public void compareRepositories( String labelSelected, String startDate, String endDate ) - { - goToReportsPage(); - getSelenium().removeSelection( "generateStatisticsReport_availableRepositories", labelSelected ); - clickButtonWithValue( "->", false ); - getSelenium().type( "startDate", startDate ); - // clickLinkWithLocator( "1" , false ); - // getSelenium().click( "endDate" ); - getSelenium().type( "endDate", endDate ); - // clickLinkWithLocator( "30" , false ); - clickButtonWithValue( "View Statistics" ); - } - -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java deleted file mode 100644 index 2b4fc1194..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractBrowseTest.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.apache.archiva.web.test.parent; - -/* - * 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. - */ - -public abstract class AbstractBrowseTest - extends AbstractArchivaTest -{ - - // Browse - public void goToBrowsePage() - { - getSelenium().open( "/archiva/browse" ); - assertBrowsePage(); - } - - public void assertBrowsePage() - { - assertPage( "Apache Archiva \\ Browse Repository" ); - assertTextPresent( "Browse Repository" ); - assertTextPresent( "Groups" ); - } - -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractMergingRepositoriesTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractMergingRepositoriesTest.java deleted file mode 100644 index 91af2cf60..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractMergingRepositoriesTest.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.apache.archiva.web.test.parent; - -/* - * 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 java.io.File; - -public class AbstractMergingRepositoriesTest - extends AbstractArchivaTest -{ - - public void goToAuditLogReports() - { - getSelenium().open( "/archiva/report/queryAuditLogReport.action" ); - } - - public String getRepositoryDir() - { - File f = new File( "" ); - String artifactFilePath = f.getAbsolutePath(); - return artifactFilePath + "/target/"; - } - - public void editManagedRepository() - { - goToRepositoriesPage(); - clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" ); - assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" ); - checkField( "repository.blockRedeployments" ); - clickButtonWithValue( "Update Repository" ); - } - - public String getGroupId() - { - return getProperty( "VALIDARTIFACT_GROUPID" ); - } - - public String getArtifactId() - { - return getProperty( "VALIDARTIFACT_ARTIFACTID" ); - } - - public String getVersion() - { - return getProperty( "VERSION" ); - } - - public String getPackaging() - { - return getProperty( "PACKAGING" ); - } - - public String getValidArtifactFilePath() - { - return "src/test/resources/snapshots/org/apache/maven/archiva/web/test/foo-bar/1.0-SNAPSHOT/foo-bar-1.0-SNAPSHOT.jar"; - } - -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java deleted file mode 100644 index a1214acfb..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractRepositoryTest.java +++ /dev/null @@ -1,358 +0,0 @@ -package org.apache.archiva.web.test.parent; - -/* - * 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 java.io.File; -import org.testng.Assert; - -public abstract class AbstractRepositoryTest - extends AbstractArchivaTest -{ - // Repository Groups - public void goToRepositoryGroupsPage() - { - if ( !getTitle().equals( "Apache Archiva \\ Administration - Repository Groups" ) ) - { - getSelenium().open( "/archiva/admin/repositoryGroups.action" ); - } - assertRepositoryGroupsPage(); - } - - public void assertRepositoryGroupsPage() - { - assertPage( "Apache Archiva \\ Administration - Repository Groups" ); - assertTextPresent( "Administration - Repository Groups" ); - assertTextPresent( "Identifier*:" ); - assertElementPresent( "repositoryGroup.id" ); - assertButtonWithValuePresent( "Add Group" ); - assertTextPresent( "Repository Groups" ); - } - - public void assertAddedRepositoryLink( String repositoryGroupName ) - { - assertPage( "Apache Archiva \\ Administration - Repository Groups" ); - String repositoryGroupUrlValue = "repository/" + repositoryGroupName + "/"; - String baseUrlValue = "archiva"; - String repositoryGroupLink = baseUrl.replaceFirst( baseUrlValue, repositoryGroupUrlValue ); - assertTextPresent( repositoryGroupLink ); - } - - public void assertAddedRepositoryToRepositoryGroups( String repositoryName ) - { - assertPage( "Apache Archiva \\ Administration - Repository Groups" ); - assertTextPresent( repositoryName ); - assertTextPresent( "Archiva Managed Internal Repository" ); - assertAddedRepositoryLink( repositoryName ); - } - - public void assertDeleteRepositoryGroupPage( String repositoryName ) - { - assertPage( "Apache Archiva \\ Admin: Delete Repository Group" ); - assertTextPresent( "WARNING: This operation can not be undone." ); - assertTextPresent( "Are you sure you want to delete the following repository group?" ); - assertTextPresent( "ID:" ); - assertTextPresent( repositoryName ); - assertButtonWithValuePresent( "Confirm" ); - assertButtonWithValuePresent( "Cancel" ); - } - - public void addRepositoryGroup( String repoGroupName, boolean wait ) - { - goToRepositoryGroupsPage(); - setFieldValue( "repositoryGroup.id", repoGroupName ); - clickButtonWithValue( "Add Group", wait ); - } - - public void addRepositoryToRepositoryGroup( String repositoryGroupName, String repositoryName ) - { - goToRepositoryGroupsPage(); - String s = getSelenium().getBodyText(); - if ( s.contains( "No Repository Groups Defined." ) ) - { - setFieldValue( "repositoryGroup.id", repositoryGroupName ); - clickButtonWithValue( "Add Group" ); - // assertAddedRepositoryLink( repositoryGroupName ); - - selectValue( "addRepositoryToGroup_repoId", repositoryName ); - clickButtonWithValue( "Add Repository" ); - assertAddedRepositoryToRepositoryGroups( repositoryName ); - } - else - { - // assertAddedRepositoryLink( repositoryGroupName ); - selectValue( "addRepositoryToGroup_repoId", repositoryName ); - clickButtonWithValue( "Add Repository" ); - } - } - - public void deleteRepositoryInRepositoryGroups() - { - goToRepositoryGroupsPage(); - getSelenium().click( "xpath=//div[@id='contentArea']/div[2]/div/div[3]/div[1]/a/img" ); - waitPage(); - } - - public void deleteRepositoryGroup( String repositoryName ) - { - getSelenium().click( "xpath=//div[@id='contentArea']/div[2]/div/div[1]/div/a/img" ); - waitPage(); - assertDeleteRepositoryGroupPage( repositoryName ); - clickButtonWithValue( "Confirm" ); - } - - // ///////////////////////////// - // proxy connectors - // ///////////////////////////// - public void goToProxyConnectorsPage() - { - clickLinkWithText( "Proxy Connectors" ); - assertProxyConnectorsPage(); - } - - public void assertProxyConnectorsPage() - { - assertPage( "Apache Archiva \\ Administration - Proxy Connectors" ); - assertTextPresent( "Administration - Proxy Connectors" ); - assertTextPresent( "Repository Proxy Connectors" ); - assertTextPresent( "internal" ); - assertTextPresent( "Archiva Managed Internal Repository" ); - assertTextPresent( "Proxy Connector" ); - assertTextPresent( "Central Repository" ); - } - - public void assertAddProxyConnectorPage() - { - assertPage( "Apache Archiva \\ Admin: Add Proxy Connector" ); - assertTextPresent( "Admin: Add Proxy Connector" ); - String proxy = - "Network Proxy*:,Managed Repository*:,Remote Repository*:,Policies:,Return error when:,On remote error:,Releases:,Snapshots:,Checksum:,Cache failures:,Properties:,No properties have been set.,Black List:,No black list patterns have been set.,White List:,No white list patterns have been set."; - String[] arrayProxy = proxy.split( "," ); - for ( String arrayproxy : arrayProxy ) - assertTextPresent( arrayproxy ); - /* - * String proxyElements = - * "addProxyConnector_connector_proxyId,addProxyConnector_connector_sourceRepoId,addProxyConnector_connector_targetRepoId,policy_propagate-errors-on-update,policy_propagate-errors,policy_releases,policy_snapshots,policy_checksum,policy_cache-failures,propertiesEntry,propertiesValue,blackListEntry,whiteListEntry" - * ; String[] arrayProxyElements = proxyElements.split( "," ); for ( String arrayproxyelements : - * arrayProxyElements ) assertTextPresent( arrayproxyelements ); - */ - assertButtonWithValuePresent( "Add Property" ); - assertButtonWithValuePresent( "Add Pattern" ); - assertButtonWithValuePresent( "Add Proxy Connector" ); - } - - // this only fills in the values of required fields in adding Proxy Connectors - public void addProxyConnector( String networkProxy, String managedRepo, String remoteRepo ) - { - goToProxyConnectorsPage(); - clickLinkWithText( "Add" ); - assertAddProxyConnectorPage(); - selectValue( "connector.proxyId", networkProxy ); - selectValue( "connector.sourceRepoId", managedRepo ); - selectValue( "connector.targetRepoId", remoteRepo ); - clickButtonWithValue( "Add Proxy Connector" ); - } - - public void deleteProxyConnector() - { - goToProxyConnectorsPage(); - clickLinkWithXPath( "//div[@id='contentArea']/div[2]/div[1]/div[2]/div[1]/a[3]/img" ); - assertPage( "Apache Archiva \\ Admin: Delete Proxy Connectors" ); - clickButtonWithValue( "Delete" ); - assertPage( "Apache Archiva \\ Administration - Proxy Connectors" ); - } - - // ///////////////////////////// - // network proxies - // ///////////////////////////// - - public void editNetworkProxies( String fieldName, String value ) - { - // goToNetworkProxiesPage(); - clickLinkWithText( "Edit Network Proxy" ); - setFieldValue( fieldName, value ); - clickButtonWithValue( "Save Network Proxy" ); - } - - public void deleteNetworkProxy() - { - // goToNetworkProxiesPage(); - clickLinkWithText( "Delete Network Proxy" ); - assertPage( "Apache Archiva \\ Admin: Delete Network Proxy" ); - assertTextPresent( "WARNING: This operation can not be undone." ); - clickButtonWithValue( "Delete" ); - } - - // remote repositories - public void assertAddRemoteRepository() - { - assertPage( "Apache Archiva \\ Admin: Add Remote Repository" ); - String remote = "Identifier*:,Name*:,URL*:,Username:,Password:,Timeout in seconds:,Type:"; - String[] arrayRemote = remote.split( "," ); - for ( String arrayremote : arrayRemote ) - assertTextPresent( arrayremote ); - String remoteElements = - "addRemoteRepository_repository_id,addRemoteRepository_repository_name,addRemoteRepository_repository_url,addRemoteRepository_repository_userName,addRemoteRepository_repository_password,addRemoteRepository_repository_timeout,addRemoteRepository_repository_layout"; - String[] arrayRemoteElements = remoteElements.split( "," ); - for ( String arrayremotelement : arrayRemoteElements ) - assertElementPresent( arrayremotelement ); - } - - public void assertDeleteRemoteRepositoryPage() - { - assertPage( "Apache Archiva \\ Admin: Delete Remote Repository" ); - assertTextPresent( "Admin: Delete Remote Repository" ); - assertTextPresent( "WARNING: This operation can not be undone." ); - assertTextPresent( "Are you sure you want to delete the following remote repository?" ); - assertButtonWithValuePresent( "Confirm" ); - assertButtonWithValuePresent( "Cancel" ); - } - - public void addRemoteRepository( String identifier, String name, String url, String username, String password, - String timeout, String type, boolean wait ) - { - assertAddRemoteRepository(); - setFieldValue( "addRemoteRepository_repository_id", identifier ); - setFieldValue( "addRemoteRepository_repository_name", name ); - setFieldValue( "addRemoteRepository_repository_url", url ); - setFieldValue( "addRemoteRepository_repository_userName", username ); - setFieldValue( "addRemoteRepository_repository_password", password ); - setFieldValue( "addRemoteRepository_repository_timeout", timeout ); - selectValue( "addRemoteRepository_repository_layout", type ); - clickButtonWithValue( "Add Repository", wait ); - } - - public void deleteRemoteRepository() - { - goToRepositoriesPage(); - clickLinkWithXPath( "//div[@id='contentArea']/div/div[8]/div[1]/a[2]" ); - assertDeleteRemoteRepositoryPage(); - clickButtonWithValue( "Confirm" ); - } - - public void editRemoteRepository( String fieldName, String value ) - { - goToRepositoriesPage(); - clickLinkWithXPath( "//div[@id='contentArea']/div/div[8]/div[1]/a[1]" ); - setFieldValue( fieldName, value ); - clickButtonWithValue( "Update Repository" ); - } - - public void editManagedRepository( String fieldName, String value ) - { - goToRepositoriesPage(); - clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" ); - assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" ); - setFieldValue( fieldName, value ); - // TODO - clickButtonWithValue( "Update Repository" ); - } - - public void editManagedRepository(String name, String directory, String indexDirectory, String type, String cron, String daysOlder, String retentionCount) - { - goToRepositoriesPage(); - clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[1]/img" ); - assertPage( "Apache Archiva \\ Admin: Edit Managed Repository" ); - setFieldValue( "repository.name" , name ); - setFieldValue( "repository.location" , directory ); - setFieldValue( "repository.indexDirectory" , indexDirectory ); - selectValue( "repository.layout", type ); - setFieldValue( "repository.cronExpression" , cron ); - setFieldValue( "repository.daysOlder" , daysOlder ); - setFieldValue( "repository.retentionCount" , retentionCount ); - clickButtonWithValue( "Update Repository" ); - } - - public void deleteManagedRepository() - { - clickLinkWithXPath( "//div[@id='contentArea']/div/div[5]/div[1]/a[2]" ); - assertPage( "Apache Archiva \\ Admin: Delete Managed Repository" ); - clickButtonWithValue( "Delete Configuration Only" ); - } - - public String getRepositoryDir() - { - File f = new File( "" ); - String artifactFilePath = f.getAbsolutePath(); - return artifactFilePath + "/target/"; - } - - // /////////////////////////////////////////// - // Repository Scanning - // /////////////////////////////////////////// - public void goToRepositoryScanningPage() - { - getSelenium().open( "/archiva/admin/repositoryScanning.action" ); - assertRepositoryScanningPage(); - } - - public void assertRepositoryScanningPage() - { - assertPage( "Apache Archiva \\ Administration - Repository Scanning" ); - assertTextPresent( "Administration - Repository Scanning" ); - assertTextPresent( "Repository Scanning - File Types" ); - String artifactsTypes = - "**/*.pom,**/*.jar,**/*.ear,**/*.war,**/*.car,**/*.sar,**/*.mar,**/*.rar,**/*.dtd,**/*.tld,**/*.tar.gz,**/*.tar.bz2,**/*.zip"; - String[] arrayArtifactTypes = artifactsTypes.split( "," ); - for ( int i = 0; i < arrayArtifactTypes.length; i++ ) - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[1]/table." + i + ".0" ), - arrayArtifactTypes[i] ); - - String autoremove = "**/*.bak,**/*~,**/*-"; - String[] arrayAutoremove = autoremove.split( "," ); - for ( int i = 0; i < arrayAutoremove.length; i++ ) - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[2]/table." + i + ".0" ), - arrayAutoremove[i] ); - - String ignored = "**/.htaccess,**/KEYS,**/*.rb,**/*.sh,**/.svn/**,**/.DAV/**"; - String[] arrayIgnored = ignored.split( "," ); - for ( int i = 0; i < arrayIgnored.length; i++ ) - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[3]/table." + i + ".0" ), - arrayIgnored[i] ); - - String indexableContent = - "**/*.txt,**/*.TXT,**/*.block,**/*.config,**/*.pom,**/*.xml,**/*.xsd,**/*.dtd,**/*.tld"; - String[] arrayIndexableContent = indexableContent.split( "," ); - for ( int i = 0; i < arrayIndexableContent.length; i++ ) - Assert.assertEquals( getSelenium().getTable( "//div[@id='contentArea']/div/div[4]/table." + i + ".0" ), - arrayIndexableContent[i] ); - } - - // /////////////////////////////////////////// - // Database - // /////////////////////////////////////////// - public void goToDatabasePage() - { - clickLinkWithText( "Database" ); - assertDatabasePage(); - } - - public void assertDatabasePage() - { - assertPage( "Apache Archiva \\ Administration - Database" ); - assertTextPresent( "Administration - Database" ); - assertTextPresent( "Database - Unprocessed Artifacts Scanning" ); - assertTextPresent( "Cron:" ); - assertElementPresent( "database_cron" ); - assertButtonWithValuePresent( "Update Cron" ); - assertButtonWithValuePresent( "Update Database Now" ); - assertTextPresent( "Database - Unprocessed Artifacts Scanning" ); - assertTextPresent( "Database - Artifact Cleanup Scanning" ); - } -} diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java deleted file mode 100644 index 33b12be0a..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSearchTest.java +++ /dev/null @@ -1,117 +0,0 @@ -package org.apache.archiva.web.test.parent; - -/* - * 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. - */ - -public abstract class AbstractSearchTest - extends AbstractArchivaTest -{ - // Search - public void goToSearchPage() - { - goToHomePage(); - if (!isElementPresent( "quickSearchBox" ) ) - { - getSelenium().open( "/index.action"); - //getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - waitPage(); - assertElementPresent( "quickSearchSubmit" ); - } - } - - public void assertSearchPage() - { - assertPage( "Apache Archiva \\ Quick Search" ); - assertTextPresent( "Search for" ); - assertElementPresent( "quickSearchSubmit" ); - assertButtonWithValuePresent( "Search" ); - // assertLinkPresent( "Advanced Search" ); - assertTextPresent( "Enter your search terms. A variety of data will be searched for your keywords." ); - // assertButtonWithDivIdPresent( "searchHint" ); - } - - public void searchForArtifact( String artifactId ) - { - goToSearchPage(); - - setFieldValue( "quickSearchValue", artifactId ); - clickButtonWithLocator( "quickSearchSubmit" ); - } - - public void searchForArtifactAdvancedSearch( String groupId, String artifactId, String version, String repositoryId, - String className, String rowCount ) - { - goToSearchPage(); - - clickLinkWithXPath( "//div[@id='contentArea']/div[1]/a[1]/strong", false ); - assertElementPresent( "filteredSearch_searchField" ); - assertElementPresent( "filteredSearch_repositoryId" ); - - if ( groupId != null ) - { - selectValue( "filteredSearch_searchField", "Group ID" ); - clickLinkWithLocator( "//a[@id='filteredSearch_']/img", false ); - - assertElementPresent( "groupId" ); - setFieldValue( "groupId", groupId ); - } - - if ( artifactId != null ) - { - selectValue( "filteredSearch_searchField", "Artifact ID" ); - clickLinkWithLocator( "//a[@id='filteredSearch_']/img", false ); - - assertElementPresent( "artifactId" ); - setFieldValue( "artifactId", artifactId ); - } - - if ( version != null ) - { - selectValue( "filteredSearch_searchField", "Version" ); - clickLinkWithLocator( "//a[@id='filteredSearch_']/img", false ); - - assertElementPresent( "version" ); - setFieldValue( "version", version ); - } - - if ( className != null ) - { - selectValue( "filteredSearch_searchField", "Class/Package Name" ); - clickLinkWithLocator( "//a[@id='filteredSearch_']/img", false ); - - assertElementPresent( "className" ); - setFieldValue( "className", className ); - } - - if ( rowCount != null ) - { - selectValue( "filteredSearch_searchField", "Row Count" ); - clickLinkWithLocator( "//a[@id='filteredSearch_']/img", false ); - - assertElementPresent( "rowCount" ); - setFieldValue( "rowCount", rowCount ); - } - - if ( repositoryId != null ) - { - selectValue( "filteredSearch_repositoryId", repositoryId ); - } - clickSubmitWithLocator( "filteredSearch_0" ); - } -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java deleted file mode 100644 index 0302c699d..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/parent/AbstractSeleniumTest.java +++ /dev/null @@ -1,481 +0,0 @@ -package org.apache.archiva.web.test.parent; - -/* - * 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 com.thoughtworks.selenium.DefaultSelenium; -import com.thoughtworks.selenium.Selenium; -import org.apache.commons.io.IOUtils; -import org.testng.Assert; - -import java.io.IOException; -import java.io.InputStream; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; - -/** - * @author Emmanuel Venisse - * - */ - -public abstract class AbstractSeleniumTest -{ - - public static String baseUrl; - - public static String maxWaitTimeInMs; - - private static ThreadLocal selenium = new ThreadLocal(); - - public static Properties p; - - private final static String PROPERTIES_SEPARATOR = "="; - - public void open() - throws Exception - { - p = new Properties(); - p.load( this.getClass().getClassLoader().getResourceAsStream( "testng.properties" ) ); - } - - /** - * Initialize selenium - */ - public void open( String baseUrl, String browser, String seleniumHost, int seleniumPort, String maxWaitTimeInMs ) - throws Exception - { - try - { - AbstractSeleniumTest.baseUrl = baseUrl; - AbstractSeleniumTest.maxWaitTimeInMs = maxWaitTimeInMs; - - if ( getSelenium() == null ) - { - DefaultSelenium s = new DefaultSelenium( seleniumHost, seleniumPort, browser, baseUrl ); - s.start(); - s.setTimeout( maxWaitTimeInMs ); - selenium.set( s ); - } - } - catch ( Exception e ) - { - // yes - System.out.print( e.getMessage() ); - e.printStackTrace(); - } - } - - public static Selenium getSelenium() - { - return selenium == null ? null : selenium.get(); - } - - protected String getProperty( String key ) - { - return p.getProperty( key ); - } - - protected String getEscapeProperty( String key ) - { - InputStream input = this.getClass().getClassLoader().getResourceAsStream( "testng.properties" ); - String value = null; - List lines; - try - { - lines = IOUtils.readLines( input ); - } - catch ( IOException e ) - { - lines = new ArrayList(); - } - for ( String l : lines ) - { - if ( l != null && l.startsWith( key ) ) - { - int indexSeparator = l.indexOf( PROPERTIES_SEPARATOR ); - value = l.substring( indexSeparator + 1 ).trim(); - break; - } - } - return value; - } - - /** - * Close selenium session. Called from AfterSuite method of sub-class - */ - public void close() - throws Exception - { - if ( getSelenium() != null ) - { - getSelenium().stop(); - selenium.set( null ); - } - } - - // ******************************************************* - // Auxiliar methods. This method help us and simplify test. - // ******************************************************* - - public void assertFieldValue( String fieldValue, String fieldName ) - { - assertElementPresent( fieldName ); - Assert.assertEquals( fieldValue, getSelenium().getValue( fieldName ) ); - } - - public void assertPage( String title ) - { - Assert.assertEquals( getTitle(), title ); - } - - public String getTitle() - { - // Collapse spaces - return getSelenium().getTitle().replaceAll( "[ \n\r]+", " " ); - } - - public String getHtmlContent() - { - return getSelenium().getHtmlSource(); - } - - public String getText( String locator ) - { - return getSelenium().getText( locator ); - } - - public void assertTextPresent( String text ) - { - Assert.assertTrue( getSelenium().isTextPresent( text ), "'" + text + "' isn't present." ); - } - - /** - * one of text args must be in the page so use en and fr text (olamy use en locale :-) ) - * - * @param texts - */ - public void assertTextPresent( String... texts ) - { - boolean present = false; - StringBuilder sb = new StringBuilder(); - for ( String text : texts ) - { - present = present || getSelenium().isTextPresent( text ); - sb.append( " " + text + " " ); - } - Assert.assertTrue( present, "'one of the following test " + sb.toString() + "' isn't present." ); - } - - public void assertTextNotPresent( String text ) - { - Assert.assertFalse( getSelenium().isTextPresent( text ), "'" + text + "' is present." ); - } - - public void assertElementPresent( String elementLocator ) - { - Assert.assertTrue( isElementPresent( elementLocator ), "'" + elementLocator + "' isn't present." ); - } - - public void assertElementNotPresent( String elementLocator ) - { - Assert.assertFalse( isElementPresent( elementLocator ), "'" + elementLocator + "' is present." ); - } - - public void assertLinkPresent( String text ) - { - Assert.assertTrue( isElementPresent( "link=" + text ), "The link '" + text + "' isn't present." ); - } - - public void assertLinkNotPresent( String text ) - { - Assert.assertFalse( isElementPresent( "link=" + text ), "The link('" + text + "' is present." ); - } - - public void assertImgWithAlt( String alt ) - { - assertElementPresent( "/¯img[@alt='" + alt + "']" ); - } - - public void assertImgWithAltAtRowCol( boolean isALink, String alt, int row, int column ) - { - String locator = "//tr[" + row + "]/td[" + column + "]/"; - locator += isALink ? "a/" : ""; - locator += "img[@alt='" + alt + "']"; - - assertElementPresent( locator ); - } - - public void assertImgWithAltNotPresent( String alt ) - { - assertElementNotPresent( "/¯img[@alt='" + alt + "']" ); - } - - public void assertCellValueFromTable( String expected, String tableElement, int row, int column ) - { - Assert.assertEquals( expected, getCellValueFromTable( tableElement, row, column ) ); - } - - public boolean isTextPresent( String text ) - { - return getSelenium().isTextPresent( text ); - } - - public boolean isLinkPresent( String text ) - { - return isElementPresent( "link=" + text ); - } - - public boolean isElementPresent( String locator ) - { - return getSelenium().isElementPresent( locator ); - } - - public void waitPage() - { - // TODO define a smaller maxWaitTimeJsInMs for wait javascript response for browser side validation - getSelenium().waitForPageToLoad( maxWaitTimeInMs ); - // http://jira.openqa.org/browse/SRC-302 - // those hack looks to break some tests :-( - // getSelenium().waitForCondition( "selenium.isElementPresent('document.body');", maxWaitTimeInMs ); - //getSelenium().waitForCondition( "selenium.isElementPresent('footer');", maxWaitTimeInMs ); - //getSelenium().waitForCondition( "selenium.browserbot.getCurrentWindow().document.getElementById('footer')", - // maxWaitTimeInMs ); - // so the only hack is to not use a too small wait time - /* - try - { - Thread.sleep( 1000 ); - } - catch ( InterruptedException e ) - { - throw new RuntimeException( "issue on Thread.sleep : " + e.getMessage(), e ); - }*/ - } - - public String getFieldValue( String fieldName ) - { - return getSelenium().getValue( fieldName ); - } - - public String getCellValueFromTable( String tableElement, int row, int column ) - { - return getSelenium().getTable( tableElement + "." + row + "." + column ); - } - - public void selectValue( String locator, String value ) - { - getSelenium().select( locator, "label=" + value ); - } - - - public void assertOptionPresent( String selectField, String[] options ) - { - assertElementPresent( selectField ); - String[] optionsPresent = getSelenium().getSelectOptions( selectField ); - List expected = Arrays.asList( options ); - List present = Arrays.asList( optionsPresent ); - Assert.assertTrue( present.containsAll( expected ), "Options expected are not included in present options" ); - } - - public void assertSelectedValue( String value, String fieldName ) - { - assertElementPresent( fieldName ); - String optionsPresent = getSelenium().getSelectedLabel( value ); - Assert.assertEquals( optionsPresent, value ); - } - - public void submit() - { - clickLinkWithXPath( "//input[@type='submit']" ); - } - - public void assertButtonWithValuePresent( String text ) - { - Assert.assertTrue( isButtonWithValuePresent( text ), "'" + text + "' button isn't present" ); - } - - public void assertButtonWithIdPresent( String id ) - { - Assert.assertTrue( isButtonWithIdPresent( id ), "'Button with id =" + id + "' isn't present" ); - } - - public void assertButtonWithValueNotPresent( String text ) - { - Assert.assertFalse( isButtonWithValuePresent( text ), "'" + text + "' button is present" ); - } - - public boolean isButtonWithValuePresent( String text ) - { - return isElementPresent( "//button[@value='" + text + "']" ) || isElementPresent( - "//input[@value='" + text + "']" ); - } - - public boolean isButtonWithIdPresent( String text ) - { - return isElementPresent( "//button[@id='" + text + "']" ) || isElementPresent( "//input[@id='" + text + "']" ); - } - - public void clickButtonWithName( String text, boolean wait ) - { - clickLinkWithXPath( "//input[@name='" + text + "']", wait ); - } - - public void clickButtonWithValue( String text ) - { - clickButtonWithValue( text, true ); - } - - public void clickButtonWithValue( String text, boolean wait ) - { - assertButtonWithValuePresent( text ); - - if ( isElementPresent( "//button[@value='" + text + "']" ) ) - { - clickLinkWithXPath( "//button[@value='" + text + "']", wait ); - } - else - { - clickLinkWithXPath( "//input[@value='" + text + "']", wait ); - } - } - - public void clickSubmitWithLocator( String locator ) - { - clickLinkWithLocator( locator ); - } - - public void clickSubmitWithLocator( String locator, boolean wait ) - { - clickLinkWithLocator( locator, wait ); - } - - public void clickImgWithAlt( String alt ) - { - clickLinkWithLocator( "//img[@alt='" + alt + "']" ); - } - - public void clickLinkWithText( String text ) - { - clickLinkWithText( text, true ); - } - - public void clickLinkWithText( String text, boolean wait ) - { - clickLinkWithLocator( "link=" + text, wait ); - } - - public void clickLinkWithXPath( String xpath ) - { - clickLinkWithXPath( xpath, true ); - } - - public void clickLinkWithXPath( String xpath, boolean wait ) - { - clickLinkWithLocator( "xpath=" + xpath, wait ); - } - - public void clickLinkWithLocator( String locator ) - { - clickLinkWithLocator( locator, true ); - } - - public void clickLinkWithLocator( String locator, boolean wait ) - { - assertElementPresent( locator ); - getSelenium().click( locator ); - if ( wait ) - { - waitPage(); - } - } - - public void clickButtonWithLocator( String locator ) - { - clickButtonWithLocator( locator, true ); - } - - public void clickButtonWithLocator( String locator, boolean wait ) - { - assertElementPresent( locator ); - getSelenium().click( locator ); - if ( wait ) - { - waitPage(); - } - } - - public void setFieldValues( Map fieldMap ) - { - Map.Entry entry; - - for ( Iterator> entries = fieldMap.entrySet().iterator(); entries.hasNext(); ) - { - entry = entries.next(); - - getSelenium().type( entry.getKey(), entry.getValue() ); - } - } - - public void setFieldValue( String fieldName, String value ) - { - getSelenium().type( fieldName, value ); - } - - public void checkField( String locator ) - { - getSelenium().check( locator ); - } - - public void uncheckField( String locator ) - { - getSelenium().uncheck( locator ); - } - - public boolean isChecked( String locator ) - { - return getSelenium().isChecked( locator ); - } - - public void assertIsChecked( String locator ) - { - Assert.assertTrue( getSelenium().isChecked( locator ) ); - } - - public void assertIsNotChecked( String locator ) - { - Assert.assertFalse( getSelenium().isChecked( locator ) ); - } - - public void assertXpathCount( String locator, int expectedCount ) - { - int count = getSelenium().getXpathCount( locator ).intValue(); - Assert.assertEquals( count, expectedCount ); - } - - public void assertElementValue( String locator, String expectedValue ) - { - Assert.assertEquals( getSelenium().getValue( locator ), expectedValue ); - } - -} \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml deleted file mode 100644 index af0692056..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/archiva.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml deleted file mode 100644 index e41e1a918..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/host-manager.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml deleted file mode 100644 index 29abc9f1c..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/Catalina/localhost/manager.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy deleted file mode 100644 index e26f0a97a..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.policy +++ /dev/null @@ -1,172 +0,0 @@ -// ============================================================================ -// catalina.corepolicy - Security Policy Permissions for Tomcat 5 -// -// This file contains a default set of security policies to be enforced (by the -// JVM) when Catalina is executed with the "-security" option. In addition -// to the permissions granted here, the following additional permissions are -// granted to the codebase specific to each web application: -// -// * Read access to the document root directory -// -// $Id: catalina.policy 393732 2006-04-13 06:32:25Z pero $ -// ============================================================================ - - -// ========== SYSTEM CODE PERMISSIONS ========================================= - - -// These permissions apply to javac -grant codeBase "file:${java.home}/lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions -grant codeBase "file:${java.home}/jre/lib/ext/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to javac when ${java.home] points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/../lib/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to all shared system extensions when -// ${java.home} points at $JAVA_HOME/jre -grant codeBase "file:${java.home}/lib/ext/-" { - permission java.security.AllPermission; -}; - - -// ========== CATALINA CODE PERMISSIONS ======================================= - - -// These permissions apply to the launcher code -grant codeBase "file:${catalina.home}/bin/commons-launcher.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the daemon code -grant codeBase "file:${catalina.home}/bin/commons-daemon.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the commons-logging API -grant codeBase "file:${catalina.home}/bin/commons-logging-api.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the server startup code -grant codeBase "file:${catalina.home}/bin/bootstrap.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the JMX server -grant codeBase "file:${catalina.home}/bin/jmx.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to JULI -grant codeBase "file:${catalina.home}/bin/tomcat-juli.jar" { - permission java.security.AllPermission; -}; - -// These permissions apply to the servlet API classes -// and those that are shared across all class loaders -// located in the "common" directory -grant codeBase "file:${catalina.home}/common/-" { - permission java.security.AllPermission; -}; - -// These permissions apply to the container's core code, plus any additional -// libraries installed in the "server" directory -grant codeBase "file:${catalina.home}/server/-" { - permission java.security.AllPermission; -}; - -// The permissions granted to the balancer WEB-INF/classes and WEB-INF/lib directory -grant codeBase "file:${catalina.home}/webapps/balancer/-" { - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat.util.digester.*"; -}; -// ========== WEB APPLICATION PERMISSIONS ===================================== - - -// These permissions are granted by default to all web applications -// In addition, a web application will be given a read FilePermission -// and JndiPermission for all files and directories in its document root. -grant { - // Required for JNDI lookup of named JDBC DataSource's and - // javamail named MimePart DataSource used to send mail - permission java.util.PropertyPermission "java.home", "read"; - permission java.util.PropertyPermission "java.naming.*", "read"; - permission java.util.PropertyPermission "javax.sql.*", "read"; - - // OS Specific properties to allow read access - permission java.util.PropertyPermission "os.name", "read"; - permission java.util.PropertyPermission "os.version", "read"; - permission java.util.PropertyPermission "os.arch", "read"; - permission java.util.PropertyPermission "file.separator", "read"; - permission java.util.PropertyPermission "path.separator", "read"; - permission java.util.PropertyPermission "line.separator", "read"; - - // JVM properties to allow read access - permission java.util.PropertyPermission "java.version", "read"; - permission java.util.PropertyPermission "java.vendor", "read"; - permission java.util.PropertyPermission "java.vendor.url", "read"; - permission java.util.PropertyPermission "java.class.version", "read"; - permission java.util.PropertyPermission "java.specification.version", "read"; - permission java.util.PropertyPermission "java.specification.vendor", "read"; - permission java.util.PropertyPermission "java.specification.name", "read"; - - permission java.util.PropertyPermission "java.vm.specification.version", "read"; - permission java.util.PropertyPermission "java.vm.specification.vendor", "read"; - permission java.util.PropertyPermission "java.vm.specification.name", "read"; - permission java.util.PropertyPermission "java.vm.version", "read"; - permission java.util.PropertyPermission "java.vm.vendor", "read"; - permission java.util.PropertyPermission "java.vm.name", "read"; - - // Required for OpenJMX - permission java.lang.RuntimePermission "getAttribute"; - - // Allow read of JAXP compliant XML parser debug - permission java.util.PropertyPermission "jaxp.debug", "read"; - - // Precompiled JSPs need access to this package. - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime"; - permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime.*"; - -}; - - -// You can assign additional permissions to particular web applications by -// adding additional "grant" entries here, based on the code base for that -// application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files. -// -// Different permissions can be granted to JSP pages, classes loaded from -// the /WEB-INF/classes/ directory, all jar files in the /WEB-INF/lib/ -// directory, or even to individual jar files in the /WEB-INF/lib/ directory. -// -// For instance, assume that the standard "examples" application -// included a JDBC driver that needed to establish a network connection to the -// corresponding database and used the scrape taglib to get the weather from -// the NOAA web server. You might create a "grant" entries like this: -// -// The permissions granted to the context root directory apply to JSP pages. -// grant codeBase "file:${catalina.home}/webapps/examples/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; -// -// The permissions granted to the context WEB-INF/classes directory -// grant codeBase "file:${catalina.home}/webapps/examples/WEB-INF/classes/-" { -// }; -// -// The permission granted to your JDBC driver -// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/driver.jar!/-" { -// permission java.net.SocketPermission "dbhost.mycompany.com:5432", "connect"; -// }; -// The permission granted to the scrape taglib -// grant codeBase "jar:file:${catalina.home}/webapps/examples/WEB-INF/lib/scrape.jar!/-" { -// permission java.net.SocketPermission "*.noaa.gov:80", "connect"; -// }; - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties deleted file mode 100644 index 3e937aced..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/catalina.properties +++ /dev/null @@ -1,85 +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. -# - -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageAccess unless the -# corresponding RuntimePermission ("accessClassInPackage."+package) has -# been granted. -package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageDefinition unless the -# corresponding RuntimePermission ("defineClassInPackage."+package) has -# been granted. -# -# by default, no packages are restricted for definition, and none of -# the class loaders supplied with the JDK call checkPackageDefinition. -# -package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. - -# -# -# List of comma-separated paths defining the contents of the "common" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank,the JVM system loader will be used as Catalina's "common" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -common.loader=${catalina.home}/common/classes,${catalina.home}/common/i18n/*.jar,${catalina.home}/common/endorsed/*.jar,${catalina.home}/common/lib/*.jar - -# -# List of comma-separated paths defining the contents of the "server" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank, the "common" loader will be used as Catalina's "server" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -server.loader=${catalina.home}/server/classes,${catalina.home}/server/lib/*.jar - -# -# List of comma-separated paths defining the contents of the "shared" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, -# the "common" loader will be used as Catalina's "shared" loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -# Please note that for individual jar files, e.g. bar.jar, you need the URL form -# starting with file:. -shared.loader=${catalina.base}/shared/classes,${catalina.base}/shared/lib/*.jar - -# -# String cache configuration. -tomcat.util.buf.StringCache.byte.enabled=true -#tomcat.util.buf.StringCache.char.enabled=true -#tomcat.util.buf.StringCache.trainThreshold=500000 -#tomcat.util.buf.StringCache.cacheSize=5000 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml deleted file mode 100644 index 895adb9b1..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/context.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - WEB-INF/web.xml - - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties deleted file mode 100644 index 07f85e265..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/logging.properties +++ /dev/null @@ -1,74 +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. -# - -handlers = 1catalina.org.apache.juli.FileHandler, 2localhost.org.apache.juli.FileHandler, 3manager.org.apache.juli.FileHandler, 4admin.org.apache.juli.FileHandler, 5host-manager.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -.handlers = 1catalina.org.apache.juli.FileHandler, java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -1catalina.org.apache.juli.FileHandler.level = FINE -1catalina.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -1catalina.org.apache.juli.FileHandler.prefix = catalina. - -2localhost.org.apache.juli.FileHandler.level = FINE -2localhost.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -2localhost.org.apache.juli.FileHandler.prefix = localhost. - -3manager.org.apache.juli.FileHandler.level = FINE -3manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -3manager.org.apache.juli.FileHandler.prefix = manager. - -4admin.org.apache.juli.FileHandler.level = FINE -4admin.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -4admin.org.apache.juli.FileHandler.prefix = admin. - -5host-manager.org.apache.juli.FileHandler.level = FINE -5host-manager.org.apache.juli.FileHandler.directory = ${catalina.base}/logs -5host-manager.org.apache.juli.FileHandler.prefix = host-manager. - -java.util.logging.ConsoleHandler.level = FINE -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = 2localhost.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = 3manager.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = 4admin.org.apache.juli.FileHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = 5host-manager.org.apache.juli.FileHandler - -# For example, set the com.xyz.foo logger to only log SEVERE -# messages: -#org.apache.catalina.startup.ContextConfig.level = FINE -#org.apache.catalina.startup.HostConfig.level = FINE -#org.apache.catalina.session.ManagerBase.level = FINE diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml deleted file mode 100644 index 316475801..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server-minimal.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml deleted file mode 100644 index 22a041059..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/server.xml +++ /dev/null @@ -1,384 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml deleted file mode 100644 index 472566645..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/tomcat-users.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml deleted file mode 100644 index 0263f1e46..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat5x/conf/web.xml +++ /dev/null @@ -1,1183 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.apache.catalina.servlets.DefaultServlet - - debug - 0 - - - listings - false - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - fork - false - - - xpoweredBy - false - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - / - - - - - - - - jsp - *.jsp - - - - jsp - *.jspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 30 - - - - - - - - - - - - abs - audio/x-mpeg - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - aim - application/x-aim - - - art - image/x-jg - - - asf - video/x-ms-asf - - - asx - video/x-ms-asf - - - au - audio/basic - - - avi - video/x-msvideo - - - avx - video/x-rad-screenplay - - - bcpio - application/x-bcpio - - - bin - application/octet-stream - - - bmp - image/bmp - - - body - text/html - - - cdf - application/x-netcdf - - - cer - application/x-x509-ca-cert - - - class - application/java - - - cpio - application/x-cpio - - - csh - application/x-csh - - - css - text/css - - - dib - image/bmp - - - doc - application/msword - - - dtd - application/xml-dtd - - - dv - video/x-dv - - - dvi - application/x-dvi - - - eps - application/postscript - - - etx - text/x-setext - - - exe - application/octet-stream - - - gif - image/gif - - - gtar - application/x-gtar - - - gz - application/x-gzip - - - hdf - application/x-hdf - - - htc - text/x-component - - - htm - text/html - - - html - text/html - - - hqx - application/mac-binhex40 - - - ico - image/x-icon - - - ief - image/ief - - - jad - text/vnd.sun.j2me.app-descriptor - - - jar - application/java-archive - - - java - text/plain - - - jnlp - application/x-java-jnlp-file - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - js - text/javascript - - - jsf - text/plain - - - jspf - text/plain - - - kar - audio/midi - - - latex - application/x-latex - - - m3u - audio/x-mpegurl - - - mac - image/x-macpaint - - - man - application/x-troff-man - - - mathml - application/mathml+xml - - - me - application/x-troff-me - - - mid - audio/midi - - - midi - audio/midi - - - mif - application/vnd.mif - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp1 - audio/x-mpeg - - - mp2 - audio/mpeg - - - mp3 - audio/mpeg - - - mpa - audio/x-mpeg - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpega - audio/x-mpeg - - - mpg - video/mpeg - - - mpv2 - video/mpeg2 - - - ms - application/x-troff-ms - - - nc - application/x-netcdf - - - oda - application/oda - - - - odb - application/vnd.oasis.opendocument.database - - - - odc - application/vnd.oasis.opendocument.chart - - - - odf - application/vnd.oasis.opendocument.formula - - - - odg - application/vnd.oasis.opendocument.graphics - - - - odi - application/vnd.oasis.opendocument.image - - - - odm - application/vnd.oasis.opendocument.text-master - - - - odp - application/vnd.oasis.opendocument.presentation - - - - ods - application/vnd.oasis.opendocument.spreadsheet - - - - odt - application/vnd.oasis.opendocument.text - - - ogg - application/ogg - - - - otg - application/vnd.oasis.opendocument.graphics-template - - - - oth - application/vnd.oasis.opendocument.text-web - - - - otp - application/vnd.oasis.opendocument.presentation-template - - - - ots - application/vnd.oasis.opendocument.spreadsheet-template - - - - ott - application/vnd.oasis.opendocument.text-template - - - pbm - image/x-portable-bitmap - - - pct - image/pict - - - pdf - application/pdf - - - pgm - image/x-portable-graymap - - - pic - image/pict - - - pict - image/pict - - - pls - audio/x-scpls - - - png - image/png - - - pnm - image/x-portable-anymap - - - pnt - image/x-macpaint - - - ppm - image/x-portable-pixmap - - - pps - application/vnd.ms-powerpoint - - - ppt - application/vnd.ms-powerpoint - - - ps - application/postscript - - - psd - image/x-photoshop - - - qt - video/quicktime - - - qti - image/x-quicktime - - - qtif - image/x-quicktime - - - ras - image/x-cmu-raster - - - rdf - application/rdf+xml - - - rgb - image/x-rgb - - - rm - application/vnd.rn-realmedia - - - roff - application/x-troff - - - rtf - text/rtf - - - rtx - text/richtext - - - sh - application/x-sh - - - shar - application/x-shar - - - - smf - audio/x-midi - - - sit - application/x-stuffit - - - snd - audio/basic - - - src - application/x-wais-source - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svg - image/svg+xml - - - svgz - image/svg - - - swf - application/x-shockwave-flash - - - t - application/x-troff - - - tar - application/x-tar - - - tcl - application/x-tcl - - - tex - application/x-tex - - - texi - application/x-texinfo - - - texinfo - application/x-texinfo - - - tif - image/tiff - - - tiff - image/tiff - - - tr - application/x-troff - - - tsv - text/tab-separated-values - - - txt - text/plain - - - ulw - audio/basic - - - ustar - application/x-ustar - - - vrml - model/vrml - - - vsd - application/x-visio - - - vxml - application/voicexml+xml - - - wav - audio/x-wav - - - - wbmp - image/vnd.wap.wbmp - - - - wml - text/vnd.wap.wml - - - - wmlc - application/vnd.wap.wmlc - - - - wmls - text/vnd.wap.wmlscript - - - - wmlscriptc - application/vnd.wap.wmlscriptc - - - wrl - model/vrml - - - xbm - image/x-xbitmap - - - xht - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xls - application/vnd.ms-excel - - - xml - application/xml - - - xpm - image/x-xpixmap - - - xsl - application/xml - - - xslt - application/xslt+xml - - - xul - application/vnd.mozilla.xul+xml - - - xwd - image/x-xwindowdump - - - Z - application/x-compress - - - z - application/x-compress - - - zip - application/zip - - - - - - - - - - - - - - - - index.html - index.htm - index.jsp - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml deleted file mode 100644 index af0692056..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/archiva.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml deleted file mode 100644 index 1e31ca5d4..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/host-manager.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml deleted file mode 100644 index 7229a88cf..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/Catalina/localhost/manager.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy deleted file mode 100644 index 167e10ff0..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.policy +++ /dev/null @@ -1,7 +0,0 @@ - grant { - permission java.security.AllPermission; - }; - -grant codeBase "file:${catalina.home}/lib/tomcat-juli.jar" { - permission java.lang.RuntimePermission "setContextClassLoader"; -}; \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties deleted file mode 100644 index 4cb90ce92..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/catalina.properties +++ /dev/null @@ -1,81 +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. - -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageAccess unless the -# corresponding RuntimePermission ("accessClassInPackage."+package) has -# been granted. -package.access=sun.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper.,sun.beans. -# -# List of comma-separated packages that start with or equal this string -# will cause a security exception to be thrown when -# passed to checkPackageDefinition unless the -# corresponding RuntimePermission ("defineClassInPackage."+package) has -# been granted. -# -# by default, no packages are restricted for definition, and none of -# the class loaders supplied with the JDK call checkPackageDefinition. -# -package.definition=sun.,java.,org.apache.catalina.,org.apache.coyote.,org.apache.tomcat.,org.apache.jasper. - -# -# -# List of comma-separated paths defining the contents of the "common" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank,the JVM system loader will be used as Catalina's "common" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -common.loader=${catalina.base}/lib,${catalina.base}/lib/*.jar,${catalina.home}/lib,${catalina.home}/lib/*.jar - -# -# List of comma-separated paths defining the contents of the "server" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_HOME or CATALINA_BASE path or absolute. -# If left as blank, the "common" loader will be used as Catalina's "server" -# loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -server.loader= - -# -# List of comma-separated paths defining the contents of the "shared" -# classloader. Prefixes should be used to define what is the repository type. -# Path may be relative to the CATALINA_BASE path or absolute. If left as blank, -# the "common" loader will be used as Catalina's "shared" loader. -# Examples: -# "foo": Add this folder as a class repository -# "foo/*.jar": Add all the JARs of the specified folder as class -# repositories -# "foo/bar.jar": Add bar.jar as a class repository -# Please note that for single jars, e.g. bar.jar, you need the URL form -# starting with file:. -shared.loader= - -# -# String cache configuration. -tomcat.util.buf.StringCache.byte.enabled=true -#tomcat.util.buf.StringCache.char.enabled=true -#tomcat.util.buf.StringCache.trainThreshold=500000 -#tomcat.util.buf.StringCache.cacheSize=5000 diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml deleted file mode 100644 index 876067a0f..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/context.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - WEB-INF/web.xml - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties deleted file mode 100644 index 9808c7340..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/logging.properties +++ /dev/null @@ -1,46 +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. - -handlers = java.util.logging.ConsoleHandler - -############################################################ -# Handler specific properties. -# Describes specific configuration info for Handlers. -############################################################ - -java.util.logging.ConsoleHandler.level = FINE -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter - -############################################################ -# Facility specific properties. -# Provides extra control for each logger. -############################################################ - -org.apache.catalina.level = @catalina.logging.level@ -org.apache.catalina.startup.HostConfig.level = INFO -org.apache.catalina.session.ManagerBase.level = INFO - - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].handlers = java.util.logging.ConsoleHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/manager].handlers = java.util.logging.ConsoleHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/admin].handlers = java.util.logging.ConsoleHandler - -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].level = INFO -org.apache.catalina.core.ContainerBase.[Catalina].[localhost].[/host-manager].handlers = java.util.logging.ConsoleHandler \ No newline at end of file diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml deleted file mode 100644 index cc5923767..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/server.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml deleted file mode 100644 index 34e268d84..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/tomcat-users.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/web.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/web.xml deleted file mode 100644 index 05f7c77f3..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/tomcat6x/conf/web.xml +++ /dev/null @@ -1,1205 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - org.apache.catalina.servlets.DefaultServlet - - debug - 0 - - - listings - false - - 1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - jsp - org.apache.jasper.servlet.JspServlet - - fork - false - - - xpoweredBy - false - - 3 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - default - / - - - - - - - - jsp - *.jsp - - - - jsp - *.jspx - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 30 - - - - - - - - - - - - abs - audio/x-mpeg - - - ai - application/postscript - - - aif - audio/x-aiff - - - aifc - audio/x-aiff - - - aiff - audio/x-aiff - - - aim - application/x-aim - - - art - image/x-jg - - - asf - video/x-ms-asf - - - asx - video/x-ms-asf - - - au - audio/basic - - - avi - video/x-msvideo - - - avx - video/x-rad-screenplay - - - bcpio - application/x-bcpio - - - bin - application/octet-stream - - - bmp - image/bmp - - - body - text/html - - - cdf - application/x-cdf - - - cer - application/x-x509-ca-cert - - - class - application/java - - - cpio - application/x-cpio - - - csh - application/x-csh - - - css - text/css - - - dib - image/bmp - - - doc - application/msword - - - dtd - application/xml-dtd - - - dv - video/x-dv - - - dvi - application/x-dvi - - - eps - application/postscript - - - etx - text/x-setext - - - exe - application/octet-stream - - - gif - image/gif - - - gtar - application/x-gtar - - - gz - application/x-gzip - - - hdf - application/x-hdf - - - hqx - application/mac-binhex40 - - - htc - text/x-component - - - htm - text/html - - - html - text/html - - - hqx - application/mac-binhex40 - - - ief - image/ief - - - jad - text/vnd.sun.j2me.app-descriptor - - - jar - application/java-archive - - - java - text/plain - - - jnlp - application/x-java-jnlp-file - - - jpe - image/jpeg - - - jpeg - image/jpeg - - - jpg - image/jpeg - - - js - text/javascript - - - jsf - text/plain - - - jspf - text/plain - - - kar - audio/x-midi - - - latex - application/x-latex - - - m3u - audio/x-mpegurl - - - mac - image/x-macpaint - - - man - application/x-troff-man - - - mathml - application/mathml+xml - - - me - application/x-troff-me - - - mid - audio/x-midi - - - midi - audio/x-midi - - - mif - application/x-mif - - - mov - video/quicktime - - - movie - video/x-sgi-movie - - - mp1 - audio/x-mpeg - - - mp2 - audio/x-mpeg - - - mp3 - audio/x-mpeg - - - mp4 - video/mp4 - - - mpa - audio/x-mpeg - - - mpe - video/mpeg - - - mpeg - video/mpeg - - - mpega - audio/x-mpeg - - - mpg - video/mpeg - - - mpv2 - video/mpeg2 - - - ms - application/x-wais-source - - - nc - application/x-netcdf - - - oda - application/oda - - - - odb - application/vnd.oasis.opendocument.database - - - - odc - application/vnd.oasis.opendocument.chart - - - - odf - application/vnd.oasis.opendocument.formula - - - - odg - application/vnd.oasis.opendocument.graphics - - - - odi - application/vnd.oasis.opendocument.image - - - - odm - application/vnd.oasis.opendocument.text-master - - - - odp - application/vnd.oasis.opendocument.presentation - - - - ods - application/vnd.oasis.opendocument.spreadsheet - - - - odt - application/vnd.oasis.opendocument.text - - - ogg - application/ogg - - - - otg - application/vnd.oasis.opendocument.graphics-template - - - - oth - application/vnd.oasis.opendocument.text-web - - - - otp - application/vnd.oasis.opendocument.presentation-template - - - - ots - application/vnd.oasis.opendocument.spreadsheet-template - - - - ott - application/vnd.oasis.opendocument.text-template - - - pbm - image/x-portable-bitmap - - - pct - image/pict - - - pdf - application/pdf - - - pgm - image/x-portable-graymap - - - pic - image/pict - - - pict - image/pict - - - pls - audio/x-scpls - - - png - image/png - - - pnm - image/x-portable-anymap - - - pnt - image/x-macpaint - - - ppm - image/x-portable-pixmap - - - ppt - application/vnd.ms-powerpoint - - - pps - application/vnd.ms-powerpoint - - - ps - application/postscript - - - psd - image/x-photoshop - - - qt - video/quicktime - - - qti - image/x-quicktime - - - qtif - image/x-quicktime - - - ras - image/x-cmu-raster - - - rdf - application/rdf+xml - - - rgb - image/x-rgb - - - rm - application/vnd.rn-realmedia - - - roff - application/x-troff - - - rtf - application/rtf - - - rtx - text/richtext - - - sh - application/x-sh - - - shar - application/x-shar - - - - smf - audio/x-midi - - - sit - application/x-stuffit - - - snd - audio/basic - - - src - application/x-wais-source - - - sv4cpio - application/x-sv4cpio - - - sv4crc - application/x-sv4crc - - - svg - image/svg+xml - - - svgz - image/svg+xml - - - swf - application/x-shockwave-flash - - - t - application/x-troff - - - tar - application/x-tar - - - tcl - application/x-tcl - - - tex - application/x-tex - - - texi - application/x-texinfo - - - texinfo - application/x-texinfo - - - tif - image/tiff - - - tiff - image/tiff - - - tr - application/x-troff - - - tsv - text/tab-separated-values - - - txt - text/plain - - - ulw - audio/basic - - - ustar - application/x-ustar - - - vxml - application/voicexml+xml - - - xbm - image/x-xbitmap - - - xht - application/xhtml+xml - - - xhtml - application/xhtml+xml - - - xls - application/vnd.ms-excel - - - xml - application/xml - - - xpm - image/x-xpixmap - - - xsl - application/xml - - - xslt - application/xslt+xml - - - xul - application/vnd.mozilla.xul+xml - - - xwd - image/x-xwindowdump - - - vsd - application/x-visio - - - wav - audio/x-wav - - - - wbmp - image/vnd.wap.wbmp - - - - wml - text/vnd.wap.wml - - - - wmlc - application/vnd.wap.wmlc - - - - wmls - text/vnd.wap.wmlscript - - - - wmlscriptc - application/vnd.wap.wmlscriptc - - - wmv - video/x-ms-wmv - - - wrl - x-world/x-vrml - - - wspolicy - application/wspolicy+xml - - - Z - application/x-compress - - - z - application/x-compress - - - zip - application/zip - - - - - - - - - - - - - - - - index.html - index.htm - index.jsp - - - -- 2.39.5