some more tests

testcases/regression/Assign1.scala → testcases/regression/valid/Assign1.scala

@@ -4,15 +4,9 @@ object Assign1 {
     var a = 0
     val tmp = a + 1
     a = a + 2
-    a = a + 3
+    a = a + tmp
     a = a + 4
-    //var j = 0
-    //var sortedArray = Map.empty[Int, Int]
-    //val tmp = sortedArray(j)
-    //sortedArray = sortedArray.updated(j, sortedArray(j+1))
-    //sortedArray = sortedArray.updated(j+1, tmp)
-    //sortedArray(j)
     a
-  }
+  } ensuring(_ == 7)
 
 }

testcases/regression/MyTuple5.scala → testcases/regression/valid/MyTuple3.scala

-object MyTuple4 {
+object MyTuple3 {
 
   def foo(): Int = {
     val t = ((2, 3), true)
@@ -6,5 +6,3 @@ object MyTuple4 {
   } ensuring( _ == 3)
 
 }
-
-// vim: set ts=4 sw=4 et:

testcases/regression/Nested2.scala → testcases/regression/valid/Nested1.scala

-object Nested2 {
+object Nested1 {
 
   def foo(i: Int): Int = {
     val n = 2

testcases/regression/While1.scala → testcases/regression/valid/While1.scala

@@ -4,10 +4,10 @@ object While1 {
     var a = 0
     var i = 0
     while(i < 10) {
-      a = a + i
+      a = a + 1
       i = i + 1
     }
     a
-  }
+  } ensuring(_ == 10)
 
 }

testcases/regression/valid/While2.scala

+object While1 {
+
+  def foo(): Int = {
+    var a = 0
+    var i = 0
+    while(i < 10) {
+      a = a + i
+      i = i + 1
+    }
+    a
+  } ensuring(_ == 45)
+
+}

testcases/regression/While2.scala → testcases/regression/valid/While3.scala

-object While1 {
+object While3 {
 
   def foo(): Int = {
     var a = 0
@@ -11,5 +11,3 @@ object While1 {
   } ensuring(_ == 54)
 
 }
-
-// vim: set ts=4 sw=4 et: