Remove additional unnecessary casts of lambda expressions

This commit is contained in:
Ben Liblit 2017-11-27 14:58:17 -06:00
parent 5bc0e11e90
commit 456b0e45c3
2 changed files with 10 additions and 11 deletions

View File

@ -82,7 +82,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testTwoClasses() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
final String typeStr = singleInputForTest();
final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
@ -137,7 +137,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testInheritance1() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
final String typeStr = "Derived";
final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
@ -189,7 +189,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testArrayLiteral1() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
MethodReference mref = descriptorToMethodRef("Source#ArrayLiteral1#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
@ -202,7 +202,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testArrayLiteral2() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
MethodReference mref = descriptorToMethodRef("Source#ArrayLiteral2#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
@ -256,7 +256,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testQualifiedStatic() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
MethodReference mref = descriptorToMethodRef("Source#QualifiedStatic#main#([Ljava/lang/String;)V", cg.getClassHierarchy());
@ -274,7 +274,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testStaticNesting() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
final String typeStr = singleInputForTest() + "$WhatsIt";
final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());
@ -301,7 +301,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testInnerClass() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
final String typeStr = singleInputForTest();
final TypeReference type = findOrCreateTypeReference("Source", typeStr + "$WhatsIt", cg.getClassHierarchy());
@ -412,7 +412,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testLocalClass() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
final String typeStr = singleInputForTest();
final String localClassStr = "Foo";
@ -445,7 +445,7 @@ public abstract class JavaIRTests extends IRTests {
@Test public void testAnonymousClass() throws IllegalArgumentException, CancelException, IOException {
runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList(
(IRAssertion) cg -> {
cg -> {
final String typeStr = singleInputForTest();
final TypeReference type = findOrCreateTypeReference("Source", typeStr, cg.getClassHierarchy());

View File

@ -4,7 +4,6 @@ import static com.ibm.wala.properties.WalaProperties.ANDROID_RT_DEX_DIR;
import static com.ibm.wala.properties.WalaProperties.ANDROID_RT_JAVA_JAR;
import java.io.File;
import java.io.FileFilter;
import java.io.IOException;
import java.net.URI;
import java.util.ArrayList;
@ -85,7 +84,7 @@ public class Util {
}
} else {
assert "Dalvik".equals(System.getProperty("java.vm.name"));
for(File f : new File("/system/framework/").listFiles((FileFilter) pathname -> {
for(File f : new File("/system/framework/").listFiles(pathname -> {
String name = pathname.getName();
return
(name.startsWith("core") || name.startsWith("framework")) &&