Merge pull request #285 from polystat/more-tests

Added & refined tests

.github/workflows/github-ci.yml

@@ -41,7 +41,7 @@ jobs:
         with:
           name: artifacts
           path: |
-            transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/*/genCageEO/*.eo
+            transpiler/src/test/resources/org/polystat/py2eo/transpiler/results/*.eo
             scalastyle-output.xml
       - name: Rename jar
         run: cp transpiler/target/transpiler-*-jar-with-dependencies.jar transpiler.jar
@@ -109,7 +109,7 @@ jobs:
           name: artifacts
           path: ./
       - name: Build with Maven
-        run: cp transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/*/genCageEO/*.eo ./runEO && cp -a transpiler/src/main/eo/preface ./runEO && cd ./runEO && mvn clean test
+        run: cp transpiler/src/test/resources/org/polystat/py2eo/transpiler/results/*.eo ./runEO && cp -a transpiler/src/main/eo/preface ./runEO && cd ./runEO && mvn clean test
       - name: upload artifacts
         uses: actions/upload-artifact@v2
         with:

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/attribute-reference/attribute-2.yaml → transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/attribute-reference/attribute-2.yaml

@@ -3,6 +3,6 @@ python: |
   def test():
     class A:
       a = 123
-
+    
     x = A()
-    return x.a.__class__ == int
+    return x.a.__class__ == int

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/bitwise-operators/bitwise-and.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def bitwiseAnd():
+    a = 0b1101
+    return a & 0b0110 == 0b100

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/bitwise-operators/bitwise-xor.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def bitwiseXor():
+    a = 0b10
+    return a ^ 0b11 == 1

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/bitwise-operators/bitwsie-or.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def bitwiseOr():
+    a = 0b1010
+    return a | 0b1100 == 0b1110

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/boolean-operators/booleanAnd.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def booleanAnd():
+    a = True
+    return a and False == False

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/boolean-operators/booleanNot.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def booleanNot():
+    a = False
+    return not a

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/boolean-operators/booleanOr.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def booleanOr():
+    a = False
+    return a or True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/conditional/conditional-2.yaml

@@ -0,0 +1,7 @@
+enabled: False
+python: |
+  def cond2():
+      b = 2
+      a = 1 == b if "asd" else 1
+      return a == 1
+

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/displays/dict-display.yaml → transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/dictionary-displays/dict-display-comprehension.yaml

@@ -1,6 +1,6 @@
 enabled: False
 python: |
-  def setDisplay():
+  def setDisplayComprehension():
     l = { x : x * x for x in range(1, 6) if (x % 2) == 1 }
     return l == { 1 : 1, 3 : 9, 5 : 25 }
 

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/dictionary-displays/dict-display.yaml

@@ -0,0 +1,5 @@
+enabled: False
+python: |
+  def setDisplayComprehension():
+    l = { 1 : "fst", 2 : "snd" }
+

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/evaluation-order/evaluation-order-plus.yaml

@@ -0,0 +1,18 @@
+enabled: False
+python: |
+  def evaluationOrder():
+    xlist = []
+
+    def fst():
+      xlist.append(1)
+      return 1
+
+    def snd():
+      xlist.append(2)
+      return 2
+
+    b = fst() + snd()
+    return b == 3 and xlist[0] == 1 and xlist[1] == 2
+
+    
+

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/list-displays/list-simple-display.yaml

@@ -0,0 +1,6 @@
+enabled: True
+python: |
+  def listDisplay():
+    l = [1, 2, 3]
+    return True
+

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/literals/float_literal.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def floatLiteral():
+    2.4
+    return True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/literals/int_literal.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def intLiteral():
+    2
+    return True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/literals/string_literal.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def stringLiteral():
+    "asf"
+    return True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/parenthesized-forms/parenthesized-expression-1.yaml

@@ -0,0 +1,6 @@
+enabled: False
+python: |
+  def test():
+    a = 5
+    b = 6
+    return (a + 5) * b == 60

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/parenthesized-forms/parenthesized-expression-2.yaml

@@ -0,0 +1,7 @@
+enabled: False
+python: |
+  def test():
+    a = 5
+    b = 6
+    c = 13
+    return (a + b) / c == 1

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/power-operator/arithmetics-integer.yaml

@@ -0,0 +1,4 @@
+enabled: True
+python: |
+  def powerOperator():
+    return 10 ** 2 == 100

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/displays/set-display.yaml → transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/set-displays/set-display-comprehension.yaml

@@ -1,6 +1,6 @@
 enabled: False
 python: |
-  def setDisplay():
+  def setDisplayComprehension():
     l = { x * x for x in range(1, 6) if (x % 2) == 1 }
     return l == { 1, 9, 25 }
 

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/set-displays/set-display.yaml

@@ -0,0 +1,5 @@
+enabled: False
+python: |
+  def setDisplay():
+    l = { 1, 2, 3, 1 }
+

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/shifting-operators/shifting-left.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def shiftingLeft():
+    a = 1
+    return a << 1 == 2

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/shifting-operators/shifting-right.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def shiftingRight():
+    a = 3
+    return a >> 1 == 1

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/unary-operators/unary-invert.yaml

@@ -0,0 +1,5 @@
+enabled: False
+python: |
+  def unaryInvert():
+    a = 2
+    return ~a == -3

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/unary-operators/unary-minus.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def unaryMinus():
+    a = 2
+    return -a + 2 == 0

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/expressions/unary-operators/unary-plus.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def unaryPlus():
+    a = 2
+    return +a == 2

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/library/list/list-append.yaml

@@ -0,0 +1,6 @@
+enabled: True
+python: |
+  def listGet():
+    list = [1, 2, 3]
+    list2 = list.append(4)
+    return list[1] == 2 and list[3] == 4

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/library/list/list-get.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def listGet():
+    list = [1,2, 3]
+    return list[1] == 2

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/library/list/list-len.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def listLen():
+    list = [1,2, 3]
+    return len(list) == 3

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/library/print/print-string.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def printString():
+    print("Hello world!")
+    return True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/parser/comments.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def comments():
+    # this comment doesn't interfere
+    return True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/parser/explicit-line-joining.yaml

@@ -0,0 +1,5 @@
+enabled: False
+python: |
+  def comments():
+    return \
+      True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/parser/indentation.yaml

@@ -0,0 +1,4 @@
+enabled: True
+python: |
+  def indentation():
+            return True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/parser/whitespaces.yaml

@@ -0,0 +1,4 @@
+enabled: True
+python: |
+  def whitespaces():
+    return      True

transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/simple-statements/pass/pass-1.yaml

@@ -0,0 +1,5 @@
+enabled: True
+python: |
+  def pass1():
+    pass
+    return True

transpiler/src/test/scala/org/polystat/py2eo/transpiler/Commons.scala

@@ -13,6 +13,7 @@ import scala.sys.process.{Process, ProcessLogger}
 
 trait Commons {
   val testsPrefix: String = System.getProperty("user.dir") + "/src/test/resources/org/polystat/py2eo/transpiler"
+  val resultsPrefix: String = "src/test/resources/org/polystat/py2eo/transpiler/results"
 
   def yaml2python(f: File): String = {
     val map = new Yaml().load[java.util.Map[String, String]](new FileInputStream(f))
@@ -36,17 +37,21 @@ trait Commons {
     if (match1.group(1) == "2") "python3" else "python"
   }
 
-
   def chopExtension(fileName: String): String = fileName.substring(0, fileName.lastIndexOf("."))
 
   def useCageHolder(test: File): Unit = {
-    Transpile.transpileOption(debugPrinter(test))(
-      test.getName.replace(".yaml", ""),
-      Transpile.Parameters(wrapInAFunction = false),
-      yaml2python(test)
-    ) match {
+    val results = new File(resultsPrefix)
+    if (!results.exists) {
+      results.mkdirs()
+    }
+
+    val name = test.getName.replace(".yaml", "")
+    Transpile(name, Transpile.Parameters(wrapInAFunction = false), yaml2python(test)) match {
       case None => fail(s"could not transpile ${test.getName}");
-      case Some(transpiled) => writeFile(test, "genCageEO", ".eo", transpiled)
+      case Some(transpiled) =>
+        val output = new FileWriter(results + File.separator + name + ".eo")
+        output.write(transpiled)
+        output.close()
     }
   }