diff --git a/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/JsConstructorClass.java b/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/JsConstructorClass.java index 2aa620037f..dee04e5c93 100644 --- a/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/JsConstructorClass.java +++ b/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/JsConstructorClass.java @@ -54,9 +54,7 @@ public B(int x, int y) { } } - /** - * A regular class (no JsConstructor), which extends a JsConstructor class. - */ + /** A class with JsConstructor, which extends a JsConstructor class. */ public static class C extends B { public int fC = 1; @@ -71,48 +69,4 @@ public C(int x, int y) { this.fC += 7; } } - - /** - * A class with JsConstructor, which extends a JsConstructor class. - */ - public static class D extends B { - public int fD = 8; - - @JsConstructor - public D() { - super(9); // must call super(int), cannot call super(). - this.fD += 10; - } - - public D(int x) { - this(); // must call this(). - this.fD += x; - } - } - - /** - * A regular class (no JsConstructor), which extends a subclass of a JsConstructor class. - */ - public static class E extends C { - public int fE = 11; - - @JsConstructor - public E() { - super(10); // must call super(int), cannot call super(int, int). - this.fE += 12; - } - } - - /** - * A JsConstructor class, which extends a subclass of a JsConstructor class. - */ - public static class F extends C { - public int fF = 13; - - @JsConstructor - public F(int x) { - super(x + 2); // must call super(int), cannot call super(int, int). - this.fF += x + 3; - } - } } diff --git a/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/Main.java b/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/Main.java index 4f1ad6acf3..4e2030ef24 100644 --- a/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/Main.java +++ b/transpiler/javatests/com/google/j2cl/integration/java/jsconstructor/Main.java @@ -20,9 +20,6 @@ import jsconstructor.JsConstructorClass.A; import jsconstructor.JsConstructorClass.B; import jsconstructor.JsConstructorClass.C; -import jsconstructor.JsConstructorClass.D; -import jsconstructor.JsConstructorClass.E; -import jsconstructor.JsConstructorClass.F; public class Main { public static void main(String... args) { @@ -47,24 +44,6 @@ public static void main(String... args) { assertEquals(61, c2.fA); assertEquals(5, c2.fB); assertEquals(14, c2.fC); - D d1 = new D(); - assertEquals(10, d1.fA); - assertEquals(5, d1.fB); - assertEquals(18, d1.fD); - D d2 = new D(11); - assertEquals(10, d2.fA); - assertEquals(5, d2.fB); - assertEquals(29, d2.fD); - E e = new E(); - assertEquals(21, e.fA); - assertEquals(5, e.fB); - assertEquals(7, e.fC); - assertEquals(23, e.fE); - F f = new F(12); - assertEquals(29, f.fA); - assertEquals(5, f.fB); - assertEquals(7, f.fC); - assertEquals(28, f.fF); InstanceInitOrder.test(); StaticInitOrder.test();