You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wave-commits@incubator.apache.org by wi...@apache.org on 2016/12/22 12:27:11 UTC
incubator-wave git commit: Fixed errors in the Gwt Tests,
run ./gradlew testGwt
Repository: incubator-wave
Updated Branches:
refs/heads/fix/dependendices-2016 4d5e92d1e -> 448cd1d60
Fixed errors in the Gwt Tests, run ./gradlew testGwt
Paragraph tests an empty paragraph (doesnt have a min height) check the rest of the tests to see why its been misbehaving.
Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/448cd1d6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/448cd1d6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/448cd1d6
Branch: refs/heads/fix/dependendices-2016
Commit: 448cd1d60d58ebfe091793423a00304dc5a631c2
Parents: 4d5e92d
Author: wisebaldone <wi...@apache.org>
Authored: Thu Dec 22 22:27:04 2016 +1000
Committer: wisebaldone <wi...@apache.org>
Committed: Thu Dec 22 22:27:04 2016 +1000
----------------------------------------------------------------------
build.gradle | 3 ---
wave/build.gradle | 2 +-
wave/src/main/java/org/waveprotocol/box/stat/Statistic.java | 3 +++
.../wave/client/scheduler/testing/FakeTimerService.java | 5 +++--
.../org/waveprotocol/wave/client/doodad/Doodad.gwt.xml | 1 +
.../wave/client/scheduler/testing/Testing.gwt.xml | 4 +++-
.../org/waveprotocol/wave/client/wavepanel/WavePanel.gwt.xml | 5 ++++-
.../waveprotocol/wave/client/wavepanel/event/Event.gwt.xml | 5 ++++-
.../client/editor/extract/PasteFormatRendererGwtTest.java | 2 +-
.../wave/client/editor/integration/ParagraphGwtTest.java | 2 +-
.../org/waveprotocol/wave/client/wavepanel/tests.gwt.xml | 8 +++++++-
.../org/waveprotocol/wave/client/wavepanel/tests.gwt.xml | 6 +++++-
12 files changed, 33 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 2de1768..d4511fe 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,9 +22,6 @@ buildscript {
repositories {
mavenCentral()
}
- //dependencies {
- // classpath 'com.google.protobuf:protobuf-gradle-plugin:0.8.0'
- //}
}
plugins {
id "org.nosphere.apache.rat" version "0.2.0"
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/build.gradle
----------------------------------------------------------------------
diff --git a/wave/build.gradle b/wave/build.gradle
index ff14a66..99f74bd 100644
--- a/wave/build.gradle
+++ b/wave/build.gradle
@@ -414,7 +414,7 @@ task testGwt(type: Test) {
}
}
-testGwt.dependsOn compileGwtDev
+testGwt.dependsOn compileGwt
task testMongo(type: Test) {
include "**/server/persistence/mongodb/**/*Test*"
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/main/java/org/waveprotocol/box/stat/Statistic.java
----------------------------------------------------------------------
diff --git a/wave/src/main/java/org/waveprotocol/box/stat/Statistic.java b/wave/src/main/java/org/waveprotocol/box/stat/Statistic.java
index a4d3be3..a94d655 100644
--- a/wave/src/main/java/org/waveprotocol/box/stat/Statistic.java
+++ b/wave/src/main/java/org/waveprotocol/box/stat/Statistic.java
@@ -18,6 +18,7 @@
*/
package org.waveprotocol.box.stat;
+import com.google.common.annotations.GwtIncompatible;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -73,6 +74,7 @@ public class Statistic {
public abstract String getValue();
}
+ @GwtIncompatible("Uses Reflection")
private static class FieldEntry extends Entry {
final Field field;
final Object ref;
@@ -104,6 +106,7 @@ public class Statistic {
*
* @param clazz the class type to track.
*/
+ @GwtIncompatible("Uses getDeclaredFields / Reflection")
public static void trackClass(Class<?> clazz) {
for (Field field : clazz.getDeclaredFields()) {
Stat stat = field.getAnnotation(Stat.class);
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/main/java/org/waveprotocol/wave/client/scheduler/testing/FakeTimerService.java
----------------------------------------------------------------------
diff --git a/wave/src/main/java/org/waveprotocol/wave/client/scheduler/testing/FakeTimerService.java b/wave/src/main/java/org/waveprotocol/wave/client/scheduler/testing/FakeTimerService.java
index d756e9e..c295931 100644
--- a/wave/src/main/java/org/waveprotocol/wave/client/scheduler/testing/FakeTimerService.java
+++ b/wave/src/main/java/org/waveprotocol/wave/client/scheduler/testing/FakeTimerService.java
@@ -241,9 +241,10 @@ public class FakeTimerService implements TimerService {
Iterator<TimedTask> iterator = tasks.iterator();
boolean found = false;
while (iterator.hasNext()) {
- if (iterator.next().getTask().equals(incrementalTask)) {
+ TimedTask current = iterator.next();
+ if (current.getTask().equals(incrementalTask)) {
if (remove) {
- iterator.remove();
+ tasks.remove(current);
found = true;
} else {
return true;
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/main/resources/org/waveprotocol/wave/client/doodad/Doodad.gwt.xml
----------------------------------------------------------------------
diff --git a/wave/src/main/resources/org/waveprotocol/wave/client/doodad/Doodad.gwt.xml b/wave/src/main/resources/org/waveprotocol/wave/client/doodad/Doodad.gwt.xml
index 26cf342..01c645b 100644
--- a/wave/src/main/resources/org/waveprotocol/wave/client/doodad/Doodad.gwt.xml
+++ b/wave/src/main/resources/org/waveprotocol/wave/client/doodad/Doodad.gwt.xml
@@ -29,6 +29,7 @@
<inherits name="org.waveprotocol.wave.client.widget.button.Button" />
<inherits name="org.waveprotocol.wave.model.conversation.Conversation" />
<inherits name="org.waveprotocol.wave.util.escapers.Escapers" />
+<inherits name="org.waveprotocol.box.webclient.WebClient"/>
<source path=""/>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/testing/Testing.gwt.xml
----------------------------------------------------------------------
diff --git a/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/testing/Testing.gwt.xml b/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/testing/Testing.gwt.xml
index 1b37066..1b0896c 100644
--- a/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/testing/Testing.gwt.xml
+++ b/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/testing/Testing.gwt.xml
@@ -20,6 +20,8 @@
-->
-<module><inherits name="com.google.gwt.user.User" /> <source path=""/>
+<module><inherits name="com.google.gwt.user.User" />
+ <inherits name="org.waveprotocol.wave.client.scheduler.Scheduler"/>
+ <source path=""/>
</module>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/WavePanel.gwt.xml
----------------------------------------------------------------------
diff --git a/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/WavePanel.gwt.xml b/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/WavePanel.gwt.xml
index 1b37066..30524e2 100644
--- a/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/WavePanel.gwt.xml
+++ b/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/WavePanel.gwt.xml
@@ -20,6 +20,9 @@
-->
-<module><inherits name="com.google.gwt.user.User" /> <source path=""/>
+<module><inherits name="com.google.gwt.user.User" />
+ <inherits name="org.waveprotocol.wave.client.uibuilder.UiBuilder"/>
+ <inherits name="org.waveprotocol.box.stat.Stat"/>
+ <source path=""/>
</module>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/event/Event.gwt.xml
----------------------------------------------------------------------
diff --git a/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/event/Event.gwt.xml b/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/event/Event.gwt.xml
index 1ef9aa9..bf53a20 100644
--- a/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/event/Event.gwt.xml
+++ b/wave/src/main/resources/org/waveprotocol/wave/client/wavepanel/event/Event.gwt.xml
@@ -20,6 +20,9 @@
-->
-<module><inherits name="com.google.gwt.user.User" /><inherits name="com.google.common.base.Base" /><inherits name="org.waveprotocol.wave.client.common.util.Util" /><inherits name="org.waveprotocol.wave.client.uibuilder.UiBuilder" /><inherits name="org.waveprotocol.wave.client.widget.common.Common" /><inherits name="org.waveprotocol.wave.model.util.Util" /> <source path=""/>
+<module><inherits name="com.google.gwt.user.User" /><inherits name="com.google.common.base.Base" /><inherits name="org.waveprotocol.wave.client.common.util.Util" /><inherits name="org.waveprotocol.wave.client.uibuilder.UiBuilder" /><inherits name="org.waveprotocol.wave.client.widget.common.Common" /><inherits name="org.waveprotocol.wave.model.util.Util" />
+ <inherits name="org.waveprotocol.box.stat.Stat"/>
+ <inherits name="org.waveprotocol.box.stat.Stat"/>
+ <source path=""/>
</module>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/test/java/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java
----------------------------------------------------------------------
diff --git a/wave/src/test/java/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java b/wave/src/test/java/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java
index 83d34c3..d5275cf 100644
--- a/wave/src/test/java/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java
+++ b/wave/src/test/java/org/waveprotocol/wave/client/editor/extract/PasteFormatRendererGwtTest.java
@@ -87,7 +87,7 @@ public class PasteFormatRendererGwtTest extends GWTTestCase {
testHelper("<body><line/>before<line t=\"li\"/>one<line t=\"li\"/>two<line/>after</body>",
"before<br><ul><li>one</li><li>two</li></ul>after<br>");
testHelper("<body><line t=\"li\"/><input>hello</input> world<line/>after</body>",
- "<ul><li><span>hello</span> world</li></ul>after<br>");
+ "<ul><li><span contentEditable=\"true\" style=\"white-space: pre-wrap;\" class=\"SWCNL\">hello</span> world</li></ul>after<br>");
}
private void testHelper(String content, String expectedResult) {
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/test/java/org/waveprotocol/wave/client/editor/integration/ParagraphGwtTest.java
----------------------------------------------------------------------
diff --git a/wave/src/test/java/org/waveprotocol/wave/client/editor/integration/ParagraphGwtTest.java b/wave/src/test/java/org/waveprotocol/wave/client/editor/integration/ParagraphGwtTest.java
index 8ea86ee..8fb854c 100644
--- a/wave/src/test/java/org/waveprotocol/wave/client/editor/integration/ParagraphGwtTest.java
+++ b/wave/src/test/java/org/waveprotocol/wave/client/editor/integration/ParagraphGwtTest.java
@@ -84,7 +84,7 @@ public class ParagraphGwtTest extends ElementTestBase {
// testTaller("<p></p><p></p>", "<p></p>", minHeight);
// testTaller("<p></p><p></p><p></p>", "<p></p><p></p>", minHeight);
- testEqualHeight(format("<p></p>"), format("<p>aXj</p>"));
+ testEqualHeight(format("<p>a</p>"), format("<p>aXj</p>"));
// testEqualHeight("<p></p><p></p>", "<p>aXj</p><p>aXjADFSG</p>");
testContentWrap("<p>|</p>");
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/test/java/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
----------------------------------------------------------------------
diff --git a/wave/src/test/java/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml b/wave/src/test/java/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
index 866f890..a69575b 100644
--- a/wave/src/test/java/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
+++ b/wave/src/test/java/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
@@ -22,7 +22,13 @@
<module>
<inherits name="com.google.gwt.user.User"/>
-
+ <inherits name="org.waveprotocol.wave.model.util.Util"/>
+ <inherits name="org.waveprotocol.wave.client.common.safehtml.SafeHtml"/>
+ <inherits name="org.waveprotocol.wave.client.common.util.Util"/>
+ <inherits name="org.waveprotocol.wave.client.uibuilder.UiBuilder"/>
+ <inherits name="org.waveprotocol.wave.client.uibuilder.UiBuilder"/>
+ <inherits name="org.waveprotocol.box.stat.Stat"/>
+
<source path=""/>
</module>
http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/448cd1d6/wave/src/test/resources/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
----------------------------------------------------------------------
diff --git a/wave/src/test/resources/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml b/wave/src/test/resources/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
index 866f890..a9bbc59 100644
--- a/wave/src/test/resources/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
+++ b/wave/src/test/resources/org/waveprotocol/wave/client/wavepanel/tests.gwt.xml
@@ -22,7 +22,11 @@
<module>
<inherits name="com.google.gwt.user.User"/>
-
+ <inherits name="org.waveprotocol.wave.model.util.Util"/>
+ <inherits name="org.waveprotocol.wave.client.common.safehtml.SafeHtml"/>
+ <inherits name="org.waveprotocol.wave.client.uibuilder.UiBuilder"/>
+ <inherits name="org.waveprotocol.box.stat.Stat"/>
+
<source path=""/>
</module>