Adding datefield to Test for 1710, fixing icon

svn changeset:5001/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/tests-tickets/styles.css b/WebContent/ITMILL/themes/tests-tickets/styles.css
index 0f58ede364f3aab96fcb29c444e74c72d3bac16e..aea7d45b2d2bfa2a70a6405d053fcb49b923c53a 100644 (file)
--- a/WebContent/ITMILL/themes/tests-tickets/styles.css
+++ b/WebContent/ITMILL/themes/tests-tickets/styles.css
@@ -17,6 +17,7 @@
        background-color: #eee; 
 }
        
+       
 /*****************************************************************************/
 /* Ticket 1857                                                               */
 /*****************************************************************************/

diff --git a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
index eca41f315b61ac83f9a1e1aae6a46ea9322e311b..dd526d796286b9753c92cadeefafea75cfe0a5a5 100644 (file)
--- a/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
+++ b/src/com/itmill/toolkit/tests/tickets/Ticket1710.java
@@ -13,6 +13,7 @@ import com.itmill.toolkit.ui.AbstractComponent;
 import com.itmill.toolkit.ui.Button;\r
 import com.itmill.toolkit.ui.Component;\r
 import com.itmill.toolkit.ui.ComponentContainer;\r
+import com.itmill.toolkit.ui.DateField;\r
 import com.itmill.toolkit.ui.ExpandLayout;\r
 import com.itmill.toolkit.ui.Form;\r
 import com.itmill.toolkit.ui.GridLayout;\r
@@ -172,8 +173,20 @@ public class Ticket1710 extends com.itmill.toolkit.Application {
         t7.setValue("With icon and required and icon");\r
         t7.setComponentError(new SystemError("Error"));\r
         t7.setRequired(true);\r
-        t7.setIcon(new ThemeResource("icons/16/ok.png"));\r
+        t7.setIcon(new ThemeResource("../default/icons/16/ok.png"));\r
         lo.addComponent(t7);\r
+\r
+        DateField d1 = new DateField(\r
+                "Datefield with caption and icon, next one without caption");\r
+        d1.setComponentError(new SystemError("Error"));\r
+        d1.setRequired(true);\r
+        d1.setIcon(new ThemeResource("../default/icons/16/ok.png"));\r
+        lo.addComponent(d1);\r
+\r
+        DateField d2 = new DateField();\r
+        d2.setComponentError(new SystemError("Error"));\r
+        d2.setRequired(true);\r
+        lo.addComponent(d2);\r
     }\r
 \r
     public class LayoutTestingPanel extends Panel {\r