Fix GWT super dev mode * Pass /java as src directory. * Move RangeSubject out of extensions.client.testing package. Extensions.gwt.xml includes the whole client directory, including this class. However, this class imports Truth code, which is not available in GWT. Move it to a directory that does not require GWT. Change-Id: I166b2e550813dc2b52e8fab1453c411f3374ed87

diff --git a/java/com/google/gerrit/extensions/client/testing/BUILD b/java/com/google/gerrit/extensions/client/testing/BUILD
deleted file mode 100644
index 3d09fe8..0000000
--- a/java/com/google/gerrit/extensions/client/testing/BUILD
+++ /dev/null

@@ -1,11 +0,0 @@
-java_library(
-    name = "client-test-util",
-    testonly = 1,
-    srcs = glob(["**/*.java"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/truth",
-        "//lib:truth",
-    ],
-)

diff --git a/java/com/google/gerrit/extensions/common/testing/BUILD b/java/com/google/gerrit/extensions/common/testing/BUILD
index 54d44c6..82dd425 100644
--- a/java/com/google/gerrit/extensions/common/testing/BUILD
+++ b/java/com/google/gerrit/extensions/common/testing/BUILD

@@ -5,7 +5,6 @@
     visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/extensions/client/testing:client-test-util",
         "//java/com/google/gerrit/truth",
         "//lib:truth",
         "//lib/jgit/org.eclipse.jgit:jgit",

diff --git a/java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java b/java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java
index cfc2ea0..b56d399 100644
--- a/java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java

@@ -20,7 +20,6 @@
 import com.google.common.truth.StringSubject;
 import com.google.common.truth.Subject;
 import com.google.common.truth.Truth;
-import com.google.gerrit.extensions.client.testing.RangeSubject;
 import com.google.gerrit.extensions.common.FixReplacementInfo;
 
 public class FixReplacementInfoSubject

diff --git a/java/com/google/gerrit/extensions/client/testing/RangeSubject.java b/java/com/google/gerrit/extensions/common/testing/RangeSubject.java
similarity index 97%
rename from java/com/google/gerrit/extensions/client/testing/RangeSubject.java
rename to java/com/google/gerrit/extensions/common/testing/RangeSubject.java
index df92529..b478a7e 100644
--- a/java/com/google/gerrit/extensions/client/testing/RangeSubject.java
+++ b/java/com/google/gerrit/extensions/common/testing/RangeSubject.java

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package com.google.gerrit.extensions.client.testing;
+package com.google.gerrit.extensions.common.testing;
 
 import static com.google.common.truth.Truth.assertAbout;
 

diff --git a/javatests/com/google/gerrit/extensions/client/RangeTest.java b/javatests/com/google/gerrit/extensions/client/RangeTest.java
index ebffc7c..b8938aa 100644
--- a/javatests/com/google/gerrit/extensions/client/RangeTest.java
+++ b/javatests/com/google/gerrit/extensions/client/RangeTest.java

@@ -14,7 +14,7 @@
 
 package com.google.gerrit.extensions.client;
 
-import static com.google.gerrit.extensions.client.testing.RangeSubject.assertThat;
+import static com.google.gerrit.extensions.common.testing.RangeSubject.assertThat;
 
 import org.junit.Test;
 

diff --git a/tools/eclipse/gerrit_gwt_debug.launch b/tools/eclipse/gerrit_gwt_debug.launch
index 9f2bf2b..593837a 100644
--- a/tools/eclipse/gerrit_gwt_debug.launch
+++ b/tools/eclipse/gerrit_gwt_debug.launch

@@ -16,7 +16,7 @@
 </listAttribute>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gerrit.gwtdebug.GerritGwtDebugLauncher"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-strict -noprecompile -src ${resource_loc:/gerrit} -workDir ${resource_loc:/gerrit}/.gwt_work_dir com.google.gerrit.GerritGwtUI -src ${resource_loc:/gerrit}/gerrit-plugin-gwtui/src/main/java -- --console-log --show-stack-trace -d ${resource_loc:/gerrit}/../gerrit_testsite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-strict -noprecompile -src ${resource_loc:/gerrit}/java -workDir ${resource_loc:/gerrit}/.gwt_work_dir com.google.gerrit.GerritGwtUI -src ${resource_loc:/gerrit}/gerrit-plugin-gwtui/src/main/java -- --console-log --show-stack-trace -d ${resource_loc:/gerrit}/../gerrit_testsite"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="gerrit"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#10;-XX:MaxPermSize=256M&#10;-Dgerrit.disable-gwtui-recompile=true"/>
 </launchConfiguration>