From b30404f156adb6e01bfe4edc50b4de4245ba4509 Mon Sep 17 00:00:00 2001 From: Jonas Herzig Date: Fri, 12 Nov 2021 11:58:05 +0100 Subject: Separate B from A test files So we are closer to a realistic setup and can tell when we accidentally look up a class in the wrong project. Also allows us to have changes in a class but not to the class or its package (i.e. same file). --- src/test/java/a/pkg/A.java | 104 ----------------------------------- src/test/java/a/pkg/AInterface.java | 5 -- src/test/java/a/pkg/AParent.java | 7 --- src/test/java/b/pkg/B.java | 104 ----------------------------------- src/test/java/b/pkg/BInterface.java | 5 -- src/test/java/b/pkg/BParent.java | 7 --- src/testA/java/a/pkg/A.java | 104 +++++++++++++++++++++++++++++++++++ src/testA/java/a/pkg/AInterface.java | 5 ++ src/testA/java/a/pkg/AParent.java | 7 +++ src/testB/java/b/pkg/B.java | 104 +++++++++++++++++++++++++++++++++++ src/testB/java/b/pkg/BInterface.java | 5 ++ src/testB/java/b/pkg/BParent.java | 7 +++ 12 files changed, 232 insertions(+), 232 deletions(-) delete mode 100644 src/test/java/a/pkg/A.java delete mode 100644 src/test/java/a/pkg/AInterface.java delete mode 100644 src/test/java/a/pkg/AParent.java delete mode 100644 src/test/java/b/pkg/B.java delete mode 100644 src/test/java/b/pkg/BInterface.java delete mode 100644 src/test/java/b/pkg/BParent.java create mode 100644 src/testA/java/a/pkg/A.java create mode 100644 src/testA/java/a/pkg/AInterface.java create mode 100644 src/testA/java/a/pkg/AParent.java create mode 100644 src/testB/java/b/pkg/B.java create mode 100644 src/testB/java/b/pkg/BInterface.java create mode 100644 src/testB/java/b/pkg/BParent.java (limited to 'src') diff --git a/src/test/java/a/pkg/A.java b/src/test/java/a/pkg/A.java deleted file mode 100644 index f4a30ef..0000000 --- a/src/test/java/a/pkg/A.java +++ /dev/null @@ -1,104 +0,0 @@ -package a.pkg; - -public class A extends AParent implements AInterface { - private A a; - private int aField; - - public A() { - } - - public A(A arg) { - } - - public static A create() { return new A(); } - - public void aMethod() { - aInterfaceMethod(); - } - - public A getA() { - return this; - } - - public A getSyntheticA() { - return this; - } - - public void setSyntheticA(A arg) { - } - - public boolean isSyntheticBooleanA() { - return false; - } - - public void setSyntheticBooleanA(boolean arg) { - } - - public A getNonSyntheticA() { - return this; - } - - public void setNonSyntheticA(A arg) { - } - - public boolean isNonSyntheticBooleanA() { - return false; - } - - public void setNonSyntheticBooleanA(boolean arg) { - } - - public A getterA() { - return this; - } - - public void setterA(A arg) { - } - - public boolean getterBooleanA() { - return false; - } - - public void setterBooleanA(boolean arg) { - } - - public int conflictingField; - public int getConflictingFieldWithoutConflict() { - return conflictingField; - } - - public void aOverloaded() { - } - - public void aOverloaded(int arg) { - } - - public void aOverloaded(boolean arg) { - } - - public void commonOverloaded(Object arg) { - } - - public void commonOverloaded(A arg) { - } - - public void unmappedOverloaded(Object arg) { - } - - public void unmappedOverloaded(A arg) { - } - - @Override - public void aInterfaceMethod() { - new A() {}; - } - - public class Inner { - private int aField; - } - - public class InnerA { - } - - public class GenericA {} -} diff --git a/src/test/java/a/pkg/AInterface.java b/src/test/java/a/pkg/AInterface.java deleted file mode 100644 index 8786c94..0000000 --- a/src/test/java/a/pkg/AInterface.java +++ /dev/null @@ -1,5 +0,0 @@ -package a.pkg; - -public interface AInterface { - void aInterfaceMethod(); -} diff --git a/src/test/java/a/pkg/AParent.java b/src/test/java/a/pkg/AParent.java deleted file mode 100644 index ac0ea7c..0000000 --- a/src/test/java/a/pkg/AParent.java +++ /dev/null @@ -1,7 +0,0 @@ -package a.pkg; - -public class AParent { - public AParent aParentMethod() { - return this; - } -} diff --git a/src/test/java/b/pkg/B.java b/src/test/java/b/pkg/B.java deleted file mode 100644 index 150ab0b..0000000 --- a/src/test/java/b/pkg/B.java +++ /dev/null @@ -1,104 +0,0 @@ -package b.pkg; - -public class B extends BParent implements BInterface { - private B b; - private int bField; - - public B() { - } - - public B(B arg) { - } - - public static B create() { return new B(); } - - public void bMethod() { - bInterfaceMethod(); - } - - public B getB() { - return this; - } - - public B getSyntheticB() { - return this; - } - - public void setSyntheticB(B arg) { - } - - public boolean isSyntheticBooleanB() { - return false; - } - - public void setSyntheticBooleanB(boolean arg) { - } - - public B getNonSyntheticB() { - return this; - } - - public void setNonSyntheticB(B arg) { - } - - public boolean isNonSyntheticBooleanB() { - return false; - } - - public void setNonSyntheticBooleanB(boolean arg) { - } - - public B getterB() { - return this; - } - - public void setterB(B arg) { - } - - public boolean getterBooleanB() { - return false; - } - - public void setterBooleanB(boolean arg) { - } - - public int conflictingField; - public int getConflictingField() { - return conflictingField; - } - - public void bOverloaded() { - } - - public void bOverloaded(int arg) { - } - - public void bOverloaded(boolean arg) { - } - - public void commonOverloaded(Object arg) { - } - - public void commonOverloaded(B arg) { - } - - public void unmappedOverloaded(Object arg) { - } - - public void unmappedOverloaded(B arg) { - } - - @Override - public void bInterfaceMethod() { - new B() {}; - } - - public class Inner { - private int bField; - } - - public class InnerB { - } - - public class GenericB {} -} diff --git a/src/test/java/b/pkg/BInterface.java b/src/test/java/b/pkg/BInterface.java deleted file mode 100644 index c57c72f..0000000 --- a/src/test/java/b/pkg/BInterface.java +++ /dev/null @@ -1,5 +0,0 @@ -package b.pkg; - -public interface BInterface { - void bInterfaceMethod(); -} diff --git a/src/test/java/b/pkg/BParent.java b/src/test/java/b/pkg/BParent.java deleted file mode 100644 index d4b20fa..0000000 --- a/src/test/java/b/pkg/BParent.java +++ /dev/null @@ -1,7 +0,0 @@ -package b.pkg; - -public class BParent { - public BParent bParentMethod() { - return this; - } -} diff --git a/src/testA/java/a/pkg/A.java b/src/testA/java/a/pkg/A.java new file mode 100644 index 0000000..f4a30ef --- /dev/null +++ b/src/testA/java/a/pkg/A.java @@ -0,0 +1,104 @@ +package a.pkg; + +public class A extends AParent implements AInterface { + private A a; + private int aField; + + public A() { + } + + public A(A arg) { + } + + public static A create() { return new A(); } + + public void aMethod() { + aInterfaceMethod(); + } + + public A getA() { + return this; + } + + public A getSyntheticA() { + return this; + } + + public void setSyntheticA(A arg) { + } + + public boolean isSyntheticBooleanA() { + return false; + } + + public void setSyntheticBooleanA(boolean arg) { + } + + public A getNonSyntheticA() { + return this; + } + + public void setNonSyntheticA(A arg) { + } + + public boolean isNonSyntheticBooleanA() { + return false; + } + + public void setNonSyntheticBooleanA(boolean arg) { + } + + public A getterA() { + return this; + } + + public void setterA(A arg) { + } + + public boolean getterBooleanA() { + return false; + } + + public void setterBooleanA(boolean arg) { + } + + public int conflictingField; + public int getConflictingFieldWithoutConflict() { + return conflictingField; + } + + public void aOverloaded() { + } + + public void aOverloaded(int arg) { + } + + public void aOverloaded(boolean arg) { + } + + public void commonOverloaded(Object arg) { + } + + public void commonOverloaded(A arg) { + } + + public void unmappedOverloaded(Object arg) { + } + + public void unmappedOverloaded(A arg) { + } + + @Override + public void aInterfaceMethod() { + new A() {}; + } + + public class Inner { + private int aField; + } + + public class InnerA { + } + + public class GenericA {} +} diff --git a/src/testA/java/a/pkg/AInterface.java b/src/testA/java/a/pkg/AInterface.java new file mode 100644 index 0000000..8786c94 --- /dev/null +++ b/src/testA/java/a/pkg/AInterface.java @@ -0,0 +1,5 @@ +package a.pkg; + +public interface AInterface { + void aInterfaceMethod(); +} diff --git a/src/testA/java/a/pkg/AParent.java b/src/testA/java/a/pkg/AParent.java new file mode 100644 index 0000000..ac0ea7c --- /dev/null +++ b/src/testA/java/a/pkg/AParent.java @@ -0,0 +1,7 @@ +package a.pkg; + +public class AParent { + public AParent aParentMethod() { + return this; + } +} diff --git a/src/testB/java/b/pkg/B.java b/src/testB/java/b/pkg/B.java new file mode 100644 index 0000000..150ab0b --- /dev/null +++ b/src/testB/java/b/pkg/B.java @@ -0,0 +1,104 @@ +package b.pkg; + +public class B extends BParent implements BInterface { + private B b; + private int bField; + + public B() { + } + + public B(B arg) { + } + + public static B create() { return new B(); } + + public void bMethod() { + bInterfaceMethod(); + } + + public B getB() { + return this; + } + + public B getSyntheticB() { + return this; + } + + public void setSyntheticB(B arg) { + } + + public boolean isSyntheticBooleanB() { + return false; + } + + public void setSyntheticBooleanB(boolean arg) { + } + + public B getNonSyntheticB() { + return this; + } + + public void setNonSyntheticB(B arg) { + } + + public boolean isNonSyntheticBooleanB() { + return false; + } + + public void setNonSyntheticBooleanB(boolean arg) { + } + + public B getterB() { + return this; + } + + public void setterB(B arg) { + } + + public boolean getterBooleanB() { + return false; + } + + public void setterBooleanB(boolean arg) { + } + + public int conflictingField; + public int getConflictingField() { + return conflictingField; + } + + public void bOverloaded() { + } + + public void bOverloaded(int arg) { + } + + public void bOverloaded(boolean arg) { + } + + public void commonOverloaded(Object arg) { + } + + public void commonOverloaded(B arg) { + } + + public void unmappedOverloaded(Object arg) { + } + + public void unmappedOverloaded(B arg) { + } + + @Override + public void bInterfaceMethod() { + new B() {}; + } + + public class Inner { + private int bField; + } + + public class InnerB { + } + + public class GenericB {} +} diff --git a/src/testB/java/b/pkg/BInterface.java b/src/testB/java/b/pkg/BInterface.java new file mode 100644 index 0000000..c57c72f --- /dev/null +++ b/src/testB/java/b/pkg/BInterface.java @@ -0,0 +1,5 @@ +package b.pkg; + +public interface BInterface { + void bInterfaceMethod(); +} diff --git a/src/testB/java/b/pkg/BParent.java b/src/testB/java/b/pkg/BParent.java new file mode 100644 index 0000000..d4b20fa --- /dev/null +++ b/src/testB/java/b/pkg/BParent.java @@ -0,0 +1,7 @@ +package b.pkg; + +public class BParent { + public BParent bParentMethod() { + return this; + } +} -- cgit