Merge branch 'mcm_styling' into mcm_special_events

2 files changed, 10 insertions, 4 deletions

diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java
index 287742fa..f08c9f80 100644
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/GQueryEffectsTestGwt.java
@@ -66,6 +66,8 @@ public class GQueryEffectsTestGwt extends GWTTestCase {
     }
   }
 
+  // Fails in TC windows, pass in Jenkins Linux
+  @DoNotRunWith(Platform.HtmlUnitLayout)
   public void testClipAnimation() {
     $(e).html("<p id='idtest'>Content 1</p></p>");
 
@@ -354,6 +356,8 @@ public class GQueryEffectsTestGwt extends GWTTestCase {
     assertTrue(msg, c);
   }
 
+  // Fails in TC windows, pass in Jenkins Linux
+  @DoNotRunWith(Platform.HtmlUnitLayout)
   public void testAttrEffect() {
     $(e).html("<table border=1 id=idtest width=440><tr><td width=50%>A</td><td width=50%>B</td></tr></table>");
 
diff --git a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java
index 5ea76a18..50123b80 100644
--- a/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java
+++ b/gwtquery-core/src/test/java/com/google/gwt/query/client/dbinding/DataBindingTestJre.java
@@ -16,6 +16,8 @@
 package com.google.gwt.query.client.dbinding;
 
 import com.google.gwt.core.shared.GWT;
+import com.google.gwt.junit.DoNotRunWith;
+import com.google.gwt.junit.Platform;
 import com.google.gwt.junit.client.GWTTestCase;
 import com.google.gwt.query.client.Function;
 import com.google.gwt.query.client.GQ;
@@ -177,8 +179,7 @@ public class DataBindingTestJre extends GWTTestCase {
                                                  + "   }"
                                                  + "}";
 
-  public void
-  test_parse_json() {
+  public void test_parse_json() {
     GUser entity = GQ.create(GUser.class);
     entity.parse(JSON_USER_EXAMPLE, true);
 
@@ -191,8 +192,9 @@ public class DataBindingTestJre extends GWTTestCase {
     assertNotNull(entity.address().get("phone"));
   }
 
-  public void
-  test_parse_strict_json() {
+  // Nested strict not implemented in JS
+  @DoNotRunWith(Platform.Prod)
+  public void test_parse_strict_json() {
     GUser entity = GQ.create(GUser.class);
     entity.parse(JSON_USER_EXAMPLE, true);
     entity.strip();