diff options
| author | Louis Wasserman <lowasser@google.com> | 2013-04-13 12:02:12 -0700 |
|---|---|---|
| committer | Louis Wasserman <lowasser@google.com> | 2013-04-15 09:01:39 -0700 |
| commit | 31978328af5af66bc67bcbdda12b20710c2cfcad (patch) | |
| tree | bbb8c8f3efcc6237aa14fc1e923afe7a6ca7a280 /guava-gwt/src | |
| parent | f03c9d816c1c5d149a983db8097543ad845dafff (diff) | |
| download | guava-31978328af5af66bc67bcbdda12b20710c2cfcad.tar.gz | |
Run "normal" GWT tests in public Guava.
We still don't run the suite-builder tests, so the run is incomplete, but at least it's fairly quick:
Tests run: 6667, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 155.218 sec
Among the steps of this process covered by this CL:
- Export the generated GWTTestCase files into Guava.
- Add dependencies in guava-gwt on the guava (and guava-testlib) test sources.
- Treat the GWT portion of guava-testlib as though it is part of the guava-gwt tests (to sidestep the issue that we should really have a separate guava-testlib-gwt artifact analogous to the separate guava-gwt project). (Mainly this means putting its files under guava-gwt/tests.)
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=45160153
Diffstat (limited to 'guava-gwt/src')
10 files changed, 63 insertions, 9 deletions
diff --git a/guava-gwt/src/com/google/common/ForceGuavaCompilation.gwt.xml b/guava-gwt/src/com/google/common/ForceGuavaCompilation.gwt.xml index 9c4d5078e..32e214bd8 100644 --- a/guava-gwt/src/com/google/common/ForceGuavaCompilation.gwt.xml +++ b/guava-gwt/src/com/google/common/ForceGuavaCompilation.gwt.xml @@ -10,6 +10,9 @@ <inherits name="com.google.common.util.concurrent.Concurrent" /> <inherits name="com.google.gwt.user.User" /> + <!-- com.google.common.testing.Testing is located in + ForceGuavaTestsCompilation under guava-gwt/test --> + <source path="" /> <entry-point class="com.google.common.ForceGuavaCompilationEntryPoint" /> </module> diff --git a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml index 8903a62ce..28108582f 100644 --- a/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml +++ b/guava-gwt/src/com/google/common/annotations/Annotations.gwt.xml @@ -1,4 +1,7 @@ <!-- semi-autogenerated module descriptor --> <module> -<source path=""/> +<source path=""> + <!-- Hack to keep collect from hiding collect.testing supersource: --> + <exclude name="**/testing/**"/> +</source> </module> diff --git a/guava-gwt/src/com/google/common/base/Base.gwt.xml b/guava-gwt/src/com/google/common/base/Base.gwt.xml index d0c84c886..8fecfc2e0 100644 --- a/guava-gwt/src/com/google/common/base/Base.gwt.xml +++ b/guava-gwt/src/com/google/common/base/Base.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <super-source path="super"/> diff --git a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml index 62c7187b8..955381219 100644 --- a/guava-gwt/src/com/google/common/cache/Cache.gwt.xml +++ b/guava-gwt/src/com/google/common/cache/Cache.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <super-source path="super"/> diff --git a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml index e042bcbb6..a2bc70d1b 100644 --- a/guava-gwt/src/com/google/common/collect/Collect.gwt.xml +++ b/guava-gwt/src/com/google/common/collect/Collect.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <super-source path="super"/> diff --git a/guava-gwt/src/com/google/common/io/Io.gwt.xml b/guava-gwt/src/com/google/common/io/Io.gwt.xml index f272c7c43..1766f713b 100644 --- a/guava-gwt/src/com/google/common/io/Io.gwt.xml +++ b/guava-gwt/src/com/google/common/io/Io.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <super-source path="super"/> diff --git a/guava-gwt/src/com/google/common/math/Math.gwt.xml b/guava-gwt/src/com/google/common/math/Math.gwt.xml index a87feb117..295f26960 100644 --- a/guava-gwt/src/com/google/common/math/Math.gwt.xml +++ b/guava-gwt/src/com/google/common/math/Math.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <super-source path="super"/> diff --git a/guava-gwt/src/com/google/common/net/Net.gwt.xml b/guava-gwt/src/com/google/common/net/Net.gwt.xml index b6f5049b3..d587e6ce4 100644 --- a/guava-gwt/src/com/google/common/net/Net.gwt.xml +++ b/guava-gwt/src/com/google/common/net/Net.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <super-source path="super"/> diff --git a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml index 3966a5135..8688ffd34 100644 --- a/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml +++ b/guava-gwt/src/com/google/common/primitives/Primitives.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <super-source path="super"/> diff --git a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml index 1bb0da018..ca9de3127 100644 --- a/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml +++ b/guava-gwt/src/com/google/common/util/concurrent/Concurrent.gwt.xml @@ -2,7 +2,13 @@ <!-- semi-autogenerated module descriptor --> <module> - <source path=""/> + <source path=""> + + <!-- Hack to keep collect from hiding collect.testing supersource: --> + + <exclude name="**/testing/**"/> + + </source> <inherits name="com.google.common.annotations.Annotations"/> |