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 2013/02/21 11:58:29 UTC
svn commit: r1448574 - in /syncope/trunk/console/src:
main/java/org/apache/syncope/console/pages/
main/java/org/apache/syncope/console/pages/panels/
main/resources/org/apache/syncope/console/pages/
main/resources/org/apache/syncope/console/pages/panels...
Author: ilgrosso
Date: Thu Feb 21 10:58:29 2013
New Revision: 1448574
URL: http://svn.apache.org/r1448574
Log:
Fixing selenium tests
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.html
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.html
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/ConnectorModalPage.java Thu Feb 21 10:58:29 2013
@@ -33,6 +33,7 @@ import org.apache.syncope.common.types.C
import org.apache.syncope.common.types.ConnConfProperty;
import org.apache.syncope.common.types.ConnectorCapability;
import org.apache.syncope.common.validation.SyncopeClientCompositeErrorException;
+import org.apache.syncope.console.markup.html.list.AltListView;
import org.apache.syncope.console.rest.ConnectorRestClient;
import org.apache.syncope.console.wicket.markup.html.form.AjaxCheckBoxPanel;
import org.apache.syncope.console.wicket.markup.html.form.AjaxDropDownChoicePanel;
@@ -168,7 +169,7 @@ public class ConnectorModalPage extends
"connRequestTimeout",
new PropertyModel<String>(connectorTO, "connRequestTimeout"));
- final ListView<ConnConfProperty> view = new ListView<ConnConfProperty>(
+ final ListView<ConnConfProperty> view = new AltListView<ConnConfProperty>(
"connectorProperties", new PropertyModel<List<ConnConfProperty>>(this, "properties")) {
private static final long serialVersionUID = 9101744072914090143L;
@@ -234,7 +235,7 @@ public class ConnectorModalPage extends
}
field.setTitle(property.getSchema().getHelpMessage());
-
+
if (required) {
field.addRequiredLabel();
}
Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.java Thu Feb 21 10:58:29 2013
@@ -35,16 +35,9 @@ import org.apache.wicket.model.LoadableD
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.spring.injection.annot.SpringBean;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ResourceSecurityPanel extends Panel {
- /**
- * Logger.
- */
- private static final Logger LOG = LoggerFactory.getLogger(ResourceSecurityPanel.class);
-
private static final long serialVersionUID = -7982691107029848579L;
@SpringBean
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage.html Thu Feb 21 10:58:29 2013
@@ -16,19 +16,6 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:head>
- <style type="text/css">
- table.palette td.header {
- background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
- repeat-x scroll 50% 50% #E6E6E6 !important;
- }
-
- table.palette td.header {
- background:url("images/ui-bg_glass_75_e6e6e6_1x400.png")
- repeat-x scroll 50% 50% #E6E6E6 !important;
- }
- </style>
-</wicket:head>
<wicket:extend>
<p class="ui-widget ui-corner-all ui-widget-header"><wicket:message key="title"/></p>
<div style="margin:10px">
@@ -41,7 +28,7 @@ under the License.
</ul>
<div id="tabs-1">
<div id="formtable">
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="displayName"><wicket:message key="displayName"/></label>
</div>
@@ -59,7 +46,7 @@ under the License.
</div>
</div>
- <div class="tablerow">
+ <div class="tablerow alt">
<div class="tablecolumn_label short_dynamicsize">
<label for="version"><wicket:message key="version"/></label>
</div>
@@ -76,12 +63,6 @@ under the License.
</div>
</div>
</div>
- <!-- inside the container in order to re-process javascript -->
- <script type="text/javascript">
- $(function() {
- $('#tabs-1 #formtable div.tablerow:even').addClass("alt");
- });
- </script>
</div>
<div id="tabs-2">
<div id="formtable">
@@ -105,17 +86,12 @@ under the License.
</div>
</div>
<div>
- <label style="position: absolute; top: 10px; right:55px;"><wicket:message key="check"/></label>
<a style="position: absolute; top: 2px; right:20px;" wicket:id="check">
- <img src="img/ping.png" width="30" height="30" /></a>
+ <img src="img/ping.png"width="30" height="30"
+ alt="ping" title="title" wicket:message="title:check"/>
+ </a>
</div>
</form>
- <!-- inside the container in order to re-process javascript -->
- <script type="text/javascript">
- $(function() {
- $('#tabs-2 #formtable div.tablerow:even').addClass("alt");
- });
- </script>
</span>
</div>
</div>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage.html Thu Feb 21 10:58:29 2013
@@ -16,32 +16,6 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<wicket:head>
- <style type="text/css">
- /* Style for autocomplete field */
- div.wicket-aa {
- font-family: "Lucida Grande","Lucida Sans Unicode",Tahoma,Verdana;
- font-size: 12px;
- background-color: white;
- border-width: 1px;
- border-color: #cccccc;
- border-style: solid;
- padding: 2px;
- margin: 1px 0 0 0;
- text-align:left;
- }
- div.wicket-aa ul {
- list-style:none;
- padding: 2px;
- margin:0;
- }
- div.wicket-aa ul li.selected {
- background-color: #FFFF00;
- padding: 2px;
- margin:0;
- }
- </style>
-</wicket:head>
<wicket:extend>
<div style="margin:10px">
<p class="ui-widget ui-corner-all ui-widget-header">
@@ -51,7 +25,7 @@ under the License.
<form wicket:id="form">
<div id="tabs">
<ul>
- <li class="tabs-selected"><a href="#resource"><span><wicket:message key="resource"/></span></a></li>
+ <li class="tabs-selected"><a href="#resource"><span><wicket:message key="resource"/></span></a></li>
<li><a href="#umapping"><span><wicket:message key="umapping"/></span></a></li>
<li><a href="#rmapping"><span><wicket:message key="rmapping"/></span></a></li>
<li><a href="#connectorProperties"><span><wicket:message key="connectorProperties"/></span></a></li>
@@ -72,12 +46,6 @@ under the License.
<div id="security">
<span wicket:id="security">[security]</span>
</div>
-
- <script type="text/javascript">
- $(function() {
- $('div#security div#formtable div.tablerow:even').addClass("alt");
- });
- </script>
</div>
<div style="margin: 20px 10px 0">
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.html?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceConnConfPanel.html Thu Feb 21 10:58:29 2013
@@ -30,9 +30,10 @@ under the License.
</div>
<div>
- <label style="position: absolute; top: 10px; right:55px;"><wicket:message key="check"/></label>
<a style="position: absolute; top: 2px; right:20px;" wicket:id="check">
- <img src="img/ping.png" width="30" height="30" /></a>
+ <img src="img/ping.png"width="30" height="30"
+ alt="ping" title="title" wicket:message="title:check"/>
+ </a>
</div>
</span>
</wicket:panel>
Modified: syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.html
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.html?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.html (original)
+++ syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceSecurityPanel.html Thu Feb 21 10:58:29 2013
@@ -16,41 +16,39 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<html>
- <wicket:panel>
- <div id="formtable" wicket:id="security">
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="passwordPolicy"><wicket:message key="passwordPolicy"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="passwordPolicy">
- [panel for dynamic input type markup]
- </span>
- </div>
- </div>
+<wicket:panel>
+ <div id="formtable" wicket:id="security">
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="passwordPolicy"><wicket:message key="passwordPolicy"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="passwordPolicy">
+ [panel for dynamic input type markup]
+ </span>
+ </div>
+ </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="accountPolicy"><wicket:message key="accountPolicy"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="accountPolicy">
- [panel for dynamic input type markup]
- </span>
- </div>
- </div>
+ <div class="tablerow">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="accountPolicy"><wicket:message key="accountPolicy"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="accountPolicy">
+ [panel for dynamic input type markup]
+ </span>
+ </div>
+ </div>
- <div class="tablerow">
- <div class="tablecolumn_label short_dynamicsize">
- <label for="syncPolicy"><wicket:message key="syncPolicy"/></label>
- </div>
- <div class="tablecolumn_field medium_dynamicsize">
- <span wicket:id="syncPolicy">
- [panel for dynamic input type markup]
- </span>
- </div>
- </div>
- </div>
- </wicket:panel>
-</html>
+ <div class="tablerow alt">
+ <div class="tablecolumn_label short_dynamicsize">
+ <label for="syncPolicy"><wicket:message key="syncPolicy"/></label>
+ </div>
+ <div class="tablecolumn_field medium_dynamicsize">
+ <span wicket:id="syncPolicy">
+ [panel for dynamic input type markup]
+ </span>
+ </div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConfigurationTestITCase.java Thu Feb 21 10:58:29 2013
@@ -49,7 +49,7 @@ public class ConfigurationTestITCase ext
selenium.waitForCondition("selenium.isElementPresent(\"//input[@name='key:textField']\");", "30000");
- assertEquals("connid.bundles.directory", selenium.getAttribute("//input[@name='key:textField']@value"));
+ assertEquals("createRequest.allowed", selenium.getAttribute("//input[@name='key:textField']@value"));
selenium.click("css=a.w_close");
}
Modified: syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java?rev=1448574&r1=1448573&r2=1448574&view=diff
==============================================================================
--- syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java (original)
+++ syncope/trunk/console/src/test/java/org/apache/syncope/console/ConnInstanceTestITCase.java Thu Feb 21 10:58:29 2013
@@ -95,7 +95,7 @@ public class ConnInstanceTestITCase exte
selenium.waitForCondition(
"selenium.isElementPresent(\"//div[2]/form/div[2]/div/div/div[3]/div[2]/span/select\");", "30000");
- selenium.click("//div[2]/form/div[2]/div[2]/div/span/div[2]/div[29]/a/img");
+ selenium.click("//div[2]/form/div[2]/div[2]/div/span/div[2]/div[30]/a");
selenium.waitForCondition(
"selenium.isElementPresent(\"//div/ul/li/span[contains(text(),'Successful connection')]\");", "30000");