Moved benchmarks to separate benchmarks packages. This prevents spam errors on unit test execution.
Review at http://gwt-code-reviews.appspot.com/591801


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8277 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/user/test/com/google/gwt/junit/BenchmarkNoClientTest.java b/user/test/com/google/gwt/benchmarks/BenchmarkNoClientTest.java
similarity index 94%
rename from user/test/com/google/gwt/junit/BenchmarkNoClientTest.java
rename to user/test/com/google/gwt/benchmarks/BenchmarkNoClientTest.java
index fda6793..06247d7 100644
--- a/user/test/com/google/gwt/junit/BenchmarkNoClientTest.java
+++ b/user/test/com/google/gwt/benchmarks/BenchmarkNoClientTest.java
@@ -14,9 +14,10 @@
  * the License.
  */
 
-package com.google.gwt.junit;
+package com.google.gwt.benchmarks;
 
 import com.google.gwt.benchmarks.client.Benchmark;
+import com.google.gwt.junit.GWTTestCaseNoClientTest;
 import com.google.gwt.junit.JUnitShell.Strategy;
 
 /**
diff --git a/user/test/com/google/gwt/benchmarks/BenchmarksSuite.java b/user/test/com/google/gwt/benchmarks/BenchmarksSuite.java
new file mode 100644
index 0000000..a00f741
--- /dev/null
+++ b/user/test/com/google/gwt/benchmarks/BenchmarksSuite.java
@@ -0,0 +1,38 @@
+/*
+ * Copyright 2009 Google Inc.
+ * 
+ * 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.gwt.benchmarks;
+
+import com.google.gwt.junit.tools.GWTTestSuite;
+
+import junit.framework.Test;
+
+/**
+ * Tests of the junit package.
+ */
+public class BenchmarksSuite {
+  public static Test suite() {
+    GWTTestSuite suite = new GWTTestSuite(
+        "Test for suite for com.google.gwt.benchmarks");
+
+    // client
+    // Suppressed due to flakiness on Linux
+    // suite.addTestSuite(BenchmarkTest.class);
+
+    suite.addTestSuite(BenchmarkNoClientTest.class);
+
+    return suite;
+  }
+}
diff --git a/user/test/com/google/gwt/junit/client/BenchmarkTest.java b/user/test/com/google/gwt/benchmarks/client/BenchmarkTest.java
similarity index 89%
rename from user/test/com/google/gwt/junit/client/BenchmarkTest.java
rename to user/test/com/google/gwt/benchmarks/client/BenchmarkTest.java
index 9cb190a..192c82b 100644
--- a/user/test/com/google/gwt/junit/client/BenchmarkTest.java
+++ b/user/test/com/google/gwt/benchmarks/client/BenchmarkTest.java
@@ -14,16 +14,7 @@
  * the License.
  */
 
-package com.google.gwt.junit.client;
-
-import com.google.gwt.benchmarks.client.Benchmark;
-import com.google.gwt.benchmarks.client.IntRange;
-import com.google.gwt.benchmarks.client.IterationTimeLimit;
-import com.google.gwt.benchmarks.client.Operator;
-import com.google.gwt.benchmarks.client.RangeEnum;
-import com.google.gwt.benchmarks.client.RangeField;
-import com.google.gwt.benchmarks.client.Setup;
-import com.google.gwt.benchmarks.client.Teardown;
+package com.google.gwt.benchmarks.client;
 
 /**
  * Basic Benchmark testing.
@@ -76,7 +67,7 @@
   }
 
   public String getModuleName() {
-    return "com.google.gwt.junit.JUnit";
+    return "com.google.gwt.benchmarks.Benchmarks";
   }
 
   public void disableTestAutoboxing() {
diff --git a/user/test/com/google/gwt/emultest/EmulSuiteBenchmark.java b/user/test/com/google/gwt/emultest/EmulSuiteBenchmark.java
index 341d9d4..c262c8b 100644
--- a/user/test/com/google/gwt/emultest/EmulSuiteBenchmark.java
+++ b/user/test/com/google/gwt/emultest/EmulSuiteBenchmark.java
@@ -15,15 +15,15 @@
  */
 package com.google.gwt.emultest;
 
