From b4aaff683d78ab92b83f3a7257c33b8e27d1affa Mon Sep 17 00:00:00 2001 From: Thog Date: Tue, 7 Mar 2017 21:24:39 +0100 Subject: Drop unix case style and implement hashCode when equals is overrided Also update Guava to version 21 --- .../enigma/TestJarIndexConstructorReferences.java | 75 +++++++++++----------- 1 file changed, 38 insertions(+), 37 deletions(-) (limited to 'src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java') diff --git a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java index cb65cd0..01d4bab 100644 --- a/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java +++ b/src/test/java/cuchaz/enigma/TestJarIndexConstructorReferences.java @@ -27,98 +27,99 @@ import cuchaz.enigma.mapping.ClassEntry; public class TestJarIndexConstructorReferences { - private JarIndex m_index; + private JarIndex index; - private ClassEntry m_baseClass = newClass("a"); - private ClassEntry m_subClass = newClass("d"); - private ClassEntry m_subsubClass = newClass("e"); - private ClassEntry m_defaultClass = newClass("c"); - private ClassEntry m_callerClass = newClass("b"); + private ClassEntry baseClass = newClass("a"); + private ClassEntry subClass = newClass("d"); + private ClassEntry subsubClass = newClass("e"); + private ClassEntry defaultClass = newClass("c"); + private ClassEntry callerClass = newClass("b"); public TestJarIndexConstructorReferences() throws Exception { File jarFile = new File("build/test-obf/constructors.jar"); - m_index = new JarIndex(); - m_index.indexJar(new JarFile(jarFile), false); + index = new JarIndex(); + index.indexJar(new JarFile(jarFile), false); } @Test public void obfEntries() { - assertThat(m_index.getObfClassEntries(), containsInAnyOrder(newClass("cuchaz/enigma/inputs/Keep"), m_baseClass, m_subClass, m_subsubClass, m_defaultClass, m_callerClass)); + assertThat(index.getObfClassEntries(), containsInAnyOrder(newClass("cuchaz/enigma/inputs/Keep"), baseClass, + subClass, subsubClass, defaultClass, callerClass)); } @Test @SuppressWarnings("unchecked") public void baseDefault() { - BehaviorEntry source = newConstructor(m_baseClass, "()V"); - Collection> references = m_index.getBehaviorReferences(source); + BehaviorEntry source = newConstructor(baseClass, "()V"); + Collection> references = index.getBehaviorReferences(source); assertThat(references, containsInAnyOrder( - newBehaviorReferenceByMethod(source, m_callerClass.getName(), "a", "()V"), - newBehaviorReferenceByConstructor(source, m_subClass.getName(), "()V"), - newBehaviorReferenceByConstructor(source, m_subClass.getName(), "(III)V") + newBehaviorReferenceByMethod(source, callerClass.getName(), "a", "()V"), + newBehaviorReferenceByConstructor(source, subClass.getName(), "()V"), + newBehaviorReferenceByConstructor(source, subClass.getName(), "(III)V") )); } @Test @SuppressWarnings("unchecked") public void baseInt() { - BehaviorEntry source = newConstructor(m_baseClass, "(I)V"); - assertThat(m_index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, m_callerClass.getName(), "b", "()V") + BehaviorEntry source = newConstructor(baseClass, "(I)V"); + assertThat(index.getBehaviorReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "b", "()V") )); } @Test @SuppressWarnings("unchecked") public void subDefault() { - BehaviorEntry source = newConstructor(m_subClass, "()V"); - assertThat(m_index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, m_callerClass.getName(), "c", "()V"), - newBehaviorReferenceByConstructor(source, m_subClass.getName(), "(I)V") + BehaviorEntry source = newConstructor(subClass, "()V"); + assertThat(index.getBehaviorReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "c", "()V"), + newBehaviorReferenceByConstructor(source, subClass.getName(), "(I)V") )); } @Test @SuppressWarnings("unchecked") public void subInt() { - BehaviorEntry source = newConstructor(m_subClass, "(I)V"); - assertThat(m_index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, m_callerClass.getName(), "d", "()V"), - newBehaviorReferenceByConstructor(source, m_subClass.getName(), "(II)V"), - newBehaviorReferenceByConstructor(source, m_subsubClass.getName(), "(I)V") + BehaviorEntry source = newConstructor(subClass, "(I)V"); + assertThat(index.getBehaviorReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "d", "()V"), + newBehaviorReferenceByConstructor(source, subClass.getName(), "(II)V"), + newBehaviorReferenceByConstructor(source, subsubClass.getName(), "(I)V") )); } @Test @SuppressWarnings("unchecked") public void subIntInt() { - BehaviorEntry source = newConstructor(m_subClass, "(II)V"); - assertThat(m_index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, m_callerClass.getName(), "e", "()V") + BehaviorEntry source = newConstructor(subClass, "(II)V"); + assertThat(index.getBehaviorReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "e", "()V") )); } @Test public void subIntIntInt() { - BehaviorEntry source = newConstructor(m_subClass, "(III)V"); - assertThat(m_index.getBehaviorReferences(source), is(empty())); + BehaviorEntry source = newConstructor(subClass, "(III)V"); + assertThat(index.getBehaviorReferences(source), is(empty())); } @Test @SuppressWarnings("unchecked") public void subsubInt() { - BehaviorEntry source = newConstructor(m_subsubClass, "(I)V"); - assertThat(m_index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, m_callerClass.getName(), "f", "()V") + BehaviorEntry source = newConstructor(subsubClass, "(I)V"); + assertThat(index.getBehaviorReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "f", "()V") )); } @Test @SuppressWarnings("unchecked") public void defaultConstructable() { - BehaviorEntry source = newConstructor(m_defaultClass, "()V"); - assertThat(m_index.getBehaviorReferences(source), containsInAnyOrder( - newBehaviorReferenceByMethod(source, m_callerClass.getName(), "g", "()V") + BehaviorEntry source = newConstructor(defaultClass, "()V"); + assertThat(index.getBehaviorReferences(source), containsInAnyOrder( + newBehaviorReferenceByMethod(source, callerClass.getName(), "g", "()V") )); } } -- cgit v1.2.3