fixed tests

soot-oss · Nov 23, 2023 · dcc2ac5 · dcc2ac5
1 parent 272762b
commit dcc2ac5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/sootup.core/src/main/java/sootup/core/model/SootMethod.java b/sootup.core/src/main/java/sootup/core/model/SootMethod.java
@@ -210,9 +210,7 @@ public boolean isSynchronized() {
 
   /** @return yes if this is the main method */
   public boolean isMain(@Nonnull IdentifierFactory idf) {
-    return isPublic()
-        && isStatic()
-        && idf.isConstructorSubSignature(getSignature().getSubSignature());
+    return isPublic() && isStatic() && idf.isMainSubSignature(getSignature().getSubSignature());
   }
 
   /** We rely on the JDK class recognition to decide if a method is JDK method. */

diff --git a/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java b/sootup.java.bytecode/src/test/java/sootup/java/bytecode/frontend/AsmMethodSourceTest.java
@@ -1,10 +1,10 @@
 package sootup.java.bytecode.frontend;
 
+import static junit.framework.Assert.assertTrue;
 import static junit.framework.TestCase.fail;
 
 import categories.Java8Test;
 import java.util.Arrays;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import sootup.core.model.SootClass;
@@ -21,7 +21,6 @@
 public class AsmMethodSourceTest {
 
   @Test
-  @Ignore("FIXME")
   public void testFix_StackUnderrun_convertPutFieldInsn_init() {
 
     double version = Double.parseDouble(System.getProperty("java.specification.version"));
@@ -36,17 +35,18 @@ public void testFix_StackUnderrun_convertPutFieldInsn_init() {
 
     JavaView view = javaProject.createView();
 
+    final JavaIdentifierFactory idf = JavaIdentifierFactory.getInstance();
     JavaClassType mainClassSignature =
-        JavaIdentifierFactory.getInstance()
-            .getClassType("javax.management.NotificationBroadcasterSupport");
+        idf.getClassType("javax.management.NotificationBroadcasterSupport");
     MethodSignature mainMethodSignature =
-        JavaIdentifierFactory.getInstance()
-            .getMethodSignature(
-                mainClassSignature,
-                "<init>",
-                "void",
-                Arrays.asList(
-                    "java.util.concurrent.Executor", "javax.management.MBeanNotificationInfo[]"));
+        idf.getMethodSignature(
+            mainClassSignature,
+            "<init>",
+            "void",
+            Arrays.asList(
+                "java.util.concurrent.Executor", "javax.management.MBeanNotificationInfo[]"));
+
+    assertTrue(idf.isConstructorSubSignature(mainMethodSignature.getSubSignature()));
 
     final SootClass<?> abstractClass = view.getClass(mainClassSignature).get();
 

diff --git a/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java b/sootup.java.core/src/main/java/sootup/java/core/views/JavaModuleView.java
@@ -31,7 +31,6 @@
 import sootup.core.cache.FullCache;
 import sootup.core.cache.provider.FullCacheProvider;
 import sootup.core.frontend.AbstractClassSource;
-import sootup.core.frontend.ResolveException;
 import sootup.core.inputlocation.AnalysisInputLocation;
 import sootup.core.inputlocation.ClassLoadingOptions;
 import sootup.core.inputlocation.EmptyClassLoadingOptions;
@@ -118,7 +117,7 @@ private boolean isPackageVisibleToModule(
 
     Optional<JavaModuleInfo> moduleInfoOpt = getModuleInfo(packageName.getModuleSignature());
     if (!moduleInfoOpt.isPresent()) {
-      throw new ResolveException("ModuleDescriptor not available.");
+      throw new IllegalStateException("ModuleDescriptor not available.");
     }
     JavaModuleInfo moduleInfo = moduleInfoOpt.get();