-import com.google.gwt.emultest.java.lang.StringBufferBenchmark;
-import com.google.gwt.emultest.java.lang.StringBufferImplBenchmark;
-import com.google.gwt.emultest.java.util.ArrayListBenchmark;
-import com.google.gwt.emultest.java.util.ArraySortBenchmark;
-import com.google.gwt.emultest.java.util.HashMapBenchmark;
-import com.google.gwt.emultest.java.util.TreeMapBenchmark;
-import com.google.gwt.emultest.java.util.VectorBenchmark;
+import com.google.gwt.emultest.benchmarks.LongBenchmark;
+import com.google.gwt.emultest.benchmarks.java.lang.StringBufferBenchmark;
+import com.google.gwt.emultest.benchmarks.java.lang.StringBufferImplBenchmark;
+import com.google.gwt.emultest.benchmarks.java.util.ArrayListBenchmark;
+import com.google.gwt.emultest.benchmarks.java.util.ArraySortBenchmark;
+import com.google.gwt.emultest.benchmarks.java.util.HashMapBenchmark;
+import com.google.gwt.emultest.benchmarks.java.util.TreeMapBenchmark;
+import com.google.gwt.emultest.benchmarks.java.util.VectorBenchmark;
 import com.google.gwt.junit.tools.GWTTestSuite;
-import com.google.gwt.lang.LongBenchmark;
 
 import junit.framework.Test;
 
