diff options
Diffstat (limited to 'guava-gwt/test/com/google')
10 files changed, 21 insertions, 77 deletions
diff --git a/guava-gwt/test/com/google/common/cache/testModule.gwt.xml b/guava-gwt/test/com/google/common/cache/testModule.gwt.xml deleted file mode 100644 index 7de886b..0000000 --- a/guava-gwt/test/com/google/common/cache/testModule.gwt.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<module> - <inherits name="com.google.gwt.user.User"/> - <inherits name="com.google.gwt.junit.JUnit"/> - <inherits name="com.google.common.annotations.Annotations"/> - <inherits name="com.google.common.base.Base"/> - <inherits name="com.google.common.cache.Cache"/> - <inherits name="com.google.common.collect.Collect"/> - <inherits name="com.google.common.testing.Testing"/> - <inherits name="com.google.common.util.concurrent.Concurrent"/> - <inherits name="org.junit.contrib.truth.Truth"/> - <entry-point class="com.google.common.cache.TestModuleEntryPoint"/> - - <source path=""/> - - <add-linker name="std"/> - - <super-source path="super"/> - -</module> diff --git a/guava-gwt/test/com/google/common/collect/testModule.gwt.xml b/guava-gwt/test/com/google/common/collect/testModule.gwt.xml index 72ee8bf..47b2f23 100644 --- a/guava-gwt/test/com/google/common/collect/testModule.gwt.xml +++ b/guava-gwt/test/com/google/common/collect/testModule.gwt.xml @@ -4,10 +4,9 @@ <inherits name="com.google.gwt.junit.JUnit"/> <inherits name="com.google.common.base.Base"/> <inherits name="com.google.common.collect.Collect"/> - <inherits name="com.google.common.collect.testing.Testing"/> - <inherits name="com.google.common.collect.testing.google.Google"/> <inherits name="com.google.common.testing.Testing"/> <inherits name="org.junit.contrib.truth.Truth"/> + <inherits name="com.google.common.annotations.Annotations"/> <entry-point class="com.google.common.collect.TestModuleEntryPoint"/> <source path=""/> diff --git a/guava-gwt/test/com/google/common/math/testModule.gwt.xml b/guava-gwt/test/com/google/common/math/testModule.gwt.xml index 58552f1..17f579d 100644 --- a/guava-gwt/test/com/google/common/math/testModule.gwt.xml +++ b/guava-gwt/test/com/google/common/math/testModule.gwt.xml @@ -6,8 +6,8 @@ <inherits name="com.google.common.collect.Collect"/> <inherits name="com.google.common.math.Math"/> <inherits name="com.google.common.testing.Testing"/> - <inherits name="org.junit.contrib.truth.Truth"/> <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="org.junit.contrib.truth.Truth"/> <entry-point class="com.google.common.math.TestModuleEntryPoint"/> <source path=""/> diff --git a/guava-gwt/test/com/google/common/io/TestModuleEntryPoint.java b/guava-gwt/test/com/google/common/net/TestPlatform.java index e06885a..39301d5 100644 --- a/guava-gwt/test/com/google/common/io/TestModuleEntryPoint.java +++ b/guava-gwt/test/com/google/common/net/TestPlatform.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 The Guava Authors + * Copyright (C) 2011 The Guava Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -14,17 +14,13 @@ * limitations under the License. */ -package com.google.common.io; +package com.google.common.net; -import com.google.gwt.core.client.EntryPoint; +import com.google.common.annotations.GwtCompatible; /** - * A dummy entry point of the test module. - * * @author Hayward Chan */ -public class TestModuleEntryPoint implements EntryPoint { - - @Override public void onModuleLoad() { - } +@GwtCompatible(emulated = true) +class TestPlatform { } diff --git a/guava-gwt/test/com/google/common/net/testModule.gwt.xml b/guava-gwt/test/com/google/common/net/testModule.gwt.xml index 1b61e1b..0e6338b 100644 --- a/guava-gwt/test/com/google/common/net/testModule.gwt.xml +++ b/guava-gwt/test/com/google/common/net/testModule.gwt.xml @@ -6,6 +6,7 @@ <inherits name="com.google.common.net.Net"/> <inherits name="com.google.common.testing.Testing"/> <inherits name="org.junit.contrib.truth.Truth"/> + <inherits name="com.google.common.annotations.Annotations"/> <entry-point class="com.google.common.net.TestModuleEntryPoint"/> <source path=""/> diff --git a/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml b/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml index 72da4d2..7bb4013 100644 --- a/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml +++ b/guava-gwt/test/com/google/common/primitives/testModule.gwt.xml @@ -2,10 +2,10 @@ <module> <inherits name="com.google.gwt.user.User"/> <inherits name="com.google.gwt.junit.JUnit"/> - <inherits name="com.google.common.collect.testing.Testing"/> <inherits name="com.google.common.primitives.Primitives"/> <inherits name="com.google.common.testing.Testing"/> <inherits name="org.junit.contrib.truth.Truth"/> + <inherits name="com.google.common.annotations.Annotations"/> <entry-point class="com.google.common.primitives.TestModuleEntryPoint"/> <source path=""/> diff --git a/guava-gwt/test/com/google/common/cache/TestModuleEntryPoint.java b/guava-gwt/test/com/google/common/testing/TestModuleEntryPoint.java index baf8478..ed6e199 100644 --- a/guava-gwt/test/com/google/common/cache/TestModuleEntryPoint.java +++ b/guava-gwt/test/com/google/common/testing/TestModuleEntryPoint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.google.common.cache; +package com.google.common.testing; import com.google.gwt.core.client.EntryPoint; diff --git a/guava-gwt/test/com/google/common/util/concurrent/testModule.gwt.xml b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml index ffae299..e1f85eb 100644 --- a/guava-gwt/test/com/google/common/util/concurrent/testModule.gwt.xml +++ b/guava-gwt/test/com/google/common/testing/Testing.gwt.xml @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="utf-8"?> <module> - <inherits name="com.google.gwt.user.User"/> - <inherits name="com.google.gwt.junit.JUnit"/> + + <source path=""/> + + <super-source path="super"/> + <inherits name="com.google.common.annotations.Annotations"/> + <inherits name="com.google.common.base.Base"/> + <inherits name="com.google.common.collect.Collect"/> - <inherits name="com.google.common.util.concurrent.Concurrent"/> - <entry-point class="com.google.common.util.concurrent.TestModuleEntryPoint"/> - <source path=""/> + <inherits name="com.google.gwt.junit.JUnit"/> - <add-linker name="std"/> - - <super-source path="super"/> + <inherits name="java.util.Util"/> </module> diff --git a/guava-gwt/test/com/google/common/io/testModule.gwt.xml b/guava-gwt/test/com/google/common/testing/testModule.gwt.xml index 3611690..2015440 100644 --- a/guava-gwt/test/com/google/common/io/testModule.gwt.xml +++ b/guava-gwt/test/com/google/common/testing/testModule.gwt.xml @@ -2,12 +2,9 @@ <module> <inherits name="com.google.gwt.user.User"/> <inherits name="com.google.gwt.junit.JUnit"/> - <inherits name="com.google.common.annotations.Annotations"/> - <inherits name="com.google.common.base.Base"/> <inherits name="com.google.common.collect.Collect"/> - <inherits name="com.google.common.io.Io"/> - <inherits name="com.google.common.math.Math"/> - <entry-point class="com.google.common.io.TestModuleEntryPoint"/> + <inherits name="com.google.common.testing.Testing"/> + <entry-point class="com.google.common.testing.TestModuleEntryPoint"/> <source path=""/> diff --git a/guava-gwt/test/com/google/common/util/concurrent/TestModuleEntryPoint.java b/guava-gwt/test/com/google/common/util/concurrent/TestModuleEntryPoint.java deleted file mode 100644 index 7ed9721..0000000 --- a/guava-gwt/test/com/google/common/util/concurrent/TestModuleEntryPoint.java +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Copyright (C) 2010 The Guava Authors - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.google.common.util.concurrent; - -import com.google.gwt.core.client.EntryPoint; - -/** - * A dummy entry point of the test module. - * - * @author Hayward Chan - */ -public class TestModuleEntryPoint implements EntryPoint { - - @Override public void onModuleLoad() { - } -} |