test-assertGenerator (#18)

src/test/java/fr/inria/diversify/Utils.java

@@ -19,7 +19,6 @@
  * Date: 25/11/16
  * Time: 11:16
  */
-@Deprecated
 public class Utils {
     private static String confFile = "src/test/resources/sample.properties";
     private static InputProgram inputProgram;
@@ -58,6 +57,7 @@ private static void loadSampleProject() throws Exception, InvalidSdkException {
         InitUtils.initDependency(inputConfiguration);
 
         compiler = DSpotUtils.initDiversityCompiler(inputProgram, true);
+        compiler.getFactory().getEnvironment().setLevel("OFF");
         InitUtils.addApplicationClassesToClassPath(inputProgram);
         applicationClassLoader = DSpotUtils.initClassLoader(inputProgram, inputConfiguration);
     }

src/test/java/fr/inria/diversify/dspot/assertGenerator/AssertGeneratorTest.java

@@ -0,0 +1,55 @@
+package fr.inria.diversify.dspot.assertGenerator;
+
+import fr.inria.diversify.Utils;
+import fr.inria.diversify.buildSystem.android.InvalidSdkException;
+import fr.inria.diversify.util.FileUtils;
+import org.junit.AfterClass;
+import org.junit.Test;
+import spoon.reflect.declaration.CtClass;
+import spoon.reflect.declaration.CtMethod;
+import spoon.reflect.declaration.CtType;
+
+import static org.junit.Assert.assertEquals;
+
+
+/**
+ * Created by Benjamin DANGLOT
+ * benjamin.danglot@inria.fr
+ * on 12/8/16
+ */
+public class AssertGeneratorTest {
+
+    @Test
+    public void testGenerateAssert() throws Exception, InvalidSdkException {
+
+        /*
+            test the generation of assertion
+         */
+
+        CtClass testClass = fr.inria.diversify.Utils.findClass("fr.inria.sample.TestClassWithoutAssert");
+        AssertGenerator assertGenerator = new AssertGenerator(fr.inria.diversify.Utils.getInputProgram(), fr.inria.diversify.Utils.getCompiler(), fr.inria.diversify.Utils.getApplicationClassLoader());
+
+        CtType ctType = assertGenerator.generateAsserts(testClass);
+
+        String nl = System.getProperty("line.separator");
+
+        final String expectedBody ="{"+ nl  +
+                "    fr.inria.sample.ClassWithBoolean cl = new fr.inria.sample.ClassWithBoolean();"+ nl  +
+                "    boolean o_test1__3 = cl.getFalse();"+ nl  +
+                "    junit.framework.Assert.assertFalse(o_test1__3);"+ nl  +
+                "    boolean o_test1__4 = cl.getBoolean();"+ nl  +
+                "    junit.framework.Assert.assertTrue(o_test1__4);"+ nl  +
+                "    boolean var = cl.getTrue();"+ nl  +
+                "}";
+
+        assertEquals(expectedBody, ((CtMethod)ctType.getMethods().stream().findFirst().get()).getBody().toString());
+    }
+
+
+    @AfterClass
+    public static void tearDown() throws InvalidSdkException, Exception {
+        FileUtils.forceDelete(Utils.getCompiler().getBinaryOutputDirectory());
+        FileUtils.forceDelete(Utils.getCompiler().getSourceOutputDirectory());
+        Utils.reset();
+    }
+}

src/test/java/fr/inria/diversify/dspot/assertGenerator/MethodAssertGeneratorTest.java

@@ -12,6 +12,7 @@
 import java.util.ArrayList;
 
 import static fr.inria.diversify.dspot.assertGenerator.AssertCt.assertBodyEquals;
+import static org.junit.Assert.assertEquals;
 
 /**
  * User: Simon
@@ -72,16 +73,32 @@ public void testBuildNewAssert() throws InvalidSdkException, Exception {
         CtClass testClass = Utils.findClass("fr.inria.sample.TestClassWithoutAssert");
         MethodAssertGenerator mag = new MethodAssertGenerator(testClass, Utils.getInputProgram(), Utils.getCompiler(), Utils.getApplicationClassLoader());
 
+        String nl = System.getProperty("line.separator");
+
+        final String expectedBody = "{" + nl +
+                "    fr.inria.sample.ClassWithBoolean cl = new fr.inria.sample.ClassWithBoolean();" + nl +
+                "    junit.framework.Assert.assertFalse(((fr.inria.sample.ClassWithBoolean)cl).getFalse());" + nl +
+                "    junit.framework.Assert.assertTrue(((fr.inria.sample.ClassWithBoolean)cl).getTrue());" + nl +
+                "    junit.framework.Assert.assertTrue(((fr.inria.sample.ClassWithBoolean)cl).getBoolean());" + nl +
+                "    boolean o_test1_withoutAssert__3 = cl.getFalse();" + nl +
+                "    junit.framework.Assert.assertFalse(o_test1_withoutAssert__3);" + nl +
+                "    boolean o_test1_withoutAssert__4 = cl.getBoolean();" + nl +
+                "    junit.framework.Assert.assertTrue(o_test1_withoutAssert__4);" + nl +
+                "    boolean var = cl.getTrue();" + nl +
+                "    junit.framework.Assert.assertTrue(var);" + nl +
+                "}";
+
         CtMethod test1 = Utils.findMethod("fr.inria.sample.TestClassWithoutAssert", "test1");
-        CtMethod test1_withAssert = Utils.findMethod("fr.inria.sample.TestClassWithoutAssert", "test1_withAssert");
+
         mag.test = test1;
         CtMethod test1_buildNewAssert = mag.generateAssert(test1);
-        assertBodyEquals(test1_buildNewAssert, test1_withAssert);
+        assertEquals(expectedBody, test1_buildNewAssert.getBody().toString());
     }
 
     @AfterClass
     public static void tearDown() throws InvalidSdkException, Exception {
         FileUtils.forceDelete(Utils.getCompiler().getBinaryOutputDirectory());
         FileUtils.forceDelete(Utils.getCompiler().getSourceOutputDirectory());
+        Utils.reset();
     }
 }

src/test/resources/sample.properties

@@ -1,4 +1,8 @@
 project=src/test/resources/sample
 
+src=src
+testSrc=test
+
 filter=fr.inria.sample
 
+

src/test/resources/sample/src/test/java/fr/inria/sample/TestClassWithoutAssert.java

@@ -16,18 +16,4 @@ public void test1() {
         cl.getBoolean();
         boolean var = cl.getTrue();
     }
-
-    @Test
-    public void test1_withAssert() {
-        fr.inria.sample.ClassWithBoolean cl = new fr.inria.sample.ClassWithBoolean();
-        junit.framework.Assert.assertFalse(((fr.inria.sample.ClassWithBoolean)cl).getFalse());
-        junit.framework.Assert.assertTrue(((fr.inria.sample.ClassWithBoolean)cl).getTrue());
-        junit.framework.Assert.assertTrue(((fr.inria.sample.ClassWithBoolean)cl).getBoolean());
-        boolean o_test1_withoutAssert__3 = cl.getFalse();
-        junit.framework.Assert.assertFalse(o_test1_withoutAssert__3);
-        boolean o_test1_withoutAssert__4 = cl.getBoolean();
-        junit.framework.Assert.assertTrue(o_test1_withoutAssert__4);
-        boolean var = cl.getTrue();
-        junit.framework.Assert.assertTrue(var);
-    }
 }