diff --git a/user/test/com/google/gwt/emultest/EmulSuiteBenchmarks.gwt.xml b/user/test/com/google/gwt/emultest/EmulSuiteBenchmarks.gwt.xml
new file mode 100644
index 0000000..1a7f2bd
--- /dev/null
+++ b/user/test/com/google/gwt/emultest/EmulSuiteBenchmarks.gwt.xml
@@ -0,0 +1,18 @@
+<!--                                                                        -->
+<!-- Copyright 2010 Google Inc.                                             -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you    -->
+<!-- may not use this file except in compliance with the License. You may   -->
+<!-- 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. License for the specific language governing permissions and   -->
+<!-- limitations under the License.                                         -->
+
+<module>
+  <inherits name='com.google.gwt.benchmarks.Benchmarks' />
+  <source path='benchmarks' />
+</module>
diff --git a/user/test/com/google/gwt/lang/LongBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/LongBenchmark.java
similarity index 95%
rename from user/test/com/google/gwt/lang/LongBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/LongBenchmark.java
index 5c502ea..78859ca 100644
--- a/user/test/com/google/gwt/lang/LongBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/LongBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.lang;
+package com.google.gwt.emultest.benchmarks;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
@@ -50,7 +50,7 @@
 
   @Override
   public String getModuleName() {
-    return "com.google.gwt.emultest.EmulSuite";
+    return "com.google.gwt.emultest.EmulSuiteBenchmarks";
   }
 
   public void testIncrement() {
diff --git a/user/test/com/google/gwt/emultest/java/lang/StringBufferBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/lang/StringBufferBenchmark.java
similarity index 92%
rename from user/test/com/google/gwt/emultest/java/lang/StringBufferBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/lang/StringBufferBenchmark.java
index b1855a2..1707742 100644
--- a/user/test/com/google/gwt/emultest/java/lang/StringBufferBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/lang/StringBufferBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.lang;
+package com.google.gwt.emultest.benchmarks.java.lang;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
@@ -58,23 +58,23 @@
     }
 
     public native void cmd(String cmd) /*-{
-      this.@com.google.gwt.emultest.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 0);
+      this.@com.google.gwt.emultest.benchmarks.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 0);
     }-*/;
 
     public native void cmd(String cmd, int a) /*-{
-      this.@com.google.gwt.emultest.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 1, a);
+      this.@com.google.gwt.emultest.benchmarks.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 1, a);
     }-*/;
 
     public native void cmd(String cmd, int a, int b) /*-{
-      this.@com.google.gwt.emultest.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 2, a, b);
+      this.@com.google.gwt.emultest.benchmarks.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 2, a, b);
     }-*/;
 
     public native void cmd(String cmd, int a, int b, int c) /*-{
-      this.@com.google.gwt.emultest.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 3, a, b, c);
+      this.@com.google.gwt.emultest.benchmarks.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.push(cmd, 3, a, b, c);
     }-*/;
 
     public native String end() /*-{
-      return this.@com.google.gwt.emultest.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.join('');
+      return this.@com.google.gwt.emultest.benchmarks.java.lang.StringBufferBenchmark$JSArrayDisplayList::jso.join('');
     }-*/;
 
     public void fill() {
@@ -252,7 +252,7 @@
 
   @Override
   public String getModuleName() {
-    return "com.google.gwt.emultest.EmulSuite";
+    return "com.google.gwt.emultest.EmulSuiteBenchmarks";
   }
 
   /**
diff --git a/user/test/com/google/gwt/emultest/java/lang/StringBufferImplBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/lang/StringBufferImplBenchmark.java
similarity index 97%
rename from user/test/com/google/gwt/emultest/java/lang/StringBufferImplBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/lang/StringBufferImplBenchmark.java
index 6c06e0e..3061f63 100644
--- a/user/test/com/google/gwt/emultest/java/lang/StringBufferImplBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/lang/StringBufferImplBenchmark.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.google.gwt.emultest.java.lang;
+package com.google.gwt.emultest.benchmarks.java.lang;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
@@ -75,7 +75,7 @@
 
   @Override
   public String getModuleName() {
-    return "com.google.gwt.emultest.EmulSuite";
+    return "com.google.gwt.emultest.EmulSuiteBenchmarks";
   }
 
   public void testManyAppends() {
diff --git a/user/test/com/google/gwt/emultest/java/util/ArrayListBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/util/ArrayListBenchmark.java
similarity index 93%
rename from user/test/com/google/gwt/emultest/java/util/ArrayListBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/util/ArrayListBenchmark.java
index 9de8a5e..86adeea 100644
--- a/user/test/com/google/gwt/emultest/java/util/ArrayListBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/util/ArrayListBenchmark.java
@@ -13,7 +13,8 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.util;
+package com.google.gwt.emultest.benchmarks.java.util;
+
 
 import java.util.List;
 import java.util.ArrayList;
diff --git a/user/test/com/google/gwt/emultest/java/util/ArraySortBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/util/ArraySortBenchmark.java
similarity index 97%
rename from user/test/com/google/gwt/emultest/java/util/ArraySortBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/util/ArraySortBenchmark.java
index 45b21b9..33f7585 100644
--- a/user/test/com/google/gwt/emultest/java/util/ArraySortBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/util/ArraySortBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.util;
+package com.google.gwt.emultest.benchmarks.java.util;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
@@ -78,7 +78,7 @@
   }
 
   public String getModuleName() {
-    return "com.google.gwt.emultest.EmulSuite";
+    return "com.google.gwt.emultest.EmulSuiteBenchmarks";
   }
 
   // Required for JUnit
diff --git a/user/test/com/google/gwt/emultest/java/util/HashMapBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/util/HashMapBenchmark.java
similarity index 97%
rename from user/test/com/google/gwt/emultest/java/util/HashMapBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/util/HashMapBenchmark.java
index dca32f7..53bd546 100644
--- a/user/test/com/google/gwt/emultest/java/util/HashMapBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/util/HashMapBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.util;
+package com.google.gwt.emultest.benchmarks.java.util;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
@@ -36,7 +36,7 @@
   private HashMap<Object, Object> map;
 
   public String getModuleName() {
-    return "com.google.gwt.emultest.EmulSuite";
+    return "com.google.gwt.emultest.EmulSuiteBenchmarks";
   }
 
   public void testHashMapContainsValueInt() {
diff --git a/user/test/com/google/gwt/emultest/java/util/ListBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/util/ListBenchmark.java
similarity index 97%
rename from user/test/com/google/gwt/emultest/java/util/ListBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/util/ListBenchmark.java
index c58675e..26c4d1e 100644
--- a/user/test/com/google/gwt/emultest/java/util/ListBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/util/ListBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.util;
+package com.google.gwt.emultest.benchmarks.java.util;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
@@ -83,7 +83,7 @@
   int index = 0;
 
   public String getModuleName() {
-    return "com.google.gwt.emultest.EmulSuite";
+    return "com.google.gwt.emultest.EmulSuiteBenchmarks";
   }
 
   /**
diff --git a/user/test/com/google/gwt/emultest/java/util/SortedMapBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/util/SortedMapBenchmark.java
similarity index 98%
rename from user/test/com/google/gwt/emultest/java/util/SortedMapBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/util/SortedMapBenchmark.java
index b80076c..fac8ddb 100644
--- a/user/test/com/google/gwt/emultest/java/util/SortedMapBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/util/SortedMapBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.util;
+package com.google.gwt.emultest.benchmarks.java.util;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
@@ -87,7 +87,7 @@
 
   @Override
   public String getModuleName() {
-    return "com.google.gwt.emultest.EmulSuite";
+    return "com.google.gwt.emultest.EmulSuiteBenchmarks";
   }
 
   // Required for JUnit
diff --git a/user/test/com/google/gwt/emultest/java/util/TreeMapBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/util/TreeMapBenchmark.java
similarity index 94%
rename from user/test/com/google/gwt/emultest/java/util/TreeMapBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/util/TreeMapBenchmark.java
index 15a57d8..b4a8a33 100644
--- a/user/test/com/google/gwt/emultest/java/util/TreeMapBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/util/TreeMapBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.util;
+package com.google.gwt.emultest.benchmarks.java.util;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
diff --git a/user/test/com/google/gwt/emultest/java/util/VectorBenchmark.java b/user/test/com/google/gwt/emultest/benchmarks/java/util/VectorBenchmark.java
similarity index 93%
rename from user/test/com/google/gwt/emultest/java/util/VectorBenchmark.java
rename to user/test/com/google/gwt/emultest/benchmarks/java/util/VectorBenchmark.java
index e75bef7..c2ad174 100644
--- a/user/test/com/google/gwt/emultest/java/util/VectorBenchmark.java
+++ b/user/test/com/google/gwt/emultest/benchmarks/java/util/VectorBenchmark.java
@@ -13,7 +13,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.emultest.java.util;
+package com.google.gwt.emultest.benchmarks.java.util;
 
 import java.util.List;
 import java.util.Vector;
diff --git a/user/test/com/google/gwt/i18n/I18NBenchmarks.gwt.xml b/user/test/com/google/gwt/i18n/I18NBenchmarks.gwt.xml
new file mode 100644
index 0000000..1a7f2bd
--- /dev/null
+++ b/user/test/com/google/gwt/i18n/I18NBenchmarks.gwt.xml
@@ -0,0 +1,18 @@
+<!--                                                                        -->
+<!-- Copyright 2010 Google Inc.                                             -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you    -->
+<!-- may not use this file except in compliance with the License. You may   -->
+<!-- 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. License for the specific language governing permissions and   -->
+<!-- limitations under the License.                                         -->
+
+<module>
+  <inherits name='com.google.gwt.benchmarks.Benchmarks' />
+  <source path='benchmarks' />
+</module>
diff --git a/user/test/com/google/gwt/i18n/I18NSuiteBenchmark.java b/user/test/com/google/gwt/i18n/I18NSuiteBenchmark.java
index 0ecbd68..160417d 100644
--- a/user/test/com/google/gwt/i18n/I18NSuiteBenchmark.java
+++ b/user/test/com/google/gwt/i18n/I18NSuiteBenchmark.java
@@ -15,7 +15,7 @@
  */
 package com.google.gwt.i18n;
 
-import com.google.gwt.i18n.client.NumberFormatBenchmark;
+import com.google.gwt.i18n.benchmarks.NumberFormatBenchmark;
 import com.google.gwt.junit.tools.GWTTestSuite;
 
 import junit.framework.Test;
diff --git a/user/test/com/google/gwt/i18n/client/NumberFormatBenchmark.java b/user/test/com/google/gwt/i18n/benchmarks/NumberFormatBenchmark.java
similarity index 91%
rename from user/test/com/google/gwt/i18n/client/NumberFormatBenchmark.java
rename to user/test/com/google/gwt/i18n/benchmarks/NumberFormatBenchmark.java
index c519a84..1c8a895 100644
--- a/user/test/com/google/gwt/i18n/client/NumberFormatBenchmark.java
+++ b/user/test/com/google/gwt/i18n/benchmarks/NumberFormatBenchmark.java
@@ -14,12 +14,13 @@
  * the License.
  */
 
-package com.google.gwt.i18n.client;
+package com.google.gwt.i18n.benchmarks;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
 import com.google.gwt.benchmarks.client.Operator;
 import com.google.gwt.benchmarks.client.RangeField;
+import com.google.gwt.i18n.client.NumberFormat;
 
 /**
  * Benchmark for number format.
@@ -32,7 +33,7 @@
    */
   @Override
   public String getModuleName() {
-    return "com.google.gwt.i18n.I18N";
+    return "com.google.gwt.i18n.I18NBenchmarks";
   }
 
   // Required for JUnit
diff --git a/user/test/com/google/gwt/junit/JUnitSuite.java b/user/test/com/google/gwt/junit/JUnitSuite.java
index 4a198cd..72ed980 100644
--- a/user/test/com/google/gwt/junit/JUnitSuite.java
+++ b/user/test/com/google/gwt/junit/JUnitSuite.java
@@ -43,7 +43,6 @@
     suite.addTestSuite(FakeMessagesMakerTest.class);
     suite.addTestSuite(JUnitMessageQueueTest.class);
     suite.addTestSuite(GWTTestCaseNoClientTest.class);
-    suite.addTestSuite(BenchmarkNoClientTest.class);
 
     // These two are intended only to be run manually. See class comments
     // suite.addTestSuite(ParallelRemoteTest.class);
diff --git a/user/test/com/google/gwt/user/UserBenchmarks.gwt.xml b/user/test/com/google/gwt/user/UserBenchmarks.gwt.xml
new file mode 100644
index 0000000..1a7f2bd
--- /dev/null
+++ b/user/test/com/google/gwt/user/UserBenchmarks.gwt.xml
@@ -0,0 +1,18 @@
+<!--                                                                        -->
+<!-- Copyright 2010 Google Inc.                                             -->
+<!-- Licensed under the Apache License, Version 2.0 (the "License"); you    -->
+<!-- may not use this file except in compliance with the License. You may   -->
+<!-- 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. License for the specific language governing permissions and   -->
+<!-- limitations under the License.                                         -->
+
+<module>
+  <inherits name='com.google.gwt.benchmarks.Benchmarks' />
+  <source path='benchmarks' />
+</module>
diff --git a/user/test/com/google/gwt/user/client/ui/DomEventBenchmark.java b/user/test/com/google/gwt/user/benchmarks/DomEventBenchmark.java
similarity index 92%
rename from user/test/com/google/gwt/user/client/ui/DomEventBenchmark.java
rename to user/test/com/google/gwt/user/benchmarks/DomEventBenchmark.java
index c335615..882f2f4 100644
--- a/user/test/com/google/gwt/user/client/ui/DomEventBenchmark.java
+++ b/user/test/com/google/gwt/user/benchmarks/DomEventBenchmark.java
@@ -13,13 +13,17 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package com.google.gwt.user.client.ui;
+package com.google.gwt.user.benchmarks;
 
 import com.google.gwt.benchmarks.client.Benchmark;
 import com.google.gwt.benchmarks.client.IntRange;
 import com.google.gwt.benchmarks.client.Operator;
 import com.google.gwt.benchmarks.client.RangeField;
 import com.google.gwt.benchmarks.client.Setup;
+import com.google.gwt.user.client.ui.ClickListener;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.SimpleCheckBox;
+import com.google.gwt.user.client.ui.Widget;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,7 +53,7 @@
 
   @Override
   public String getModuleName() {
-    return "com.google.gwt.user.User";
+    return "com.google.gwt.user.UserBenchmarks";
   }
 
   // Required for JUnit