From eb93bc2cb083409c123463a20844f7e1ed58deab Mon Sep 17 00:00:00 2001 From: asiekierka Date: Tue, 18 Oct 2016 17:35:11 +0200 Subject: remove none/ prefix --- .../java/cuchaz/enigma/TestTokensConstructors.java | 54 +++++++++++----------- 1 file changed, 27 insertions(+), 27 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestTokensConstructors.java') diff --git a/src/test/java/cuchaz/enigma/TestTokensConstructors.java b/src/test/java/cuchaz/enigma/TestTokensConstructors.java index 66c6fd1..890a4fd 100644 --- a/src/test/java/cuchaz/enigma/TestTokensConstructors.java +++ b/src/test/java/cuchaz/enigma/TestTokensConstructors.java @@ -29,107 +29,107 @@ public class TestTokensConstructors extends TokenChecker { @Test public void baseDeclarations() { - assertThat(getDeclarationToken(newConstructor("none/a", "()V")), is("a")); - assertThat(getDeclarationToken(newConstructor("none/a", "(I)V")), is("a")); + assertThat(getDeclarationToken(newConstructor("a", "()V")), is("a")); + assertThat(getDeclarationToken(newConstructor("a", "(I)V")), is("a")); } @Test public void subDeclarations() { - assertThat(getDeclarationToken(newConstructor("none/d", "()V")), is("d")); - assertThat(getDeclarationToken(newConstructor("none/d", "(I)V")), is("d")); - assertThat(getDeclarationToken(newConstructor("none/d", "(II)V")), is("d")); - assertThat(getDeclarationToken(newConstructor("none/d", "(III)V")), is("d")); + assertThat(getDeclarationToken(newConstructor("d", "()V")), is("d")); + assertThat(getDeclarationToken(newConstructor("d", "(I)V")), is("d")); + assertThat(getDeclarationToken(newConstructor("d", "(II)V")), is("d")); + assertThat(getDeclarationToken(newConstructor("d", "(III)V")), is("d")); } @Test public void subsubDeclarations() { - assertThat(getDeclarationToken(newConstructor("none/e", "(I)V")), is("e")); + assertThat(getDeclarationToken(newConstructor("e", "(I)V")), is("e")); } @Test public void defaultDeclarations() { - assertThat(getDeclarationToken(newConstructor("none/c", "()V")), nullValue()); + assertThat(getDeclarationToken(newConstructor("c", "()V")), nullValue()); } @Test public void baseDefaultReferences() { - BehaviorEntry source = newConstructor("none/a", "()V"); + BehaviorEntry source = newConstructor("a", "()V"); assertThat( - getReferenceTokens(newBehaviorReferenceByMethod(source, "none/b", "a", "()V")), + getReferenceTokens(newBehaviorReferenceByMethod(source, "b", "a", "()V")), containsInAnyOrder("a") ); assertThat( - getReferenceTokens(newBehaviorReferenceByConstructor(source, "none/d", "()V")), + getReferenceTokens(newBehaviorReferenceByConstructor(source, "d", "()V")), is(empty()) // implicit call, not decompiled to token ); assertThat( - getReferenceTokens(newBehaviorReferenceByConstructor(source, "none/d", "(III)V")), + getReferenceTokens(newBehaviorReferenceByConstructor(source, "d", "(III)V")), is(empty()) // implicit call, not decompiled to token ); } @Test public void baseIntReferences() { - BehaviorEntry source = newConstructor("none/a", "(I)V"); + BehaviorEntry source = newConstructor("a", "(I)V"); assertThat( - getReferenceTokens(newBehaviorReferenceByMethod(source, "none/b", "b", "()V")), + getReferenceTokens(newBehaviorReferenceByMethod(source, "b", "b", "()V")), containsInAnyOrder("a") ); } @Test public void subDefaultReferences() { - BehaviorEntry source = newConstructor("none/d", "()V"); + BehaviorEntry source = newConstructor("d", "()V"); assertThat( - getReferenceTokens(newBehaviorReferenceByMethod(source, "none/b", "c", "()V")), + getReferenceTokens(newBehaviorReferenceByMethod(source, "b", "c", "()V")), containsInAnyOrder("d") ); assertThat( - getReferenceTokens(newBehaviorReferenceByConstructor(source, "none/d", "(I)V")), + getReferenceTokens(newBehaviorReferenceByConstructor(source, "d", "(I)V")), containsInAnyOrder("this") ); } @Test public void subIntReferences() { - BehaviorEntry source = newConstructor("none/d", "(I)V"); + BehaviorEntry source = newConstructor("d", "(I)V"); assertThat(getReferenceTokens( - newBehaviorReferenceByMethod(source, "none/b", "d", "()V")), + newBehaviorReferenceByMethod(source, "b", "d", "()V")), containsInAnyOrder("d") ); assertThat(getReferenceTokens( - newBehaviorReferenceByConstructor(source, "none/d", "(II)V")), + newBehaviorReferenceByConstructor(source, "d", "(II)V")), containsInAnyOrder("this") ); assertThat(getReferenceTokens( - newBehaviorReferenceByConstructor(source, "none/e", "(I)V")), + newBehaviorReferenceByConstructor(source, "e", "(I)V")), containsInAnyOrder("super") ); } @Test public void subIntIntReferences() { - BehaviorEntry source = newConstructor("none/d", "(II)V"); + BehaviorEntry source = newConstructor("d", "(II)V"); assertThat( - getReferenceTokens(newBehaviorReferenceByMethod(source, "none/b", "e", "()V")), + getReferenceTokens(newBehaviorReferenceByMethod(source, "b", "e", "()V")), containsInAnyOrder("d") ); } @Test public void subsubIntReferences() { - BehaviorEntry source = newConstructor("none/e", "(I)V"); + BehaviorEntry source = newConstructor("e", "(I)V"); assertThat( - getReferenceTokens(newBehaviorReferenceByMethod(source, "none/b", "f", "()V")), + getReferenceTokens(newBehaviorReferenceByMethod(source, "b", "f", "()V")), containsInAnyOrder("e") ); } @Test public void defaultConstructableReferences() { - BehaviorEntry source = newConstructor("none/c", "()V"); + BehaviorEntry source = newConstructor("c", "()V"); assertThat( - getReferenceTokens(newBehaviorReferenceByMethod(source, "none/b", "g", "()V")), + getReferenceTokens(newBehaviorReferenceByMethod(source, "b", "g", "()V")), containsInAnyOrder("c") ); } -- cgit v1.2.3