diff options
author | simonbrandhof <simon.brandhof@gmail.com> | 2010-09-10 14:47:07 +0000 |
---|---|---|
committer | simonbrandhof <simon.brandhof@gmail.com> | 2010-09-10 14:47:07 +0000 |
commit | 8c95433db8c26f2a1b04f8be178ac5dacfef73ba (patch) | |
tree | b2184af10b4a2aed248e64b0905f2075ebb9eadd | |
parent | f99351ab3d3d8b139aacdf938d171450d31e7bee (diff) | |
download | sonarqube-8c95433db8c26f2a1b04f8be178ac5dacfef73ba.tar.gz sonarqube-8c95433db8c26f2a1b04f8be178ac5dacfef73ba.zip |
* quality models : rename ModelProvider to ModelFinder
* fix some integration tests
43 files changed, 325 insertions, 1013 deletions
diff --git a/sonar-batch/src/main/java/org/sonar/batch/ProjectBatch.java b/sonar-batch/src/main/java/org/sonar/batch/ProjectBatch.java index 48509f15dc5..c3298085af1 100644 --- a/sonar-batch/src/main/java/org/sonar/batch/ProjectBatch.java +++ b/sonar-batch/src/main/java/org/sonar/batch/ProjectBatch.java @@ -33,7 +33,7 @@ import org.sonar.api.resources.Project; import org.sonar.api.rules.DefaultRulesManager; import org.sonar.api.utils.IocContainer; import org.sonar.batch.indexer.DefaultSonarIndex; -import org.sonar.core.qualitymodel.DefaultModelProvider; +import org.sonar.core.qualitymodel.DefaultModelFinder; import org.sonar.core.rule.DefaultRuleFinder; import org.sonar.jpa.dao.*; @@ -88,7 +88,7 @@ public class ProjectBatch { batchContainer.as(Characteristics.CACHE).addComponent(ViolationsDao.class); batchContainer.as(Characteristics.CACHE).addComponent(ViolationFilters.class); batchContainer.as(Characteristics.CACHE).addComponent(ResourceFilters.class); - batchContainer.as(Characteristics.CACHE).addComponent(DefaultModelProvider.class); + batchContainer.as(Characteristics.CACHE).addComponent(DefaultModelFinder.class); batchContainer.as(Characteristics.CACHE).addComponent(DefaultRuleFinder.class); batchContainer.addAdapter(new ProfileProvider()); batchContainer.addAdapter(new CheckProfileProvider()); diff --git a/sonar-core/src/main/java/org/sonar/core/qualitymodel/DefaultModelProvider.java b/sonar-core/src/main/java/org/sonar/core/qualitymodel/DefaultModelFinder.java index 7f8f561bc97..11d20a2ad74 100644 --- a/sonar-core/src/main/java/org/sonar/core/qualitymodel/DefaultModelProvider.java +++ b/sonar-core/src/main/java/org/sonar/core/qualitymodel/DefaultModelFinder.java @@ -24,27 +24,27 @@ import org.slf4j.LoggerFactory; import org.sonar.api.database.DatabaseSession; import org.sonar.api.qualitymodel.Model; import org.sonar.api.qualitymodel.ModelDefinition; -import org.sonar.api.qualitymodel.ModelProvider; +import org.sonar.api.qualitymodel.ModelFinder; import org.sonar.api.utils.Logs; import org.sonar.api.utils.SonarException; import org.sonar.jpa.session.DatabaseSessionFactory; import javax.persistence.Query; -public class DefaultModelProvider implements ModelProvider { +public class DefaultModelFinder implements ModelFinder { private ModelDefinition[] definitions; private DatabaseSessionFactory sessionFactory; - public DefaultModelProvider(DatabaseSessionFactory sessionFactory, ModelDefinition[] definitions) { + public DefaultModelFinder(DatabaseSessionFactory sessionFactory, ModelDefinition[] definitions) { this.sessionFactory = sessionFactory; this.definitions = definitions; } /** - * this constructor is used when there are no templates + * This constructor is used when there are no templates */ - public DefaultModelProvider(DatabaseSessionFactory sessionFactory) { + public DefaultModelFinder(DatabaseSessionFactory sessionFactory) { this.sessionFactory = sessionFactory; this.definitions = new ModelDefinition[0]; } diff --git a/sonar-core/src/test/java/org/sonar/core/qualitymodel/DefaultModelProviderTest.java b/sonar-core/src/test/java/org/sonar/core/qualitymodel/DefaultModelFinderTest.java index beb59782327..1808348c376 100644 --- a/sonar-core/src/test/java/org/sonar/core/qualitymodel/DefaultModelProviderTest.java +++ b/sonar-core/src/test/java/org/sonar/core/qualitymodel/DefaultModelFinderTest.java @@ -30,12 +30,12 @@ import java.util.List; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; -public class DefaultModelProviderTest extends AbstractDbUnitTestCase { +public class DefaultModelFinderTest extends AbstractDbUnitTestCase { @Test public void reset() { setupData("shared"); - DefaultModelProvider provider = new DefaultModelProvider(getSessionFactory()); + DefaultModelFinder provider = new DefaultModelFinder(getSessionFactory()); Model model = Model.createByName("M1"); Characteristic c1 = model.createCharacteristicByName("NEWM1C1"); @@ -55,7 +55,7 @@ public class DefaultModelProviderTest extends AbstractDbUnitTestCase { @Test public void findByName() { setupData("shared"); - DefaultModelProvider provider = new DefaultModelProvider(getSessionFactory()); + DefaultModelFinder provider = new DefaultModelFinder(getSessionFactory()); Model model = provider.findByName("M1"); assertNotNull(model); assertNotNull(model.getCharacteristicByName("M1C1")); @@ -64,14 +64,14 @@ public class DefaultModelProviderTest extends AbstractDbUnitTestCase { @Test public void findByNameNotFound() { setupData("shared"); - DefaultModelProvider provider = new DefaultModelProvider(getSessionFactory()); + DefaultModelFinder provider = new DefaultModelFinder(getSessionFactory()); assertNull(provider.findByName("UNKNOWN")); } @Test public void noDefinitionsToRegister() { setupData("shared"); - DefaultModelProvider provider = new DefaultModelProvider(getSessionFactory()); + DefaultModelFinder provider = new DefaultModelFinder(getSessionFactory()); provider.registerDefinitions(); // same state @@ -87,7 +87,7 @@ public class DefaultModelProviderTest extends AbstractDbUnitTestCase { ModelDefinition newDefinition = new FakeDefinition("NEWMODEL"); ModelDefinition[] definitions = new ModelDefinition[]{existingDefinition, newDefinition}; - DefaultModelProvider provider = new DefaultModelProvider(getSessionFactory(), definitions); + DefaultModelFinder provider = new DefaultModelFinder(getSessionFactory(), definitions); provider.registerDefinitions(); List<Model> models = getSession().getResults(Model.class); @@ -97,13 +97,13 @@ public class DefaultModelProviderTest extends AbstractDbUnitTestCase { @Test public void exists() { setupData("shared"); - assertTrue(DefaultModelProvider.exists(getSession(), "M1")); + assertTrue(DefaultModelFinder.exists(getSession(), "M1")); } @Test public void notExists() { setupData("shared"); - assertFalse(DefaultModelProvider.exists(getSession(), "UNKNOWN")); + assertFalse(DefaultModelFinder.exists(getSession(), "UNKNOWN")); } } diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/noDefinitionsToRegister-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/noDefinitionsToRegister-result.xml index e1f6a9edc04..e1f6a9edc04 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/noDefinitionsToRegister-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/noDefinitionsToRegister-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/registerOnlyNewDefinitions-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/registerOnlyNewDefinitions-result.xml index a33aec7b5e5..a33aec7b5e5 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/registerOnlyNewDefinitions-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/registerOnlyNewDefinitions-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/reset-result.xml b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/reset-result.xml index 4eaeb3441d9..4eaeb3441d9 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/reset-result.xml +++ b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/reset-result.xml diff --git a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/shared.xml b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml index e1f6a9edc04..e1f6a9edc04 100644 --- a/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelProviderTest/shared.xml +++ b/sonar-core/src/test/resources/org/sonar/core/qualitymodel/DefaultModelFinderTest/shared.xml diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Characteristic.java b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Characteristic.java index ba09013cb23..3922ec8d3b2 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Characteristic.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Characteristic.java @@ -68,7 +68,6 @@ public final class Characteristic implements Comparable<Characteristic> { @Column(name = "description", nullable = true, length = 4000) private String description; - @ManyToMany @JoinTable( name = "characteristic_edges", @@ -82,6 +81,7 @@ public final class Characteristic implements Comparable<Characteristic> { @ManyToMany(mappedBy = "parents", cascade = CascadeType.ALL) private List<Characteristic> children = new ArrayList<Characteristic>(); + Characteristic() { } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java index 079b4573518..5e698902084 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/Model.java @@ -21,6 +21,7 @@ package org.sonar.api.qualitymodel; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.rules.Rule; import java.util.ArrayList; @@ -45,6 +46,9 @@ public final class Model implements Comparable<Model> { @OneToMany(mappedBy = "model", cascade = CascadeType.ALL, fetch = FetchType.LAZY) private List<Characteristic> characteristics = new ArrayList<Characteristic>(); + /** + * Use the factory method <code>Model</code> + */ Model() { } @@ -155,7 +159,7 @@ public final class Model implements Comparable<Model> { @Override public String toString() { - return new ToStringBuilder(this) + return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE) .append("id", id) .append("name", name) .toString(); diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelDefinition.java b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelDefinition.java index 5d6980ccf7c..416059c0cad 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelDefinition.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelDefinition.java @@ -19,6 +19,8 @@ */ package org.sonar.api.qualitymodel; +import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang.builder.ToStringStyle; import org.sonar.api.ServerExtension; /** @@ -31,7 +33,7 @@ public abstract class ModelDefinition implements ServerExtension { private String name; - public ModelDefinition(String name) { + protected ModelDefinition(String name) { this.name = name; } @@ -58,4 +60,11 @@ public abstract class ModelDefinition implements ServerExtension { public final int hashCode() { return name.hashCode(); } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.SHORT_PREFIX_STYLE) + .append("name", name) + .toString(); + } } diff --git a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelProvider.java b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelFinder.java index 432ba848fcd..a41a01fbfb5 100644 --- a/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelProvider.java +++ b/sonar-plugin-api/src/main/java/org/sonar/api/qualitymodel/ModelFinder.java @@ -25,7 +25,7 @@ import org.sonar.api.ServerComponent; /** * @since 2.3 */ -public interface ModelProvider extends BatchComponent, ServerComponent { +public interface ModelFinder extends BatchComponent, ServerComponent { /** * @return null if the name is not found diff --git a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java index bab61bf655f..aec1073f6b5 100644 --- a/sonar-server/src/main/java/org/sonar/server/platform/Platform.java +++ b/sonar-server/src/main/java/org/sonar/server/platform/Platform.java @@ -34,7 +34,7 @@ import org.sonar.api.utils.HttpDownloader; import org.sonar.api.utils.IocContainer; import org.sonar.api.utils.TimeProfiler; import org.sonar.core.plugin.JpaPluginDao; -import org.sonar.core.qualitymodel.DefaultModelProvider; +import org.sonar.core.qualitymodel.DefaultModelFinder; import org.sonar.core.rule.DefaultRuleFinder; import org.sonar.jpa.dao.*; import org.sonar.jpa.session.DatabaseSessionFactory; @@ -154,7 +154,7 @@ public final class Platform { ServerPluginRepository pluginRepository = servicesContainer.getComponent(ServerPluginRepository.class); pluginRepository.registerPlugins(servicesContainer); - servicesContainer.as(Characteristics.CACHE).addComponent(DefaultModelProvider.class); // depends on plugins + servicesContainer.as(Characteristics.CACHE).addComponent(DefaultModelFinder.class); // depends on plugins servicesContainer.as(Characteristics.CACHE).addComponent(Plugins.class); servicesContainer.as(Characteristics.CACHE).addComponent(ChartFactory.class); servicesContainer.as(Characteristics.CACHE).addComponent(Languages.class); diff --git a/sonar-server/src/main/java/org/sonar/server/startup/RegisterQualityModels.java b/sonar-server/src/main/java/org/sonar/server/startup/RegisterQualityModels.java index 576c32453e3..b364bcbadff 100644 --- a/sonar-server/src/main/java/org/sonar/server/startup/RegisterQualityModels.java +++ b/sonar-server/src/main/java/org/sonar/server/startup/RegisterQualityModels.java @@ -20,11 +20,11 @@ package org.sonar.server.startup; import org.sonar.api.utils.TimeProfiler; -import org.sonar.core.qualitymodel.DefaultModelProvider; +import org.sonar.core.qualitymodel.DefaultModelFinder; public final class RegisterQualityModels { - private DefaultModelProvider provider; + private DefaultModelFinder provider; /** * @@ -32,7 +32,7 @@ public final class RegisterQualityModels { * @param registerRulesBeforeModels used only to be started after the creation of check templates */ // NOSONAR the parameter registerRulesBeforeModels is only used to provide the execution order by picocontainer - public RegisterQualityModels(DefaultModelProvider provider, RegisterRules registerRulesBeforeModels) { + public RegisterQualityModels(DefaultModelFinder provider, RegisterRules registerRulesBeforeModels) { this.provider = provider; } diff --git a/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb b/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb index 064174f54ba..13b9559f964 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb +++ b/sonar-server/src/main/webapp/WEB-INF/app/models/profile.rb @@ -28,8 +28,7 @@ class Profile < ActiveRecord::Base validates_uniqueness_of :name, :scope => :language, :case_sensitive => false validates_presence_of :name - validates_exclusion_of :name, :in => %w( active ), :message => "reserved" - + DEFAULT_PROFILE_NAME = 'Sun checks' def active? diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb index f6f81574756..2207696bb3f 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb @@ -6,10 +6,10 @@ <% if administrator? %> <ul style="float: right" class="horizontal"> <li class="marginleft10 add"> - <a href="#" onClick="$('create-form-<%= language.getKey() -%>').show();return false;">Create</a> + <a href="#" onClick="$('create-form-<%= language.getKey() -%>').show();return false;" id="create-link-<%= language.getKey() -%>">Create</a> </li> <li class="marginleft10 restore"> - <a href="#" onclick="$('restore-form-<%= language.getKey() -%>').show();return false;">Restore</a> + <a href="#" onclick="$('restore-form-<%= language.getKey() -%>').show();return false;" id="restore-link-<%= language.getKey() -%>">Restore</a> </li> </ul> <% end %> @@ -36,7 +36,7 @@ <tr> <td colspan="2"> - <input type="submit" value="Create <%= language.getName() %> profile"></input> + <input type="submit" value="Create <%= language.getName() %> profile" id="create-submit-<%= language.getKey() -%>"></input> <a href="#" onclick="$('create-form-<%= language.getKey()-%>').reset();$('create-form-<%= language.getKey()-%>').hide();return false;">Cancel</a> </td> </tr> diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb index 780260801fe..e74d184d833 100644 --- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb +++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/permalinks.html.erb @@ -7,7 +7,7 @@ <p>No permalinks</p> <% else %> <br/> - <table class="data2 without-header marginbottom10 "> + <table class="data2 without-header marginbottom10" id="permalinks-table"> <tbody> <% exporters.each do |exporter| %> <tr class="<%= cycle('even','odd') -%>"> diff --git a/sonar-server/src/test/java/org/sonar/server/startup/RegisterQualityModelsTest.java b/sonar-server/src/test/java/org/sonar/server/startup/RegisterQualityModelsTest.java index 29f12045038..fda03fc2077 100644 --- a/sonar-server/src/test/java/org/sonar/server/startup/RegisterQualityModelsTest.java +++ b/sonar-server/src/test/java/org/sonar/server/startup/RegisterQualityModelsTest.java @@ -20,7 +20,7 @@ package org.sonar.server.startup; import org.junit.Test; -import org.sonar.core.qualitymodel.DefaultModelProvider; +import org.sonar.core.qualitymodel.DefaultModelFinder; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -29,7 +29,7 @@ public class RegisterQualityModelsTest { @Test public void isASimpleBridgeOverProvider() { - DefaultModelProvider provider = mock(DefaultModelProvider.class); + DefaultModelFinder provider = mock(DefaultModelFinder.class); RegisterQualityModels startup = new RegisterQualityModels(provider, null); startup.start(); verify(provider).registerDefinitions(); diff --git a/tests/integration/tests/src/it/selenium/all-tests.html b/tests/integration/tests/src/it/selenium/all-tests.html index 1817c67b132..b197ebc252c 100644 --- a/tests/integration/tests/src/it/selenium/all-tests.html +++ b/tests/integration/tests/src/it/selenium/all-tests.html @@ -367,54 +367,53 @@ <td><a href="profiles/create_java_profile.html">profiles/create_java_profile</a></td> </tr> <tr> - <td><a href="profiles/profile_creation_with_duplicated_name.html">profiles/profile_creation_with_duplicated_name</a> + <td><a href="profiles/do-not-create-profile-with-existing-name.html">profiles/do-not-create-profile-with-existing-name</a> </td> </tr> <tr> - <td><a href="profiles/profile_creation_with_cancelling.html">profiles/profile_creation_with_cancelling</a></td> + <td><a href="profiles/cancel-profile-creation.html">profiles/cancel-profile-creation</a></td> </tr> <tr> - <td><a href="profiles/profile_name_active_is_reserved.html">profiles/profile_name_active_is_reserved</a></td> + <td><a href="profiles/delete-profile.html">profiles/delete-profile</a></td> </tr> <tr> - <td><a href="profiles/profile_delete.html">profiles/profile_delete</a></td> + <td><a href="profiles/activate-profile.html">profiles/activate-profile</a></td> </tr> <tr> - <td><a href="profiles/activate_profile.html">profiles/activate_profile</a></td> + <td><a href="profiles/copy-profile.html">profiles/copy-profile</a></td> </tr> <tr> - <td><a href="profiles/profile_duplication_success.html">profiles/profile_duplication_success</a></td> + <td><a href="profiles/do-not-copy-with-blank-name.html">profiles/do-not-copy-with-blank-name</a></td> </tr> <tr> - <td><a href="profiles/profile_duplication_with_blank_name.html">profiles/profile_duplication_with_blank_name</a></td> -</tr> -<tr> - <td><a href="profiles/profile_duplication_with_name_already_exists.html">profiles/profile_duplication_with_name_already_exists</a> + <td><a href="profiles/do-not-copy-with-existing-name.html">profiles/do-not-copy-with-existing-name</a> </td> </tr> <tr> - <td><a href="profiles/profile_security_logged.html">profiles/profile_security_logged</a></td> + <td><a href="profiles/read-only-mode-when-anonymous-user.html">profiles/read-only-mode-when-anonymous-user</a></td> </tr> <tr> - <td><a href="profiles/no_actions_when_anonymous.html">profiles/no_actions_when_anonymous</a></td> + <td><a href="profiles/do-not-delete-provided-profiles.html">profiles/do-not-delete-provided-profiles</a> + </td> </tr> <tr> - <td><a href="profiles/profile_delete_active_profile_not_provided.html">profiles/profile_delete_active_profile_not_provided</a> + <td><a href="profiles/permalink-to-checkstyle-configuration.html">profiles/permalink-to-checkstyle-configuration</a> </td> </tr> <tr> - <td><a href="profiles/should_not_delete_provided_profiles.html">profiles/should_not_delete_provided_profiles</a> + <td><a href="profiles/permalink-to-default-checkstyle-configuration.html">profiles/permalink-to-default-checkstyle-configuration</a> </td> </tr> <tr> - <td><a href="profiles/profile_export_pmd_checkstyle_actives.html">profiles/profile_export_pmd_checkstyle_actives</a> + <td><a href="profiles/permalink-to-pmd-configuration.html">profiles/permalink-to-pmd-configuration</a> </td> </tr> <tr> - <td><a href="profiles/profile_to_project_link_unlink.html">profiles/profile_to_project_link_unlink</a></td> + <td><a href="profiles/display-permalinks-to-tools.html">profiles/display-permalinks-to-tools</a> + </td> </tr> <tr> - <td><a href="profiles/should_not_delete_default_profile.html">profiles/should_not_delete_default_profile.</a></td> + <td><a href="profiles/profile_to_project_link_unlink.html">profiles/profile_to_project_link_unlink</a></td> </tr> <tr> <td><a href="profiles/should_import_checkstyle_findbugs_pmd.html">profiles/should_import_checkstyle_findbugs_pmd</a> diff --git a/tests/integration/tests/src/it/selenium/authentication/login_cancel.html b/tests/integration/tests/src/it/selenium/authentication/login_cancel.html index 1ccdb1e23fd..4652916b195 100644 --- a/tests/integration/tests/src/it/selenium/authentication/login_cancel.html +++ b/tests/integration/tests/src/it/selenium/authentication/login_cancel.html @@ -23,7 +23,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>link=cancel</td> + <td>link=Cancel</td> <td></td> </tr> <tr> diff --git a/tests/integration/tests/src/it/selenium/profiles/SONAR-560_remove_a_rule_from_sonar_way.html b/tests/integration/tests/src/it/selenium/profiles/SONAR-560_remove_a_rule_from_sonar_way.html index 3aa6ad60ef2..eec3f8cfa2d 100644 --- a/tests/integration/tests/src/it/selenium/profiles/SONAR-560_remove_a_rule_from_sonar_way.html +++ b/tests/integration/tests/src/it/selenium/profiles/SONAR-560_remove_a_rule_from_sonar_way.html @@ -3,7 +3,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> +<link rel="selenium.base" href="http://localhost:9000/" /> <title>SONAR-560_remove_a_rule_from_sonar_way</title> </head> <body> @@ -18,7 +18,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>rules_java_Sonar%20way</td> + <td>link=Sonar way</td> <td></td> </tr> <tr> diff --git a/tests/integration/tests/src/it/selenium/profiles/activate_profile.html b/tests/integration/tests/src/it/selenium/profiles/activate-profile.html index 454fb7bbe75..454fb7bbe75 100644 --- a/tests/integration/tests/src/it/selenium/profiles/activate_profile.html +++ b/tests/integration/tests/src/it/selenium/profiles/activate-profile.html diff --git a/tests/integration/tests/src/it/selenium/profiles/cancel-profile-creation.html b/tests/integration/tests/src/it/selenium/profiles/cancel-profile-creation.html new file mode 100644 index 00000000000..f18e0fe3215 --- /dev/null +++ b/tests/integration/tests/src/it/selenium/profiles/cancel-profile-creation.html @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>cancel-profile-creation</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">cancel-profile-creation</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/profiles</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>create-link-java</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>canceled-profile</td> +</tr> +<tr> + <td>click</td> + <td>link=Cancel</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//table[@id='profiles_java']/thead/tr/th[1]</td> + <td></td> +</tr> +<tr> + <td>assertNotText</td> + <td>profiles_java</td> + <td>glob:*canceled-profile*</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_success.html b/tests/integration/tests/src/it/selenium/profiles/copy-profile.html index 1cfe36a77ac..55872603f47 100644 --- a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_success.html +++ b/tests/integration/tests/src/it/selenium/profiles/copy-profile.html @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:9000/" /> -<title>profile_duplication_success</title> +<title>copy-profile</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">profile_duplication_success</td></tr> +<tr><td rowspan="1" colspan="3">copy-profile</td></tr> </thead><tbody> <tr> <td>store</td> diff --git a/tests/integration/tests/src/it/selenium/profiles/create_java_profile.html b/tests/integration/tests/src/it/selenium/profiles/create_java_profile.html index e6bd0a7c090..c46324ac347 100644 --- a/tests/integration/tests/src/it/selenium/profiles/create_java_profile.html +++ b/tests/integration/tests/src/it/selenium/profiles/create_java_profile.html @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:9000/" /> -<title>profile_creation_java</title> +<title>create_java_profile</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">profile_creation_java</td></tr> +<tr><td rowspan="1" colspan="3">create_java_profile</td></tr> </thead><tbody> <tr> <td>store</td> @@ -53,7 +53,7 @@ </tr> <tr> <td>click</td> - <td>create_profile</td> + <td>create-link-java</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>commit</td> + <td>create-submit-java</td> <td></td> </tr> <tr> @@ -78,7 +78,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>rules_${LANGUAGE}_${PROFILE}</td> + <td>link=${PROFILE}</td> <td></td> </tr> <tr> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_delete_active_profile_not_provided.html b/tests/integration/tests/src/it/selenium/profiles/delete-profile.html index 92b95cdaa08..8abb98c4b33 100644 --- a/tests/integration/tests/src/it/selenium/profiles/profile_delete_active_profile_not_provided.html +++ b/tests/integration/tests/src/it/selenium/profiles/delete-profile.html @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:9000/" /> -<title>profile_delete_active_profile_not_provided</title> +<title>delete-profile</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">profile_delete_active_profile_not_provided</td></tr> +<tr><td rowspan="1" colspan="3">delete-profile</td></tr> </thead><tbody> <tr> <td>store</td> @@ -53,7 +53,7 @@ </tr> <tr> <td>click</td> - <td>create_profile</td> + <td>create-link-java</td> <td></td> </tr> <tr> @@ -68,7 +68,7 @@ </tr> <tr> <td>clickAndWait</td> - <td>commit</td> + <td>create-submit-java</td> <td></td> </tr> <tr> @@ -77,23 +77,8 @@ <td></td> </tr> <tr> - <td>chooseOkOnNextConfirmation</td> - <td></td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>activate_${LANGUAGE}_${PROFILE}</td> - <td></td> -</tr> -<tr> - <td>assertConfirmation</td> - <td>Are you sure that you want to set the profile '${PROFILE}' as default ?</td> - <td></td> -</tr> -<tr> - <td>assertElementPresent</td> - <td>is_active_${LANGUAGE}_${PROFILE}</td> + <td>click</td> + <td>delete_java_test_profile_1284128266967</td> <td></td> </tr> <tr> @@ -102,18 +87,18 @@ <td></td> </tr> <tr> - <td>assertElementNotPresent</td> + <td>clickAndWait</td> <td>delete_${LANGUAGE}_${PROFILE}</td> <td></td> </tr> <tr> - <td>clickAndWait</td> - <td>activate_java_Integration%20tests</td> + <td>assertConfirmation</td> + <td>Are you sure that you want to delete the profile '${PROFILE}' ?</td> <td></td> </tr> <tr> - <td>assertConfirmation</td> - <td>Are you sure that you want to set the profile 'Integration tests' as default ?</td> + <td>assertTextPresent</td> + <td>Profile '${PROFILE}' is deleted</td> <td></td> </tr> diff --git a/tests/integration/tests/src/it/selenium/profiles/display-permalinks-to-tools.html b/tests/integration/tests/src/it/selenium/profiles/display-permalinks-to-tools.html new file mode 100644 index 00000000000..1728a67577d --- /dev/null +++ b/tests/integration/tests/src/it/selenium/profiles/display-permalinks-to-tools.html @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>display-permalinks-to-tools</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">display-permalinks-to-tools</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/sessions/logout</td> + <td></td> +</tr> +<tr> + <td>open</td> + <td>/profiles/index</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Sonar way</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//div[@id='content']/div[4]/table/tbody/tr[1]/td[1]</td> + <td></td> +</tr> +<tr> + <td>clickAndWait</td> + <td>link=Permalinks</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>permalinks-table</td> + <td>glob:*Checkstyle*Findbugs*PMD*</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_with_blank_name.html b/tests/integration/tests/src/it/selenium/profiles/do-not-copy-with-blank-name.html index 6cd3f92f766..27d4a823df7 100644 --- a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_with_blank_name.html +++ b/tests/integration/tests/src/it/selenium/profiles/do-not-copy-with-blank-name.html @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>profile_duplication_with_blank_name</title> +<title>do-not-copy-with-blank-name</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">profile_duplication_with_blank_name</td></tr> +<tr><td rowspan="1" colspan="3">do-not-copy-with-blank-name</td></tr> </thead><tbody> <tr> <td>store</td> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_with_name_already_exists.html b/tests/integration/tests/src/it/selenium/profiles/do-not-copy-with-existing-name.html index f03cf49a6c3..f03cf49a6c3 100644 --- a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_with_name_already_exists.html +++ b/tests/integration/tests/src/it/selenium/profiles/do-not-copy-with-existing-name.html diff --git a/tests/integration/tests/src/it/selenium/profiles/do-not-create-profile-with-existing-name.html b/tests/integration/tests/src/it/selenium/profiles/do-not-create-profile-with-existing-name.html new file mode 100644 index 00000000000..f476d882ad0 --- /dev/null +++ b/tests/integration/tests/src/it/selenium/profiles/do-not-create-profile-with-existing-name.html @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<title>do-not-create-profile-with-existing-name</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">do-not-create-profile-with-existing-name</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/profiles</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>create-link-java</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>name</td> + <td>Sonar way</td> +</tr> +<tr> + <td>clickAndWait</td> + <td>create-submit-java</td> + <td></td> +</tr> +<tr> + <td>assertText</td> + <td>errormsg</td> + <td>glob:*already exist*</td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/should_not_delete_default_profile.html b/tests/integration/tests/src/it/selenium/profiles/do-not-delete-provided-profiles.html index 51955007f08..cb3544fcf6d 100644 --- a/tests/integration/tests/src/it/selenium/profiles/should_not_delete_default_profile.html +++ b/tests/integration/tests/src/it/selenium/profiles/do-not-delete-provided-profiles.html @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="http://localhost:9000/" /> -<title>should_not_delete_default_profile</title> +<title>do-not-delete-provided-profiles</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">should_not_delete_default_profile</td></tr> +<tr><td rowspan="1" colspan="3">do-not-delete-provided-profiles</td></tr> </thead><tbody> <tr> <td>open</td> @@ -43,22 +43,7 @@ </tr> <tr> <td>assertElementNotPresent</td> - <td>activate_java_Integration%20tests</td> - <td></td> -</tr> -<tr> - <td>assertElementPresent</td> - <td>is_active_java_Integration%20tests</td> - <td></td> -</tr> -<tr> - <td>assertTextPresent</td> - <td>Integration tests</td> - <td></td> -</tr> -<tr> - <td>assertElementNotPresent</td> - <td>delete_java_Integration%20tests</td> + <td>delete_java_Sonar%20way</td> <td></td> </tr> diff --git a/tests/integration/tests/src/it/selenium/profiles/permalink-to-checkstyle-configuration.html b/tests/integration/tests/src/it/selenium/profiles/permalink-to-checkstyle-configuration.html new file mode 100644 index 00000000000..15f76b375e8 --- /dev/null +++ b/tests/integration/tests/src/it/selenium/profiles/permalink-to-checkstyle-configuration.html @@ -0,0 +1,32 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>permalink-to-checkstyle-configuration</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">permalink-to-checkstyle-configuration</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/profiles/export?format=checkstyle&language=java&name=Sonar%2520way</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//module[@name='Checker']</td> + <td></td> +</tr> +<tr> + <td>assertElementPresent</td> + <td>//module[@name='Checker']/module[@name='TreeWalker']</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/permalink-to-default-checkstyle-configuration.html b/tests/integration/tests/src/it/selenium/profiles/permalink-to-default-checkstyle-configuration.html new file mode 100644 index 00000000000..bac5068633e --- /dev/null +++ b/tests/integration/tests/src/it/selenium/profiles/permalink-to-default-checkstyle-configuration.html @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<link rel="selenium.base" href="" /> +<title>permalink-to-default-checkstyle-configuration</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">permalink-to-default-checkstyle-configuration</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/profiles/export?language=java&format=checkstyle</td> + <td></td> +</tr> +<tr> + <td>assertElementPresent</td> + <td>//module[@name='Checker']</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/permalink-to-pmd-configuration.html b/tests/integration/tests/src/it/selenium/profiles/permalink-to-pmd-configuration.html new file mode 100644 index 00000000000..5e5882c30bc --- /dev/null +++ b/tests/integration/tests/src/it/selenium/profiles/permalink-to-pmd-configuration.html @@ -0,0 +1,31 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head profile="http://selenium-ide.openqa.org/profiles/test-case"> +<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<title>permalink-to-pmd-configuration</title> +</head> +<body> +<table cellpadding="1" cellspacing="1" border="1"> +<thead> +<tr><td rowspan="1" colspan="3">permalink-to-pmd-configuration</td></tr> +</thead><tbody> +<tr> + <td>open</td> + <td>/profiles/export?format=pmd&language=java&name=Sonar%2520way</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//ruleset</td> + <td></td> +</tr> +<tr> + <td>assertElementPresent</td> + <td>//ruleset/rule</td> + <td></td> +</tr> + +</tbody></table> +</body> +</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_creation_plsql.html b/tests/integration/tests/src/it/selenium/profiles/profile_creation_plsql.html deleted file mode 100644 index 3e4baa48d2b..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_creation_plsql.html +++ /dev/null @@ -1,127 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="http://localhost:9000/" /> -<title>profile_creation_plsql</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">profile_creation_plsql</td></tr> -</thead><tbody> -<tr> - <td>store</td> - <td>plsql</td> - <td>LANGUAGE</td> -</tr> -<tr> - <td>store</td> - <td>javascript{'test_profile_plsql'+(new Date()).getTime()}</td> - <td>PROFILE</td> -</tr> -<tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Log in</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>login</td> - <td>admin</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>admin</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Configuration</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Coding rules</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>create_profile</td> - <td></td> -</tr> -<tr> - <td>waitForValue</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>${PROFILE}</td> -</tr> -<tr> - <td>select</td> - <td>language</td> - <td>label=PL/SQL</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> -</tr> -<tr> - <td>assertTextPresent</td> - <td>${PROFILE}</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>rules_${LANGUAGE}_${PROFILE}</td> - <td></td> -</tr> -<tr> - <td>assertTextPresent</td> - <td>${PROFILE}</td> - <td></td> -</tr> -<tr> - <td>assertTextPresent</td> - <td>0 results</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=Profiles</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>delete_${LANGUAGE}_${PROFILE}</td> - <td></td> -</tr> -<tr> - <td>assertConfirmation</td> - <td>Are you sure that you want to delete the profile '${PROFILE}' ?</td> - <td></td> -</tr> -<tr> - <td>assertTextPresent</td> - <td>Profile '${PROFILE}' deleted.</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_creation_with_cancelling.html b/tests/integration/tests/src/it/selenium/profiles/profile_creation_with_cancelling.html deleted file mode 100644 index 9de39be3d96..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_creation_with_cancelling.html +++ /dev/null @@ -1,73 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="http://localhost:9000/" /> -<title>profile_creation_with_cancelling</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">profile_creation_with_cancelling</td></tr> -</thead><tbody> -<tr> - <td>store</td> - <td>javascript{'test_profile_'+(new Date()).getTime()}</td> - <td>PROFILE</td> -</tr> -<tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>login</td> - <td>admin</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>admin</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/profiles</td> - <td></td> -</tr> - -<tr> - <td>click</td> - <td>create_profile</td> - <td></td> -</tr> -<tr> - <td>waitForValue</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>link=cancel</td> - <td></td> -</tr> -<tr> - <td>assertTextNotPresent</td> - <td>Profile '${PROFILE}' created. Do not forget to activate the profile in order to use it for next measures.</td> - <td></td> -</tr> - -</tbody></table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_creation_with_duplicated_name.html b/tests/integration/tests/src/it/selenium/profiles/profile_creation_with_duplicated_name.html deleted file mode 100644 index a396a91c704..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_creation_with_duplicated_name.html +++ /dev/null @@ -1,76 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href="http://localhost:9000/"/> - <title>profile_creation_with_duplicated_name</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> - <thead> - <tr> - <td rowspan="1" colspan="3">profile_creation_with_duplicated_name</td> - </tr> - </thead> - <tbody> - <tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>login</td> - <td>admin</td> - </tr> - <tr> - <td>type</td> - <td>password</td> - <td>admin</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/profiles</td> - <td></td> - </tr> - <tr> - <td>click</td> - <td>create_profile</td> - <td></td> - </tr> - <tr> - <td>waitForValue</td> - <td>name</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>name</td> - <td>Sonar way</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>assertTextPresent</td> - <td>Name has already been taken</td> - <td></td> - </tr> - - </tbody> -</table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_delete.html b/tests/integration/tests/src/it/selenium/profiles/profile_delete.html deleted file mode 100644 index 54eb244cdf7..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_delete.html +++ /dev/null @@ -1,106 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href="http://localhost:9000/"/> - <title>profile_delete_inactive_profile_not_provided</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> - <thead> - <tr> - <td rowspan="1" colspan="3">profile_delete_inactive_profile_not_provided</td> - </tr> - </thead> - <tbody> - <tr> - <td>store</td> - <td>java</td> - <td>LANGUAGE</td> - </tr> - <tr> - <td>store</td> - <td>javascript{'test_profile_'+(new Date()).getTime()}</td> - <td>PROFILE</td> - </tr> - <tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>login</td> - <td>admin</td> - </tr> - <tr> - <td>type</td> - <td>password</td> - <td>admin</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/profiles</td> - <td></td> - </tr> - <tr> - <td>click</td> - <td>create_profile</td> - <td></td> - </tr> - <tr> - <td>waitForValue</td> - <td>name</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>name</td> - <td>${PROFILE}</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>assertTextPresent</td> - <td>${PROFILE}</td> - <td></td> - </tr> - <tr> - <td>chooseOkOnNextConfirmation</td> - <td></td> - <td></td> - </tr> - <tr> - <td>clickAndWait</td> - <td>delete_${LANGUAGE}_${PROFILE}</td> - <td></td> - </tr> - <tr> - <td>assertConfirmation</td> - <td>Are you sure that you want to delete the profile '${PROFILE}' ?</td> - <td></td> - </tr> - <tr> - <td>assertTextPresent</td> - <td>Profile '${PROFILE}' is deleted</td> - <td></td> - </tr> - - </tbody> -</table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_same_name_with_different_language.html b/tests/integration/tests/src/it/selenium/profiles/profile_duplication_same_name_with_different_language.html deleted file mode 100644 index b95a085b7a4..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_duplication_same_name_with_different_language.html +++ /dev/null @@ -1,151 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href=""/> - <title>profile_duplication_same_name_with_different_language</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> - <tr> - <td rowspan="1" colspan="3">profile_duplication_same_name_with_different_language</td> - </tr> -</thead> -<tbody> -<tr> - <td>store</td> - <td>Java</td> - <td>NAMELANGUAGE1</td> -</tr> -<tr> - <td>store</td> - <td>java</td> - <td>KEYLANGUAGE1</td> -</tr> -<tr> - <td>store</td> - <td>PL/SQL</td> - <td>NAMELANGUAGE2</td> -</tr> -<tr> - <td>store</td> - <td>plsql</td> - <td>KEYLANGUAGE2</td> -</tr> -<tr> - <td>store</td> - <td>javascript{'test_profile_java'+(new Date()).getTime()}</td> - <td>PROFILE</td> -</tr> -<tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>login</td> - <td>admin</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>admin</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/profiles</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>create_profile</td> - <td></td> -</tr> -<tr> - <td>waitForValue</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>${PROFILE}</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> -</tr> -<tr> - <td>click</td> - <td>create_profile</td> - <td></td> -</tr> -<tr> - <td>waitForValue</td> - <td>name</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>name</td> - <td>${PROFILE}</td> -</tr> -<tr> - <td>select</td> - <td>language</td> - <td>label=${NAMELANGUAGE2}</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> -</tr> -<tr> - <td>chooseOkOnNextConfirmation</td> - <td></td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>delete_${PROFILE}_${KEYLANGUAGE1}</td> - <td></td> -</tr> -<tr> - <td>assertConfirmation</td> - <td>Are you sure that you want to delete the profile '${PROFILE}' ?</td> - <td></td> -</tr> -<tr> - <td>chooseOkOnNextConfirmation</td> - <td></td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>delete_${PROFILE}_${KEYLANGUAGE2}</td> - <td></td> -</tr> -<tr> - <td>assertConfirmation</td> - <td>Are you sure that you want to delete the profile '${PROFILE}' ?</td> - <td></td> -</tr> - -</tbody> -</table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_export_pmd_checkstyle_actives.html b/tests/integration/tests/src/it/selenium/profiles/profile_export_pmd_checkstyle_actives.html deleted file mode 100644 index cc8f5d7cb69..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_export_pmd_checkstyle_actives.html +++ /dev/null @@ -1,117 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> -<link rel="selenium.base" href="" /> -<title>profile_export_pmd_checkstyle_actives</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> -<tr><td rowspan="1" colspan="3">profile_export_pmd_checkstyle_actives</td></tr> -</thead><tbody> -<tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> -</tr> -<tr> - <td>type</td> - <td>login</td> - <td>admin</td> -</tr> -<tr> - <td>type</td> - <td>password</td> - <td>admin</td> -</tr> -<tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/profiles</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>export_checkstyle_java_Sonar%20way</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//module[@name='Checker']</td> - <td></td> -</tr> -<tr> - <td>assertElementPresent</td> - <td>//module[@name='Checker']/module[@name='TreeWalker']</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/profiles</td> - <td></td> -</tr> -<tr> - <td>clickAndWait</td> - <td>export_pmd_java_Sonar%20way</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//ruleset</td> - <td></td> -</tr> -<tr> - <td>assertElementPresent</td> - <td>//ruleset/rule</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/rules_configuration/export/java/active/checkstyle.xml</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//module[@name='Checker']</td> - <td></td> -</tr> -<tr> - <td>assertElementPresent</td> - <td>//module[@name='Checker']/module[@name='TreeWalker']</td> - <td></td> -</tr> -<tr> - <td>open</td> - <td>/rules_configuration/export/java/active/pmd.xml</td> - <td></td> -</tr> -<tr> - <td>waitForElementPresent</td> - <td>//ruleset</td> - <td></td> -</tr> -<tr> - <td>assertElementPresent</td> - <td>//ruleset/rule</td> - <td></td> -</tr> -<tr> - <td>assertXpathCount</td> - <td>//ruleset/rule</td> - <td>86</td> -</tr> - -</tbody></table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_name_active_is_reserved.html b/tests/integration/tests/src/it/selenium/profiles/profile_name_active_is_reserved.html deleted file mode 100644 index 409c6340015..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_name_active_is_reserved.html +++ /dev/null @@ -1,86 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href=""/> - <title>profile_name_active_is_reserved</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> - <thead> - <tr> - <td rowspan="1" colspan="3">profile_name_active_is_reserved</td> - </tr> - </thead> - <tbody> - <tr> - <td>store</td> - <td>java</td> - <td>LANGUAGE</td> - </tr> - <tr> - <td>store</td> - <td>active</td> - <td>PROFILE</td> - </tr> - <tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>login</td> - <td>admin</td> - </tr> - <tr> - <td>type</td> - <td>password</td> - <td>admin</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/profiles</td> - <td></td> - </tr> - <tr> - <td>click</td> - <td>create_profile</td> - <td></td> - </tr> - <tr> - <td>waitForValue</td> - <td>name</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>name</td> - <td>${PROFILE}</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>assertTextNotPresent</td> - <td>${PROFILE}</td> - <td></td> - </tr> - - </tbody> -</table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/profile_security_logged.html b/tests/integration/tests/src/it/selenium/profiles/profile_security_logged.html deleted file mode 100644 index 5326889b85b..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/profile_security_logged.html +++ /dev/null @@ -1,107 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href=""/> - <title>profile_security_logged</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> -<thead> - <tr> - <td rowspan="1" colspan="3">profile_security_logged</td> - </tr> -</thead> -<tbody> - - <tr> - <td>store</td> - <td>javascript{'test_profile_java'+(new Date()).getTime()}</td> - <td>PROFILE</td> - </tr> - <tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> - </tr> -<tr> - <td>type</td> - <td>login</td> - <td>admin</td> -</tr> - <tr> - <td>type</td> - <td>password</td> - <td>admin</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/profiles</td> - <td></td> - </tr> - <tr> - <td>assertElementPresent</td> - <td>activate_java_Sun%20checks</td> - <td></td> - </tr> - <tr> - <td>assertElementPresent</td> - <td>copy_java_Sun%20checks</td> - <td></td> - </tr> - <tr> - <td>assertElementPresent</td> - <td>create_profile</td> - <td></td> - </tr> - <tr> - <td>click</td> - <td>create_profile</td> - <td></td> - </tr> - <tr> - <td>waitForValue</td> - <td>name</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>name</td> - <td>${PROFILE}</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>assertElementPresent</td> - <td>delete_java_${PROFILE}</td> - <td></td> - </tr> - <tr> - <td>clickAndWait</td> - <td>delete_java_${PROFILE}</td> - <td></td> - </tr> - <tr> - <td>assertConfirmation</td> - <td>Are you sure that you want to delete the profile '${PROFILE}' ?</td> - <td></td> - </tr> - -</tbody> -</table> -</body> -</html> diff --git a/tests/integration/tests/src/it/selenium/profiles/no_actions_when_anonymous.html b/tests/integration/tests/src/it/selenium/profiles/read-only-mode-when-anonymous-user.html index ea2f093c8d8..e5bd2485c06 100644 --- a/tests/integration/tests/src/it/selenium/profiles/no_actions_when_anonymous.html +++ b/tests/integration/tests/src/it/selenium/profiles/read-only-mode-when-anonymous-user.html @@ -4,12 +4,12 @@ <head profile="http://selenium-ide.openqa.org/profiles/test-case"> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <link rel="selenium.base" href="" /> -<title>no_actions_when_anonymous</title> +<title>read-only-mode-when-anonymous-user</title> </head> <body> <table cellpadding="1" cellspacing="1" border="1"> <thead> -<tr><td rowspan="1" colspan="3">no_actions_when_anonymous</td></tr> +<tr><td rowspan="1" colspan="3">read-only-mode-when-anonymous-user</td></tr> </thead><tbody> <tr> <td>open</td> @@ -32,10 +32,20 @@ <td></td> </tr> <tr> - <td>assertElementNotPresent</td> - <td>create_profile</td> + <td>assertTextNotPresent</td> + <td>Create</td> <td></td> </tr> +<tr> + <td>assertNotText</td> + <td>profiles_java</td> + <td>glob:*Copy*</td> +</tr> +<tr> + <td>assertNotText</td> + <td>profiles_java</td> + <td>glob:*Delete*</td> +</tr> </tbody></table> </body> diff --git a/tests/integration/tests/src/it/selenium/profiles/should_not_delete_provided_profiles.html b/tests/integration/tests/src/it/selenium/profiles/should_not_delete_provided_profiles.html deleted file mode 100644 index e1c5ef18138..00000000000 --- a/tests/integration/tests/src/it/selenium/profiles/should_not_delete_provided_profiles.html +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> -<head profile="http://selenium-ide.openqa.org/profiles/test-case"> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> - <link rel="selenium.base" href=""/> - <title>profile_delete_provided_profile</title> -</head> -<body> -<table cellpadding="1" cellspacing="1" border="1"> - <thead> - <tr> - <td rowspan="1" colspan="3">profile_delete_provided_profile</td> - </tr> - </thead> - <tbody> - - <tr> - <td>open</td> - <td>/sessions/logout</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/sessions/login</td> - <td></td> - </tr> - <tr> - <td>type</td> - <td>login</td> - <td>admin</td> - </tr> - <tr> - <td>type</td> - <td>password</td> - <td>admin</td> - </tr> - <tr> - <td>clickAndWait</td> - <td>commit</td> - <td></td> - </tr> - <tr> - <td>open</td> - <td>/profiles</td> - <td></td> - </tr> - <tr> - <td>assertElementNotPresent</td> - <td>delete_java_Sun%20checks</td> - <td></td> - </tr> - <tr> - <td>assertElementNotPresent</td> - <td>delete_java_Sonar%20way</td> - <td></td> - </tr> - </tbody> -</table> -</body> -</html> |