opendev/gerrit
Code Issues Proposed changes

Fix GWT super dev mode

Browse Source 
* 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
This commit is contained in:
Dave Borowitz
2018-01-08 11:47:18 -05:00
parent e9820dc554
commit f3dfadd50b
6 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
java/com/google/gerrit/extensions/client/testing/BUILD
View File

@@ -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",
],
)

1
java/com/google/gerrit/extensions/common/testing/BUILD
View File

@@ -5,7 +5,6 @@ java_library(
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",

1
java/com/google/gerrit/extensions/common/testing/FixReplacementInfoSubject.java
View File

@@ -20,7 +20,6 @@ import com.google.common.truth.FailureMetadata;
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

2
java/com/google/gerrit/extensions/client/testing/RangeSubject.java → java/com/google/gerrit/extensions/common/testing/RangeSubject.java
View File

@@ -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;

2
javatests/com/google/gerrit/extensions/client/RangeTest.java
View File

@@ -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;

2
tools/eclipse/gerrit_gwt_debug.launch
View File

@@ -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>