diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml index e8607fb3b..d0095c1ba 100644 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml +++ b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/config/testng.xml @@ -42,7 +42,6 @@ under the License. - diff --git a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java b/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java deleted file mode 100644 index 1734ad477..000000000 --- a/archiva-modules/archiva-web/archiva-webapp-test/src/test/testng/org/apache/archiva/web/test/DatabaseTest.java +++ /dev/null @@ -1,95 +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 = { "database" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) -public class DatabaseTest - extends AbstractRepositoryTest -{ - public void testUpdateCron_NullValue() - { - goToDatabasePage(); - setFieldValue( "database_cron" , ""); - clickButtonWithValue( "Update Cron" ); - assertTextPresent( "Invalid cron expression value(s)" ); - assertTextPresent( "You must enter a cron expression." ); - } - - @Test (dependsOnMethods = { "testUpdateCron_NullValue" } ) - public void testUpdateCron_InvalidValue() - { - setFieldValue( "database_cron" , "asdf" ); - clickButtonWithValue( "Update Cron" ); - assertTextPresent( "Invalid cron expression value(s)" ); - } - - @Test (dependsOnMethods = { "testUpdateCron_InvalidValue" } ) - public void testUpdateCron_ValidValue() - { - setFieldValue( "database_cron" , "0 0 * * * ?" ); - clickButtonWithValue( "Update Cron" ); - assertPage( "Apache Archiva \\ Administration - Database" ); - } - - @Test (dependsOnMethods = { "testUpdateCron_ValidValue" } ) - public void testUpdateConsumersUnprocessedArtifactsScanning_UnsetAll() - { - getSelenium().uncheck( "enabledUnprocessedConsumers" ); - clickSubmitWithLocator( "//input[@id='database_0' and @value='Update Consumers']" ); - - assertPage( "Apache Archiva \\ Administration - Database" ); - } - - @Test (dependsOnMethods = { "testUpdateConsumersUnprocessedArtifactsScanning_UnsetAll" } ) - public void testUpdateConsumersUnprocessedArtifactsScanning() - { - checkField( "enabledUnprocessedConsumers" ); - clickSubmitWithLocator( "//input[@id='database_0' and @value='Update Consumers']" ); - assertPage( "Apache Archiva \\ Administration - Database" ); - } - - @Test (dependsOnMethods = { "testUpdateConsumersUnprocessedArtifactsScanning" } ) - public void testUpdateConsumersArtifactCleanupScanning_UnsetAll() - { - getSelenium().uncheck( "enabledCleanupConsumers" ); - getSelenium().uncheck( "//input[@name='enabledCleanupConsumers' and @value='not-present-remove-db-project']" ); - getSelenium().uncheck( "//input[@name='enabledCleanupConsumers' and @value='not-present-remove-indexed']" ); - clickSubmitWithLocator( "//form[@id='database']/table/tbody/tr[5]/td/input" ); - assertPage( "Apache Archiva \\ Administration - Database" ); - } - - @Test (dependsOnMethods = { "testUpdateConsumersArtifactCleanupScanning_UnsetAll" } ) - public void testUpdateConsumersArtifactCleanupScanning() - { - checkField( "enabledCleanupConsumers" ); - clickSubmitWithLocator( "//form[@id='database']/table/tbody/tr[5]/td/input" ); - assertPage( "Apache Archiva \\ Administration - Database" ); - } - - @Test (dependsOnMethods = { "testUpdateConsumersArtifactCleanupScanning" } ) - public void testUpdateDatabaseNow() - { - clickButtonWithValue( "Update Database Now" ); - assertPage( "Apache Archiva \\ Administration - Database" ); - } -} 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 index 6d00d1a32..74480e810 100644 --- 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 @@ -20,8 +20,8 @@ package org.apache.archiva.web.test; */ import org.apache.archiva.web.test.parent.AbstractRepositoryTest; -import org.testng.annotations.Test; import org.testng.Assert; +import org.testng.annotations.Test; @Test( groups = { "reposcan" }, dependsOnMethods = { "testWithCorrectUsernamePassword" }, sequential = true ) public class RepositoryScanningTest @@ -173,7 +173,6 @@ public class RepositoryScanningTest 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='update-db-artifact']" ); getSelenium().uncheck( "//input[@name='enabledKnownContentConsumers' and @value='validate-checksums']" ); clickButtonWithValue( "Update Consumers" ); 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 index 95e2fa853..732142cff 100644 --- 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 @@ -399,7 +399,7 @@ public abstract class AbstractArchivaTest 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,Database"; + 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 ); 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 index cb4fee208..d4d090a5b 100644 --- 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 @@ -26,14 +26,13 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Properties; import java.util.Map.Entry; - -import org.apache.commons.io.IOUtils; -import org.testng.Assert; +import java.util.Properties; import com.thoughtworks.selenium.DefaultSelenium; import com.thoughtworks.selenium.Selenium; +import org.apache.commons.io.IOUtils; +import org.testng.Assert; /** * @author Emmanuel Venisse @@ -176,7 +175,7 @@ public abstract class AbstractSeleniumTest { public void assertLinkPresent( String text ) { - Assert.assertTrue( isElementPresent( "link=" + text ), "The link '" + text + "' isî't present." ); + Assert.assertTrue( isElementPresent( "link=" + text ), "The link '" + text + "' isn't present." ); } public void assertLinkNotPresent( String text )