Merge pull request #1132 from moshethebeadle/develop

Make tests in Examples module runnable.

docs/docguide.md

@@ -11,5 +11,5 @@
 this enables that tutorial code can be tested and will fail if its not up to date anymore :)
 
 ```
-{{ include('basicSetup/BasicSetup.java')}}
+{{ include('basicSetup/BasicSetupTest.java')}}
 ```

pom.xml

@@ -441,16 +441,22 @@
         </dependency>
 
         <!-- testing -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.10.3</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
-            <version>5.10.2</version>
+            <version>5.10.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-engine</artifactId>
-            <version>5.10.2</version>
+            <version>5.10.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>

sootup.examples/pom.xml

@@ -42,7 +42,11 @@
             <artifactId>slf4j-simple</artifactId>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -55,6 +59,11 @@
                     <skip>true</skip>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+            </plugin>
         </plugins>
     </build>
 

sootup.examples/src/test/java/sootup/examples/basicSetup/BasicSetup.java → sootup.examples/src/test/java/sootup/examples/basicSetup/BasicSetupTest.java

@@ -22,7 +22,7 @@
 
 /** This example illustrates how to create and use a new Soot Project. */
 @Tag("Java8")
-public class BasicSetup {
+public class BasicSetupTest {
 
   @Test
   public void createByteCodeProject() {

sootup.examples/src/test/java/sootup/examples/bodyInterceptor/BodyInterceptor.java → sootup.examples/src/test/java/sootup/examples/bodyInterceptor/BodyInterceptorTest.java

@@ -18,7 +18,7 @@
 
 /** This example illustrates how to invoke body interceptors. */
 @Tag("Java8")
-public class BodyInterceptor {
+public class BodyInterceptorTest {
 
   @Test
   public void test() {

sootup.examples/src/test/java/sootup/examples/callgraph/CallgraphExample.java → sootup.examples/src/test/java/sootup/examples/callgraph/CallgraphExampleTest.java

@@ -3,6 +3,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Set;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import sootup.callgraph.CallGraph;
@@ -18,7 +19,7 @@
 import sootup.java.core.views.JavaView;
 
 @Tag("Java8")
-public class CallgraphExample {
+public class CallgraphExampleTest {
 
   @Test
   public void test() {
@@ -46,12 +47,16 @@ public void test() {
 
     // Create type hierarchy and CHA
     final ViewTypeHierarchy typeHierarchy = new ViewTypeHierarchy(view);
-    System.out.println(typeHierarchy.subclassesOf(classTypeA));
+    System.out.println("Subclasses of A: ");
+    typeHierarchy.subclassesOf(classTypeA).forEach(System.out::println);
+
     CallGraphAlgorithm cha = new ClassHierarchyAnalysisAlgorithm(view);
 
     // Create CG by initializing CHA with entry method(s)
     CallGraph cg = cha.initialize(Collections.singletonList(entryMethodSignature));
 
-    cg.callsFrom(entryMethodSignature).forEach(System.out::println);
+    System.out.println("Call Graph from B:");
+    final Set<CallGraph.Call> calls = cg.callsFrom(entryMethodSignature);
+    calls.forEach(System.out::println);
   }
 }

sootup.examples/src/test/java/sootup/examples/classhierarchy/ClassHierarchy.java → sootup.examples/src/test/java/sootup/examples/classhierarchy/ClassHierarchyTest.java

@@ -30,7 +30,7 @@
  * This code example will show you how to build and examine a class hierarchy using sootup.
  */
 @Tag("Java8")
-public class ClassHierarchy {
+public class ClassHierarchyTest {
 
   @Test
   public void test() {

sootup.examples/src/test/java/sootup/examples/mutatingSootClass/MutatingSootClass.java → sootup.examples/src/test/java/sootup/examples/mutatingSootClass/MutatingSootClassTest.java

@@ -34,7 +34,7 @@
  * @author Bastian Haverkamp
  */
 @Tag("Java8")
-public class MutatingSootClass {
+public class MutatingSootClassTest {
 
   @Disabled
   public void test() {