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/TestJarIndexLoneClass.java | 62 +++++++++++----------- 1 file changed, 31 insertions(+), 31 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java index bd7b03a..65af6d8 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexLoneClass.java @@ -46,39 +46,39 @@ public class TestJarIndexLoneClass { public void obfEntries() { assertThat(m_index.getObfClassEntries(), containsInAnyOrder( newClass("cuchaz/enigma/inputs/Keep"), - newClass("none/a") + newClass("a") )); } @Test public void translationIndex() { - assertThat(m_index.getTranslationIndex().getSuperclass(new ClassEntry("none/a")), is(new ClassEntry("java/lang/Object"))); + assertThat(m_index.getTranslationIndex().getSuperclass(new ClassEntry("a")), is(new ClassEntry("java/lang/Object"))); assertThat(m_index.getTranslationIndex().getSuperclass(new ClassEntry("cuchaz/enigma/inputs/Keep")), is(new ClassEntry("java/lang/Object"))); - assertThat(m_index.getTranslationIndex().getAncestry(new ClassEntry("none/a")), contains(new ClassEntry("java/lang/Object"))); + assertThat(m_index.getTranslationIndex().getAncestry(new ClassEntry("a")), contains(new ClassEntry("java/lang/Object"))); assertThat(m_index.getTranslationIndex().getAncestry(new ClassEntry("cuchaz/enigma/inputs/Keep")), contains(new ClassEntry("java/lang/Object"))); - assertThat(m_index.getTranslationIndex().getSubclass(new ClassEntry("none/a")), is(empty())); + assertThat(m_index.getTranslationIndex().getSubclass(new ClassEntry("a")), is(empty())); assertThat(m_index.getTranslationIndex().getSubclass(new ClassEntry("cuchaz/enigma/inputs/Keep")), is(empty())); } @Test public void access() { - assertThat(m_index.getAccess(newField("none/a", "a", "Ljava/lang/String;")), is(Access.Private)); - assertThat(m_index.getAccess(newMethod("none/a", "a", "()Ljava/lang/String;")), is(Access.Public)); - assertThat(m_index.getAccess(newField("none/a", "b", "Ljava/lang/String;")), is(nullValue())); - assertThat(m_index.getAccess(newField("none/a", "a", "LFoo;")), is(nullValue())); + assertThat(m_index.getAccess(newField("a", "a", "Ljava/lang/String;")), is(Access.Private)); + assertThat(m_index.getAccess(newMethod("a", "a", "()Ljava/lang/String;")), is(Access.Public)); + assertThat(m_index.getAccess(newField("a", "b", "Ljava/lang/String;")), is(nullValue())); + assertThat(m_index.getAccess(newField("a", "a", "LFoo;")), is(nullValue())); } @Test public void classInheritance() { - ClassInheritanceTreeNode node = m_index.getClassInheritance(new Translator(), newClass("none/a")); + ClassInheritanceTreeNode node = m_index.getClassInheritance(new Translator(), newClass("a")); assertThat(node, is(not(nullValue()))); - assertThat(node.getObfClassName(), is("none/a")); + assertThat(node.getObfClassName(), is("a")); assertThat(node.getChildCount(), is(0)); } @Test public void methodInheritance() { - MethodEntry source = newMethod("none/a", "a", "()Ljava/lang/String;"); + MethodEntry source = newMethod("a", "a", "()Ljava/lang/String;"); MethodInheritanceTreeNode node = m_index.getMethodInheritance(new Translator(), source); assertThat(node, is(not(nullValue()))); assertThat(node.getMethodEntry(), is(source)); @@ -87,43 +87,43 @@ public class TestJarIndexLoneClass { @Test public void classImplementations() { - ClassImplementationsTreeNode node = m_index.getClassImplementations(new Translator(), newClass("none/a")); + ClassImplementationsTreeNode node = m_index.getClassImplementations(new Translator(), newClass("a")); assertThat(node, is(nullValue())); } @Test public void methodImplementations() { - MethodEntry source = newMethod("none/a", "a", "()Ljava/lang/String;"); + MethodEntry source = newMethod("a", "a", "()Ljava/lang/String;"); assertThat(m_index.getMethodImplementations(new Translator(), source), is(empty())); } @Test public void relatedMethodImplementations() { - Set entries = m_index.getRelatedMethodImplementations(newMethod("none/a", "a", "()Ljava/lang/String;")); + Set entries = m_index.getRelatedMethodImplementations(newMethod("a", "a", "()Ljava/lang/String;")); assertThat(entries, containsInAnyOrder( - newMethod("none/a", "a", "()Ljava/lang/String;") + newMethod("a", "a", "()Ljava/lang/String;") )); } @Test @SuppressWarnings("unchecked") public void fieldReferences() { - FieldEntry source = newField("none/a", "a", "Ljava/lang/String;"); + FieldEntry source = newField("a", "a", "Ljava/lang/String;"); Collection> references = m_index.getFieldReferences(source); assertThat(references, containsInAnyOrder( - newFieldReferenceByConstructor(source, "none/a", "(Ljava/lang/String;)V"), - newFieldReferenceByMethod(source, "none/a", "a", "()Ljava/lang/String;") + newFieldReferenceByConstructor(source, "a", "(Ljava/lang/String;)V"), + newFieldReferenceByMethod(source, "a", "a", "()Ljava/lang/String;") )); } @Test public void behaviorReferences() { - assertThat(m_index.getBehaviorReferences(newMethod("none/a", "a", "()Ljava/lang/String;")), is(empty())); + assertThat(m_index.getBehaviorReferences(newMethod("a", "a", "()Ljava/lang/String;")), is(empty())); } @Test public void innerClasses() { - assertThat(m_index.getInnerClasses(newClass("none/a")), is(empty())); + assertThat(m_index.getInnerClasses(newClass("a")), is(empty())); } @Test @@ -133,32 +133,32 @@ public class TestJarIndexLoneClass { @Test public void isAnonymousClass() { - assertThat(m_index.isAnonymousClass(newClass("none/a")), is(false)); + assertThat(m_index.isAnonymousClass(newClass("a")), is(false)); } @Test public void interfaces() { - assertThat(m_index.getInterfaces("none/a"), is(empty())); + assertThat(m_index.getInterfaces("a"), is(empty())); } @Test public void implementingClasses() { - assertThat(m_index.getImplementingClasses("none/a"), is(empty())); + assertThat(m_index.getImplementingClasses("a"), is(empty())); } @Test public void isInterface() { - assertThat(m_index.isInterface("none/a"), is(false)); + assertThat(m_index.isInterface("a"), is(false)); } @Test public void testContains() { - assertThat(m_index.containsObfClass(newClass("none/a")), is(true)); - assertThat(m_index.containsObfClass(newClass("none/b")), is(false)); - assertThat(m_index.containsObfField(newField("none/a", "a", "Ljava/lang/String;")), is(true)); - assertThat(m_index.containsObfField(newField("none/a", "b", "Ljava/lang/String;")), is(false)); - assertThat(m_index.containsObfField(newField("none/a", "a", "LFoo;")), is(false)); - assertThat(m_index.containsObfBehavior(newMethod("none/a", "a", "()Ljava/lang/String;")), is(true)); - assertThat(m_index.containsObfBehavior(newMethod("none/a", "b", "()Ljava/lang/String;")), is(false)); + assertThat(m_index.containsObfClass(newClass("a")), is(true)); + assertThat(m_index.containsObfClass(newClass("b")), is(false)); + assertThat(m_index.containsObfField(newField("a", "a", "Ljava/lang/String;")), is(true)); + assertThat(m_index.containsObfField(newField("a", "b", "Ljava/lang/String;")), is(false)); + assertThat(m_index.containsObfField(newField("a", "a", "LFoo;")), is(false)); + assertThat(m_index.containsObfBehavior(newMethod("a", "a", "()Ljava/lang/String;")), is(true)); + assertThat(m_index.containsObfBehavior(newMethod("a", "b", "()Ljava/lang/String;")), is(false)); } } -- cgit v1.2.3