Repository: incubator-wave Updated Branches: refs/heads/fix/dependendices-2016 8db12c97a -> 8c8a690ac
Fixed Gwt tests and some tests are passing, others are not. Project: http://git-wip-us.apache.org/repos/asf/incubator-wave/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-wave/commit/8c8a690a Tree: http://git-wip-us.apache.org/repos/asf/incubator-wave/tree/8c8a690a Diff: http://git-wip-us.apache.org/repos/asf/incubator-wave/diff/8c8a690a Branch: refs/heads/fix/dependendices-2016 Commit: 8c8a690acf3d82110ea97922e07d9b68b3c99e59 Parents: 8db12c9 Author: wisebaldone <[email protected]> Authored: Tue Nov 29 01:41:19 2016 +1000 Committer: wisebaldone <[email protected]> Committed: Tue Nov 29 01:41:19 2016 +1000 ---------------------------------------------------------------------- wave/build.gradle | 11 +++++++---- .../resources/org/waveprotocol/box/stat/Stat.gwt.xml | 1 + .../org/waveprotocol/wave/client/editor/Editor.gwt.xml | 1 + .../waveprotocol/wave/client/scheduler/Scheduler.gwt.xml | 7 +++++-- 4 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8c8a690a/wave/build.gradle ---------------------------------------------------------------------- diff --git a/wave/build.gradle b/wave/build.gradle index fa6c638..9fb4028 100644 --- a/wave/build.gradle +++ b/wave/build.gradle @@ -169,7 +169,7 @@ dependencies { ) testCompile( [group: 'junit', name: 'junit', version: '4.12'], // [11/2016, 1/2018] - [group: "org.hamcrest", name: "hamcrest-junit", version: "2.0.0.0"], // [11/2016, 1/2018] // [11/2016, depreciate] + [group: "org.hamcrest", name: "hamcrest-junit", version: "2.0.0.0"], // [11/2016, 1/2018] [group: "org.mockito", name: "mockito-core", version: "2.2.21"], // [11/2016, 1/2018] ) } @@ -395,15 +395,18 @@ test { } } -/* TODO(wisebaldone) not working due to gwt conflict talked about above, cant - have everything on classpath because 2 jetty versions. */ task testGwt(type: Test) { include "**/*GwtTest*" + classpath += files('src/main/java/') + classpath += files('src/test/java/') + minHeapSize = "512m" maxHeapSize = "1024m" forkEvery = 1 + jvmArgs '-Dgwt.args=-logLevel WARN' + doFirst { println '' println '--------------------' @@ -413,7 +416,7 @@ task testGwt(type: Test) { } } -testGwt.dependsOn compileGwt +testGwt.dependsOn compileGwtDev task testMongo(type: Test) { include "**/server/persistence/mongodb/**/*Test*" http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8c8a690a/wave/src/main/resources/org/waveprotocol/box/stat/Stat.gwt.xml ---------------------------------------------------------------------- diff --git a/wave/src/main/resources/org/waveprotocol/box/stat/Stat.gwt.xml b/wave/src/main/resources/org/waveprotocol/box/stat/Stat.gwt.xml index a459a43..3139114 100644 --- a/wave/src/main/resources/org/waveprotocol/box/stat/Stat.gwt.xml +++ b/wave/src/main/resources/org/waveprotocol/box/stat/Stat.gwt.xml @@ -12,5 +12,6 @@ <!-- limitations under the License. --> <module> + <inherits name="com.google.common.collect.Collect"/> <source path=""/> </module> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8c8a690a/wave/src/main/resources/org/waveprotocol/wave/client/editor/Editor.gwt.xml ---------------------------------------------------------------------- diff --git a/wave/src/main/resources/org/waveprotocol/wave/client/editor/Editor.gwt.xml b/wave/src/main/resources/org/waveprotocol/wave/client/editor/Editor.gwt.xml index 24af85f..a0a7a4b 100644 --- a/wave/src/main/resources/org/waveprotocol/wave/client/editor/Editor.gwt.xml +++ b/wave/src/main/resources/org/waveprotocol/wave/client/editor/Editor.gwt.xml @@ -29,6 +29,7 @@ <inherits name="org.waveprotocol.wave.client.common.scrub.Scrub" /> <inherits name="org.waveprotocol.wave.client.common.util.Util" /> <inherits name="org.waveprotocol.wave.client.debug.logger.Logger" /> +<inherits name="org.waveprotocol.wave.client.doodad.Doodad" /> <inherits name="org.waveprotocol.wave.client.editor.constants.Constants" /> <inherits name="org.waveprotocol.wave.client.editor.content.paragraph.constants.Constants" /> <inherits name="org.waveprotocol.wave.client.editor.selection.html.Html" /> http://git-wip-us.apache.org/repos/asf/incubator-wave/blob/8c8a690a/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/Scheduler.gwt.xml ---------------------------------------------------------------------- diff --git a/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/Scheduler.gwt.xml b/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/Scheduler.gwt.xml index 2d013bd..57ce7cd 100644 --- a/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/Scheduler.gwt.xml +++ b/wave/src/main/resources/org/waveprotocol/wave/client/scheduler/Scheduler.gwt.xml @@ -20,7 +20,10 @@ --> -<module><inherits name="com.google.gwt.user.User" /><inherits name="org.waveprotocol.wave.client.common.util.Util" /> <source path=""/> +<module> + <inherits name="com.google.gwt.user.User" /> + <inherits name="org.waveprotocol.wave.client.common.util.Util" /> + <inherits name="org.waveprotocol.box.stat.Stat" /> + <source path=""/> <source path="knobs"/> - </module>
