Merge pull request #611 from soot-oss/VisibleAnnotation

Store Visible Annotations

Author: kadirayk

shared-test-resources/miniTestSuite/java6/binary/InterfaceVisibleAnnotation.class

@@ -0,0 +1,19 @@
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Target;
+
+
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@interface InterfaceVisibleAnnotation {
+
+}
+
+@InterfaceVisibleAnnotation
+public class VisibleAnnotation{
+
+}
+
+

shared-test-resources/miniTestSuite/java6/binary/VisibleAnnotation.class

@@ -115,14 +115,20 @@ private static Stream<JavaAnnotationSootMethod> resolveMethods(
               MethodSignature methodSignature =
                   signatureFactory.getMethodSignature(cs, methodName, retType, sigTypes);
 
+              List<AnnotationNode> annotations = new ArrayList<>();
+              if (methodSource.visibleAnnotations != null)
+                annotations.addAll(methodSource.visibleAnnotations);
+              if (methodSource.invisibleAnnotations != null)
+                annotations.addAll(methodSource.invisibleAnnotations);
+
               // TODO: position/line numbers if possible
 
               return new JavaAnnotationSootMethod(
                   asmClassClassSourceContent,
                   methodSignature,
                   modifiers,
                   exceptions,
-                  convertAnnotation(methodSource.invisibleAnnotations),
+                  convertAnnotation(annotations),
                   NoPositionInformation.getInstance());
             });
   }

shared-test-resources/miniTestSuite/java6/binary/VisibleClassAnnotation.class

@@ -128,13 +128,19 @@ public Collection<? extends SootMethod> resolveMethods() throws ResolveException
                   identifierFactory.getMethodSignature(
                       classSignature, methodName, retType, sigTypes);
 
+              List<AnnotationNode> annotations = new ArrayList<>();
+              if (methodSource.visibleAnnotations != null)
+                annotations.addAll(methodSource.visibleAnnotations);
+              if (methodSource.invisibleAnnotations != null)
+                annotations.addAll(methodSource.invisibleAnnotations);
+
               // TODO: position/line numbers if possible
               return new JavaSootMethod(
                   asmClassClassSourceContent,
                   methodSignature,
                   modifiers,
                   exceptions,
-                  convertAnnotation(methodSource.invisibleAnnotations),
+                  convertAnnotation(annotations),
                   NoPositionInformation.getInstance());
             })
         .collect(Collectors.toSet());

shared-test-resources/miniTestSuite/java6/source/VisibleAnnotation.java

@@ -0,0 +1,26 @@
+package sootup.java.bytecode.minimaltestsuite.java6;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.*;
+import org.junit.Test;
+import sootup.core.signatures.PackageName;
+import sootup.java.bytecode.minimaltestsuite.MinimalBytecodeTestSuiteBase;
+import sootup.java.core.AnnotationUsage;
+import sootup.java.core.JavaSootClass;
+import sootup.java.core.types.AnnotationType;
+
+public class VisibleAnnotationTest extends MinimalBytecodeTestSuiteBase {
+
+  @Test
+  public void testVisibleAnnotationOnClassOrAnnotation() {
+    JavaSootClass sootClass = loadClass(getDeclaredClassSignature());
+
+    assertEquals(
+        Arrays.asList(
+            new AnnotationUsage(
+                new AnnotationType("InterfaceVisibleAnnotation", new PackageName(""), false),
+                Collections.emptyMap())),
+        sootClass.getAnnotations(Optional.of(customTestWatcher.getJavaView())));
+  }
+}