You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2014/01/03 17:15:38 UTC
svn commit: r1555134 - in /syncope/branches/1_1_X/console/src:
main/resources/org/apache/syncope/console/pages/
main/resources/org/apache/syncope/console/pages/panels/
test/java/org/apache/syncope/console/
Author: ilgrosso
Date: Fri Jan 3 16:15:37 2014
New Revision: 1555134
URL: http://svn.apache.org/r1555134
Log:
[SYNCOPE-469] Playing a bit with jquery's tabs
Modified:
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Roles.html
syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage.html Fri Jan 3 16:15:37 2014
@@ -16,7 +16,7 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
<head>
<link rel="stylesheet" type="text/css" href="css/jquery-ui.css" media="all"/>
<link rel="stylesheet" type="text/css" href="css/style.css" media="all"/>
@@ -40,6 +40,6 @@ under the License.
<body onload="setTimeout('window.focus();', 0);">
<div wicket:id="feedback"/>
- <wicket:child />
-</body>
+ <wicket:child />
+ </body>
</html>
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage.html Fri Jan 3 16:15:37 2014
@@ -41,10 +41,6 @@ under the License.
<script type="text/javascript">
$(document).ready(function() {
$("#tabs").tabs();
- $("#roletabs").tabs();
- $("#user").tabs();
- $("#role").tabs();
- $("#membership").tabs();
});
/** Add rollover effect to tables supporting Ajax events */
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.html Fri Jan 3 16:15:37 2014
@@ -24,6 +24,10 @@ under the License.
<script type="text/javascript" src="scripts/codemirror.js"></script>
<script type="text/javascript" src="scripts/xmlpure.js"></script>
<script type="text/javascript">
+ $(document).ready(function() {
+ $("#policies").tabs();
+ $("#logs").tabs();
+ });
function updateTextArea(editor) {
document.getElementById("workflowDefArea").value = editor.getValue();
}
@@ -42,18 +46,14 @@ under the License.
<div id="tabs">
<ul>
<li class="tabs-selected">
- <a href="#tabs-1"><span><wicket:message key="tab1"/></span></a>
+ <a href="#parameters"><span><wicket:message key="parameters"/></span></a>
</li>
- <li><a href="#tabs-2"><span><wicket:message key="tab2"/></span></a></li>
- <li><a href="#tabs-3"><span><wicket:message key="tab3"/></span></a></li>
- <li><a href="#tabs-4"><span><wicket:message key="tab4"/></span></a></li>
- <li><a href="#tabs-5"><span><wicket:message key="tab5"/></span></a></li>
- <li><a href="#tabs-6"><span><wicket:message key="tab6"/></span></a></li>
- <li><a href="#tabs-7"><span><wicket:message key="tab7"/></span></a></li>
- <li><a href="#tabs-8"><span><wicket:message key="tab8"/></span></a></li>
+ <li><a href="#policies"><span><wicket:message key="policies"/></span></a></li>
+ <li><a href="#notifications"><span><wicket:message key="notifications"/></span></a></li>
+ <li><a href="#workflow"><span><wicket:message key="workflow"/></span></a></li>
+ <li><a href="#logs"><span><wicket:message key="logs"/></span></a></li>
</ul>
- <div id="tabs-1">
-
+ <div id="parameters">
<div id="users-contain" class="ui-widget" style="width:inherit">
<span wicket:id="confContainer">
<table class="ui-widget ui-widget-content table-hover"
@@ -77,16 +77,25 @@ under the License.
<wicket:message key="create_configuration"/>
</a>
</div>
- <div id="tabs-2">
- <span wicket:id="passwordPoliciesPanel">[password policies]</span>
- </div>
- <div id="tabs-3">
- <span wicket:id="accountPoliciesPanel">[account policies]</span>
- </div>
- <div id="tabs-4">
- <span wicket:id="syncPoliciesPanel">[sync policies]</span>
+ <div id="policies">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#password"><span><wicket:message key="password"/></span></a>
+ </li>
+ <li><a href="#account"><span><wicket:message key="account"/></span></a></li>
+ <li><a href="#sync"><span><wicket:message key="sync"/></span></a></li>
+ </ul>
+ <div id="password" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="passwordPoliciesPanel">[password policies]</span>
+ </div>
+ <div id="account" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="accountPoliciesPanel">[account policies]</span>
+ </div>
+ <div id="sync" style="border-width: 1px;border-top-width: 0px;">
+ <span wicket:id="syncPoliciesPanel">[sync policies]</span>
+ </div>
</div>
- <div id="tabs-5">
+ <div id="notifications">
<div id="users-contain" class="ui-widget" style="width:inherit">
<span wicket:id="notificationContainer">
<table class="ui-widget ui-widget-content table-hover"
@@ -110,7 +119,7 @@ under the License.
<wicket:message key="create_notification"/>
</a>
</div>
- <div id="tabs-6">
+ <div id="workflow">
<div id="users-contain" class="ui-widget" style="width:inherit">
<span wicket:id="workflowDefContainer">
<form wicket:id="workflowDefForm">
@@ -129,44 +138,52 @@ under the License.
</span>
</div>
</div>
- <div id="tabs-7">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="coreLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="corelogger">
- <td><span wicket:id="name"/></td>
- <td id="level"><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
+ <div id="logs">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#core"><span>Core</span></a>
+ </li>
+ <li><a href="#console"><span>Console</span></a></li>
+ </ul>
+ <div id="core" style="border-width: 1px;border-top-width: 0px;">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="coreLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="corelogger">
+ <td><span wicket:id="name"/></td>
+ <td id="level"><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
</div>
- </div>
- <div id="tabs-8">
- <div id="users-contain" class="ui-widget" style="width:inherit">
- <span wicket:id="consoleLoggerContainer">
- <table class="ui-widget ui-widget-content table-hover">
- <thead class="ui-widget-header">
- <tr class="heaaders">
- <th><wicket:message key="logger"/></th>
- <th><wicket:message key="level"/></th>
- </tr>
- </thead>
- <tbody>
- <tr wicket:id="consolelogger">
- <td><span wicket:id="name"/></td>
- <td id="level"><select wicket:id="level"/></td>
- </tr>
- </tbody>
- </table>
- </span>
+ <div id="console" style="border-width: 1px;border-top-width: 0px;">
+ <div id="users-contain" class="ui-widget" style="width:inherit">
+ <span wicket:id="consoleLoggerContainer">
+ <table class="ui-widget ui-widget-content table-hover">
+ <thead class="ui-widget-header">
+ <tr class="heaaders">
+ <th><wicket:message key="logger"/></th>
+ <th><wicket:message key="level"/></th>
+ </tr>
+ </thead>
+ <tbody>
+ <tr wicket:id="consolelogger">
+ <td><span wicket:id="name"/></td>
+ <td id="level"><select wicket:id="level"/></td>
+ </tr>
+ </tbody>
+ </table>
+ </span>
+ </div>
</div>
</div>
<div>
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration.properties Fri Jan 3 16:15:37 2014
@@ -16,14 +16,12 @@
# under the License.
key=Key
value=Value
-tab1=Parameters
-tab2=Password Policies
-tab3=Account Policies
-tab4=Synchronization Policies
-tab5=Notifications
-tab6=Workflow
-tab7=Core Log
-tab8=Console Log
+parameters=Parameters
+password=Password
+account=Account
+sync=Synchronization
+notifications=Notifications
+workflow=Workflow
edit=Edit
delete=Delete
create_configuration=Create new configuration
@@ -36,3 +34,5 @@ template=Template
traceLevel=Trace level
create_notification=Create new notification
subject=Subject
+policies=Policies
+logs=Logs
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_it.properties Fri Jan 3 16:15:37 2014
@@ -16,14 +16,12 @@
# under the License.
key=Chiave
value=Valore
-tab1=Parametri
-tab2=Policy di password
-tab3=Policy di account
-tab4=Policy di sincronizzazione
-tab5=Notifiche
-tab6=Workflow
-tab7=Log Core
-tab8=Log Console
+parameters=Parametri
+password=Password
+account=Account
+sync=Sincronizzazione
+notifications=Notifiche
+workflow=Workflow
edit=Modifica
delete=Rimuovi
create_configuration=Crea nuova configurazione
@@ -36,3 +34,5 @@ template=Modello
traceLevel=Tracciamento
create_notification=Crea nuova notifica
subject=Oggetto
+policies=Politiche
+logs=Logs
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties Fri Jan 3 16:15:37 2014
@@ -16,23 +16,23 @@
# under the License.
key=Chave
value=Valor
-tab1=Par\u00E2metros
-tab2=Pol\u00EDticas de Senha
-tab3=Pol\u00EDticas de Conta
-tab4=Pol\u00EDticas de Sincroniza\u00E7\u00E3o
-tab5=Notifica\u00E7\u00F5es
-tab6=Fluxo de Trabalho
-tab7=Log Central
-tab8=Log do Console
+parameters=Par\u00e2metros
+password=Senha
+account=Conta
+sync=Sincroniza\u00e7\u00e3o
+notifications=Notifica\u00e7\u00f5es
+workflow=Fluxo de Trabalho
edit=Editar
delete=Excluir
-create_configuration=Criar Nova configura\u00E7\u00E3o
+create_configuration=Criar Nova configura\u00e7\u00e3o
db_export=Exportar Banco de Dados
logger=Logger
-level=N\u00EDvel
+level=N\u00edvel
submit=Salvar
events=Eventos
template=Template
-traceLevel=N\u00EDvel de Trace
-create_notification=Criar nova notifica\u00E7\u00E3o
+traceLevel=N\u00edvel de Trace
+create_notification=Criar nova notifica\u00e7\u00e3o
subject=Assunto
+policies=Pol\u00edticas
+logs=Logs
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Roles.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Roles.html?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Roles.html (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Roles.html Fri Jan 3 16:15:37 2014
@@ -16,56 +16,63 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:head>
- <style>
- div.role-tree div.wicket-tree-table a {
- color:black;
- }
- </style>
-</wicket:head>
-<wicket:extend>
- <div id="roletabs">
- <ul>
- <li class="tabs-selected">
- <a href="#tabs-tree">
- <span><wicket:message key="tabs-tree"/>
- </span>
- </a>
- </li>
- <li>
- <a href="#tabs-search">
- <span><wicket:message key="tabs-search"/>
- </span>
- </a>
- </li>
- </ul>
-
- <div id="tabs-tree">
- <span wicket:id="treePanel"></span>
- <span wicket:id="summaryPanel"></span>
- <div wicket:id="editRoleWin">[Show modal window for create/editing role]</div>
- </div>
-
- <div id="tabs-search">
- <div>
- <form wicket:id="searchForm">
- <span wicket:id="searchPanel">searchPanel</span>
-
- <br/>
- <a wicket:id="search"
- class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
- <img src="img/search.png" alt="search"/>
- <wicket:message key="search"/>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org">
+ <wicket:head>
+ <style>
+ div.role-tree div.wicket-tree-table a {
+ color:black;
+ }
+ </style>
+ <script type="text/javascript">
+ $(document).ready(function() {
+ $("#roletabs").tabs();
+ });
+ </script>
+ </wicket:head>
+ <wicket:extend>
+ <div id="roletabs">
+ <ul>
+ <li class="tabs-selected">
+ <a href="#tabs-tree">
+ <span><wicket:message key="tabs-tree"/>
+ </span>
+ </a>
+ </li>
+ <li>
+ <a href="#tabs-search">
+ <span><wicket:message key="tabs-search"/>
+ </span>
</a>
- </form>
+ </li>
+ </ul>
+
+ <div id="tabs-tree">
+ <span wicket:id="treePanel"></span>
+ <span wicket:id="summaryPanel"></span>
+ <div wicket:id="editRoleWin">[Show modal window for create/editing role]</div>
</div>
- <div id="users-contain" class="ui-widget" style="width:auto">
- <span wicket:id="searchResult">[search result]</span>
+ <div id="tabs-search">
+ <div>
+ <form wicket:id="searchForm">
+ <span wicket:id="searchPanel">searchPanel</span>
+
+ <br/>
+ <a wicket:id="search"
+ class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only">
+ <img src="img/search.png" alt="search"/>
+ <wicket:message key="search"/>
+ </a>
+ </form>
+ </div>
+
+ <div id="users-contain" class="ui-widget" style="width:auto">
+ <span wicket:id="searchResult">[search result]</span>
+ </div>
</div>
- </div>
- </div>
+ </div>
- <wicket:child/>
-</wicket:extend>
+ <wicket:child/>
+ </wicket:extend>
+</html>
Modified: syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html (original)
+++ syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/JQueryUITabbedPanel.html Fri Jan 3 16:15:37 2014
@@ -26,7 +26,7 @@ under the License.
</style>
</wicket:head>
<wicket:panel xmlns:wicket="http://wicket.apache.org">
- <div class="ui-tabs ui-widget ui-widget-content ui-corner-all">
+ <div>
<span wicket:id="tabs-container">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all">
<li wicket:id="tabs" class="ui-state-default ui-corner-top">
@@ -34,7 +34,8 @@ under the License.
</li>
</ul>
</span>
- <div wicket:id="panel" class="ui-tabs-panel ui-widget-content ui-corner-bottom">[panel]</div>
+ <div wicket:id="panel" class="ui-tabs-panel ui-widget-content ui-corner-bottom"
+ style="border-width: 1px;border-top-width: 0px;">[panel]</div>
</div>
</wicket:panel>
</html>
Modified: syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Fri Jan 3 16:15:37 2014
@@ -60,25 +60,8 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//div[3]/ul/li[2]/a");
- selenium.click("//div[3]/div[2]/span/div/a");
-
- selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='id:textField']\");", "30000");
-
- selenium.type("name=description:textField", "new description");
- selenium.click("//div[2]/form/div[3]/input[@type='submit']");
-
- selenium.waitForCondition("selenium.isTextPresent(\"new description\");", "30000");
- }
-
- @Test
- public void browseAccountPolicy() {
- selenium.click("css=img[alt=\"Configuration\"]");
-
- selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
-
- selenium.click("//div[3]/ul/li[3]/a");
- selenium.click("//div[3]/div[3]/span/div/a");
+ selenium.click("//div[@id='tabs']/ul/li[2]/a");
+ selenium.click("//div[@id='password']/span/div/a");
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='id:textField']\");", "30000");
@@ -94,7 +77,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//div[@id='tabs']/ul/li[6]/a/span");
+ selenium.click("//div[@id='tabs']/ul/li[4]/a/span");
selenium.waitForCondition("selenium.isElementPresent(\"//*[@id='workflowDefArea']\");", "30000");
}
@@ -107,7 +90,7 @@ public class ConfigurationTestITCase ext
selenium.click("//tr[7]/td[3]/div/span[11]/a");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
selenium.waitForCondition("selenium.isTextPresent(" + "\"Operation executed successfully\");", "30000");
}
@@ -118,9 +101,9 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//div[@id='tabs']\");", "30000");
- selenium.click("//div[@id='tabs']/ul/li[7]/a/span");
+ selenium.click("//div[@id='logs']/ul/li/a/span");
- selenium.select("//div[3]/div[7]/div/span/table/tbody/tr/td[2]/select", "label=ERROR");
+ selenium.select("//div[@id='core']/div/span/table/tbody/tr/td[2]/select", "label=ERROR");
selenium.waitForCondition("selenium.isTextPresent(\"Operation executed successfully\");", "30000");
}
@@ -159,7 +142,7 @@ public class ConfigurationTestITCase ext
+ "//select[@name='eventSelection:categoryContainer:type:dropDownChoiceField']"
+ "/option[text()='PROPAGATION']\");",
"30000");
-
+
selenium.select(
"//select[@name='eventSelection:categoryContainer:type:dropDownChoiceField']",
"label=PROPAGATION");
@@ -185,9 +168,9 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition(
"selenium.isElementPresent(\"//input[@name='eventSelection:eventsContainer:eventsPanel:failureGroup']\");",
"30000");
-
+
selenium.click("//div[@class='eventSelectionWidzard']/div[2]/div[3]/span/div/input");
-
+
selenium.click("//div[2]/form/div[3]/ul/li[4]/a/span");
selenium.waitForCondition("selenium.isElementPresent("
Modified: syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java (original)
+++ syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java Fri Jan 3 16:15:37 2014
@@ -78,7 +78,7 @@ public class ConnInstanceTestITCase exte
selenium.click("//div[3]/ul/li[2]/a");
selenium.click("//tr[4]/td[7]/div/span[11]/a");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
selenium.waitForCondition("selenium.isTextPresent(\"Error:\");", "10000");
}
Modified: syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java (original)
+++ syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/ResourceTestITCase.java Fri Jan 3 16:15:37 2014
@@ -53,7 +53,7 @@ public class ResourceTestITCase extends
selenium.click("//tbody/tr[2]/td/input");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
selenium.click("name=apply");
}
@@ -66,7 +66,7 @@ public class ResourceTestITCase extends
selenium.click("//tr[3]/td[6]/div/span[11]/a");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
}
@Test
@@ -111,4 +111,4 @@ public class ResourceTestITCase extends
selenium.waitForCondition(
"selenium.isElementPresent(\"//div/ul/li/span[contains(text(), 'Successful connection')]\");", "30000");
}
-}
\ No newline at end of file
+}
Modified: syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java (original)
+++ syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/RoleTestITCase.java Fri Jan 3 16:15:37 2014
@@ -170,6 +170,6 @@ public class RoleTestITCase extends Abst
selenium.click("css=img[title='Delete']");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
}
-}
\ No newline at end of file
+}
Modified: syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java (original)
+++ syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/SchemaTestITCase.java Fri Jan 3 16:15:37 2014
@@ -50,6 +50,6 @@ public class SchemaTestITCase extends Ab
selenium.click("//div[3]/div/div/div/div/div/span/table/tbody/tr/td[7]/div/span[11]/a");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
}
}
Modified: syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java (original)
+++ syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/TaskTestITCase.java Fri Jan 3 16:15:37 2014
@@ -52,7 +52,7 @@ public class TaskTestITCase extends Abst
selenium.click("//div[@id='tabs']/ul/li[3]/a/span");
selenium.click("//table/tbody/tr/td[8]/div/span[11]/a");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
selenium.waitForCondition("selenium.isTextPresent(\"Operation executed successfully\");", "30000");
}
Modified: syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java?rev=1555134&r1=1555133&r2=1555134&view=diff
==============================================================================
--- syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java (original)
+++ syncope/branches/1_1_X/console/src/test/java/org/apache/syncope/console/UserTestITCase.java Fri Jan 3 16:15:37 2014
@@ -91,7 +91,7 @@ public class UserTestITCase extends Abst
selenium.click("//*[@id=\"users-contain\"]//*[div=4]/../td[5]/div/span[11]/a");
- assertTrue(selenium.getConfirmation().matches("^Do you really want to delete the selected item[\\s\\S]$"));
+ assertTrue(selenium.getConfirmation().equals("Do you really want to delete the selected item(s)?"));
selenium.waitForCondition("selenium.isElementPresent(" + "\"//div[@id='propagation']/span\");", "30000");