jessikitty/jadx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

gui: fix some sonar warnings

Browse Source
This commit is contained in:
Skylot
2018-02-18 10:33:31 +03:00
parent 6fb1c8d3b9
commit c25f918cc5
17 changed files with 132 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jadx-gui/src/test/java/jadx/gui/treemodel/JSourcesTest.java
+30 -29
View File
@@ -1,6 +1,6 @@
package jadx.gui.treemodel;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import org.junit.Before;
@@ -12,10 +12,12 @@ import jadx.api.JadxDecompiler;
import jadx.api.JavaClass;
import jadx.api.JavaPackage;
import jadx.core.dex.nodes.ClassNode;
import jadx.core.utils.exceptions.JadxException;
import jadx.gui.JadxWrapper;
import static org.junit.Assert.assertEquals;
import static java.util.Arrays.asList;
import static org.hamcrest.Matchers.hasSize;
import static org.hamcrest.Matchers.is;
import static org.junit.Assert.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -25,7 +27,7 @@ public class JSourcesTest {
private JadxDecompiler decompiler;
@Before
public void init() throws JadxException {
public void init() {
JRoot root = mock(JRoot.class);
when(root.isFlatPackages()).thenReturn(false);
JadxWrapper wrapper = mock(JadxWrapper.class);
@@ -37,50 +39,50 @@ public class JSourcesTest {
public void testHierarchyPackages() {
String pkgName = "a.b.c.d.e";
List<JavaPackage> packages = Arrays.asList(newPkg(pkgName));
List<JavaPackage> packages = Collections.singletonList(newPkg(pkgName));
List<JPackage> out = sources.getHierarchyPackages(packages);
assertEquals(out.size(), 1);
JPackage jpkg = out.get(0);
assertEquals(jpkg.getName(), pkgName);
assertEquals(jpkg.getClasses().size(), 1);
assertThat(out, hasSize(1));
JPackage jPkg = out.get(0);
assertThat(jPkg.getName(), is(pkgName));
assertThat(jPkg.getClasses(), hasSize(1));
}
@Test
public void testHierarchyPackages2() {
List<JavaPackage> packages = Arrays.asList(
List<JavaPackage> packages = asList(
newPkg("a.b"),
newPkg("a.c"),
newPkg("a.d")
);
List<JPackage> out = sources.getHierarchyPackages(packages);
assertEquals(out.size(), 1);
JPackage jpkg = out.get(0);
assertEquals(jpkg.getName(), "a");
assertEquals(jpkg.getClasses().size(), 0);
assertEquals(jpkg.getInnerPackages().size(), 3);
assertThat(out, hasSize(1));
JPackage jPkg = out.get(0);
assertThat(jPkg.getName(), is("a"));
assertThat(jPkg.getClasses(), hasSize(0));
assertThat(jPkg.getInnerPackages(), hasSize(3));
}
@Test
public void testHierarchyPackages3() {
List<JavaPackage> packages = Arrays.asList(
List<JavaPackage> packages = asList(
newPkg("a.b.p1"),
newPkg("a.b.p2"),
newPkg("a.b.p3")
);
List<JPackage> out = sources.getHierarchyPackages(packages);
assertEquals(out.size(), 1);
JPackage jpkg = out.get(0);
assertEquals(jpkg.getName(), "a.b");
assertEquals(jpkg.getClasses().size(), 0);
assertEquals(jpkg.getInnerPackages().size(), 3);
assertThat(out, hasSize(1));
JPackage jPkg = out.get(0);
assertThat(jPkg.getName(), is("a.b"));
assertThat(jPkg.getClasses(), hasSize(0));
assertThat(jPkg.getInnerPackages(), hasSize(3));
}
@Test
public void testHierarchyPackages4() {
List<JavaPackage> packages = Arrays.asList(
List<JavaPackage> packages = asList(
newPkg("a.p1"),
newPkg("a.b.c.p2"),
newPkg("a.b.c.p3"),
@@ -89,19 +91,18 @@ public class JSourcesTest {
);
List<JPackage> out = sources.getHierarchyPackages(packages);
assertEquals(out.size(), 2);
assertEquals(out.get(0).getName(), "a");
assertEquals(out.get(0).getInnerPackages().size(), 2);
assertEquals(out.get(1).getName(), "d");
assertEquals(out.get(1).getInnerPackages().size(), 2);
assertThat(out, hasSize(2));
assertThat(out.get(0).getName(), is("a"));
assertThat(out.get(0).getInnerPackages(), hasSize(2));
assertThat(out.get(1).getName(), is("d"));
assertThat(out.get(1).getInnerPackages(), hasSize(2));
}
private JavaPackage newPkg(String name) {
return Factory.newPackage(name, Arrays.asList(newClass()));
return Factory.newPackage(name, Collections.singletonList(newClass()));
}
private JavaClass newClass() {
return Factory.newClass(decompiler, mock(ClassNode.class));
}
}