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
This commit is contained in:
@@ -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",
|
|
||||||
],
|
|
||||||
)
|
|
@@ -5,7 +5,6 @@ java_library(
|
|||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
"//java/com/google/gerrit/extensions/client/testing:client-test-util",
|
|
||||||
"//java/com/google/gerrit/truth",
|
"//java/com/google/gerrit/truth",
|
||||||
"//lib:truth",
|
"//lib:truth",
|
||||||
"//lib/jgit/org.eclipse.jgit:jgit",
|
"//lib/jgit/org.eclipse.jgit:jgit",
|
||||||
|
@@ -20,7 +20,6 @@ import com.google.common.truth.FailureMetadata;
|
|||||||
import com.google.common.truth.StringSubject;
|
import com.google.common.truth.StringSubject;
|
||||||
import com.google.common.truth.Subject;
|
import com.google.common.truth.Subject;
|
||||||
import com.google.common.truth.Truth;
|
import com.google.common.truth.Truth;
|
||||||
import com.google.gerrit.extensions.client.testing.RangeSubject;
|
|
||||||
import com.google.gerrit.extensions.common.FixReplacementInfo;
|
import com.google.gerrit.extensions.common.FixReplacementInfo;
|
||||||
|
|
||||||
public class FixReplacementInfoSubject
|
public class FixReplacementInfoSubject
|
||||||
|
@@ -12,7 +12,7 @@
|
|||||||
// See the License for the specific language governing permissions and
|
// See the License for the specific language governing permissions and
|
||||||
// limitations under the License.
|
// 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;
|
import static com.google.common.truth.Truth.assertAbout;
|
||||||
|
|
@@ -14,7 +14,7 @@
|
|||||||
|
|
||||||
package com.google.gerrit.extensions.client;
|
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;
|
import org.junit.Test;
|
||||||
|
|
||||||
|
@@ -16,7 +16,7 @@
|
|||||||
</listAttribute>
|
</listAttribute>
|
||||||
<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
|
<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.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.PROJECT_ATTR" value="gerrit"/>
|
||||||
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256M -Dgerrit.disable-gwtui-recompile=true"/>
|
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256M -Dgerrit.disable-gwtui-recompile=true"/>
|
||||||
</launchConfiguration>
|
</launchConfiguration>
|
||||||
|
Reference in New Issue
Block a user