Counter handling

.github/workflows/counter.yaml

@@ -0,0 +1,38 @@
+name: Count tests failures
+
+on:
+  release:
+    types: [ published ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ ubuntu-latest ]
+    runs-on: ${{ matrix.os }}
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up JDK 14
+        uses: actions/setup-java@v2
+        with:
+          java-version: '14'
+          distribution: 'adopt'
+      - uses: actions/setup-python@v2
+        with:
+            python-version: '3.8.10'
+      - name: Build with Maven
+        run: mvn clean verify -B -PsingleTest
+      - name: archive artifacts
+        uses: actions/upload-artifact@v2
+        with:
+            name: artifacts
+            path: |
+              transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/*/genCageEO/*.eo
+              scalastyle-output.xml
+      - name: Rename jar
+        run: cp transpiler/target/transpiler-*-jar-with-dependencies.jar transpiler.jar
+      - name: archive jar
+        uses: actions/upload-artifact@v2
+        with:
+          name: package
+          path: transpiler.jar

.github/workflows/github-ci.yml

@@ -53,8 +53,8 @@ jobs:
 
   polystatIntegration:
     strategy:
-        matrix:
-            os: [ ubuntu-latest ]
+      matrix:
+        os: [ ubuntu-latest ]
     runs-on: ${{ matrix.os }}
     needs: test
     steps:
@@ -70,7 +70,7 @@ jobs:
         with:
           name: package
 
-      - name: download polystat 
+      - name: download polystat
         run: wget https://repo.maven.apache.org/maven2/org/polystat/polystat/0.4.0/polystat-0.4.0-jar-with-dependencies.jar
       - name: translate python
         run: java -jar ./transpiler.jar ./transpiler/src/test/resources/org/polystat/py2eo/transpiler/integrationTests/test.py
@@ -85,8 +85,8 @@ jobs:
         uses: actions/upload-artifact@v2
         if: always()
         with:
-            name: py2eo output
-            path: ./transpiler/src/test.eo
+          name: py2eo output
+          path: ./transpiler/src/test.eo
 
 
   runEO:
@@ -109,9 +109,9 @@ jobs:
           name: artifacts
           path: ./
       - name: Build with Maven
-        run: cd ./runEO && mvn clean test && ls -la ./target/eo-test/04-pull/org/eolang/
+        run: cp transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/*/genCageEO/*.eo ./runEO && cd ./runEO && mvn clean test
       - name: upload artifacts
         uses: actions/upload-artifact@v2
         with:
           name: generatedJava
-          path: /Users/runner/work/py2eo/py2eo/python/python3/test/target/generated-sources/
+          path: /Users/runner/work/py2eo/py2eo/python/python3/test/target/generated-sources/

pom.xml

@@ -91,7 +91,7 @@
                                 <argument>${project.build.directory}/scalastyle_2.13-1.5.1-assembly.jar</argument>
                                 <argument>-c</argument>
                                 <argument>${project.basedir}/scalastyle_config.xml</argument>
-                                <argument>${project.basedir}/transpiler</argument>
+                                <argument>${project.basedir}/transpiler/src/main</argument>
                                 <argument>${project.basedir}/parser</argument>
                             </arguments>
                         </configuration>

runEO/pom.xml

@@ -13,51 +13,25 @@
     </properties>
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-resources-plugin</artifactId>
-                <version>3.2.0</version>
-                <executions>
-                    <execution>
-                        <id>copy-resources</id>
-                        <!-- here the phase you need -->
-                        <phase>validate</phase>
-                        <goals>
-                            <goal>copy-resources</goal>
-                        </goals>
-                        <configuration>
-                            <outputDirectory>${basedir}/target/eo-test/04-pull/org/eolang/</outputDirectory>
-                            <resources>
-                                <resource>
-                                    <directory>${basedir}/../transpiler/src/main/eo</directory>
-									<include>**.eo</include>
-                                </resource>
-                            </resources>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.eolang</groupId>
                 <artifactId>eo-maven-plugin</artifactId>
                 <version>${eolang.version}</version>
                 <executions>
-					<execution>
-						<id>compile</id>
+                    <execution>
+                        <id>compile</id>
                         <goals>
                             <goal>register</goal>
                             <goal>assemble</goal>
                             <goal>transpile</goal>
                         </goals>
-						<configuration>
-                            <sourcesDir>${project.baseDir}/../../</sourcesDir>
-                            <includeSources>
-                                <glob>transpiler/src/test/resources/org/polystat/py2eo/transpiler/simple-tests/*/genCageEO/*.eo</glob>
-                            </includeSources>
-						  <targetDir>${project.basedir}/target/eo-test</targetDir>
-						  <addSourcesRoot>false</addSourcesRoot>
-						  <addTestSourcesRoot>true</addTestSourcesRoot>
-						  <generatedDir>${project.basedir}/target/generated-test-sources</generatedDir>
-						</configuration>
+                        <configuration>
+                            <sourcesDir>${project.basedir}</sourcesDir>
+                            <targetDir>${project.basedir}/target/eo-test</targetDir>
+                            <addSourcesRoot>false</addSourcesRoot>
+                            <addTestSourcesRoot>true</addTestSourcesRoot>
+                            <generatedDir>${project.basedir}/target/generated-test-sources</generatedDir>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -76,4 +50,4 @@
             <version>5.8.1</version>
         </dependency>
     </dependencies>
-</project>
+</project>

transpiler/pom.xml

@@ -17,6 +17,8 @@
         <maven.compiler.target>14</maven.compiler.target>
         <encoding>UTF-8</encoding>
         <scala.version>2.13.6</scala.version>
+        <ignoreFail>false</ignoreFail>
+
     </properties>
 
     <dependencies>
@@ -50,6 +52,37 @@
         </dependency>
     </dependencies>
 
+
+    <profiles>
+        <profile>
+            <id>singleTest</id>
+            <activation>
+                <activeByDefault>false</activeByDefault>
+            </activation>
+
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <configuration>
+                            <!-- If you have classpath issue like NoDefClassError,... -->
+                            <!-- useManifestOnlyJar>false</useManifestOnlyJar -->
+                            <includes>
+                                <include>**/Counter**</include>
+                            </includes>
+                            <excludes>
+                                <exclude>**/Test*.*</exclude>
+                                <exclude>**/*Suite.*</exclude>
+                            </excludes>
+                            <testFailureIgnore>true</testFailureIgnore>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
     <build>
         <plugins>
             <plugin>

transpiler/src/main/scala/org/polystat/py2eo/transpiler/Main.scala

@@ -66,7 +66,7 @@ object Main {
     s.mkString
   }
 
-  def writeFile(test: File, dirSuffix: String, fileSuffix: String, what: String, otherLocation: Boolean = false): String = {
+  def writeFile(test: File, dirSuffix: String, fileSuffix: String, what: String, otherLocation: Boolean = false): File = {
     val moduleName = test.getName.substring(0, test.getName.lastIndexOf("."))
     val outPath = if (!otherLocation) test.getAbsoluteFile.getParentFile.getPath + "/" + dirSuffix else dirSuffix
     val d = new File(outPath)
@@ -75,6 +75,6 @@ object Main {
     val output = new FileWriter(outName)
     output.write(what)
     output.close()
-    outName
+    new File(outName)
   }
 }

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

@@ -3,36 +3,55 @@ package org.polystat.py2eo.transpiler
 import org.junit.Assert.fail
 import org.polystat.py2eo.transpiler.Main.writeFile
 import org.yaml.snakeyaml.Yaml
+import org.yaml.snakeyaml.error.YAMLException
 
 import java.io.{File, FileInputStream}
+import java.nio.file.{Files, Path}
+import java.{lang => jl, util => ju}
 
 trait Commons {
   val testsPrefix: String = System.getProperty("user.dir") + "/src/test/resources/org/polystat/py2eo/transpiler"
-  case class YamlTest(python: String, enabled: Boolean)
 
-  def yaml2python(f: File): YamlTest = {
-    val yaml = new Yaml()
-    val map = yaml.load[java.util.Map[String, String]](new FileInputStream(f))
-
-    YamlTest(map.get("python"), map.containsKey("enabled") && map.getOrDefault("enabled", "false").asInstanceOf[Boolean])
+  def yaml2python(f: File): String = {
+    val map = new Yaml().load[java.util.Map[String, String]](new FileInputStream(f))
+    map.get("python")
   }
 
   def useCageHolder(test: File): Unit = {
-    val yamlObj = yaml2python(test)
-
-    if (yamlObj.enabled) {
-      val res = Transpile.transpileOption(Main.debugPrinter(test))(
-        test.getName.replace(".yaml", ""),
-        yamlObj.python
-      )
-
-      res match {
-        case None => fail(s"could not transpile ${test.getName}");
-        case Some(transpiled) =>
-          writeFile(
-            test, "genCageEO", ".eo", transpiled
-          )
-      }
+    Transpile(test.getName.replace(".yaml", ""), yaml2python(test)) match {
+      case None => fail(s"could not transpile ${test.getName}");
+      case Some(transpiled) => writeFile(test, "genCageEO", ".eo", transpiled)
     }
   }
+
+  def collect(dir: String, filterEnabled: Boolean = false): ju.Collection[Array[jl.String]] = {
+    val testsPrefix = System.getProperty("user.dir") + "/src/test/resources/org/polystat/py2eo/transpiler"
+
+    val res = collection.mutable.ArrayBuffer[String]()
+    val simpleTestsFolder = new File(testsPrefix + File.separator + dir + File.separator)
+    Files.walk(simpleTestsFolder.toPath).filter((p: Path) => p.toString.endsWith(".yaml")).forEach((p: Path) => {
+      val testHolder = new File(p.toString)
+
+      try {
+        val map = new Yaml().load[java.util.Map[String, String]](new FileInputStream(testHolder))
+        if (filterEnabled) {
+          if (map.containsKey("enabled") && map.getOrDefault("enabled", "false").asInstanceOf[Boolean]) {
+            res.addOne(p.toString)
+          } else {
+            println(s"The test ${testHolder.getName} is disabled")
+          }
+        } else {
+          res.addOne(p.toString)
+        }
+      } catch {
+        case e: YAMLException => fail(s"Couldn't parse ${testHolder.getName} file with error ${e.getMessage}")
+        case e: ClassCastException => fail(s"Couldn't parse ${testHolder.getName} file with error ${e.getMessage}")
+      }
+    })
+
+
+    val list = new ju.ArrayList[Array[jl.String]]()
+    res.foreach(n => list.add(Array(n)))
+    list
+  }
 }

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

@@ -0,0 +1,48 @@
+package org.polystat.py2eo.transpiler
+
+import org.junit.Assert.fail
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.Parameterized
+import org.junit.runners.Parameterized.Parameters
+import org.polystat.py2eo.transpiler.Main.writeFile
+
+import java.io.File
+import java.nio.file.StandardCopyOption.REPLACE_EXISTING
+import java.nio.file.{Files, Path, Paths}
+import java.{lang => jl, util => ju}
+import scala.language.postfixOps
+import scala.sys.process.Process
+
+object Counter extends Commons {
+  @Parameters def parameters: ju.Collection[Array[jl.String]] = collect("simple-tests")
+}
+
+@RunWith(value = classOf[Parameterized])
+class Counter(path: jl.String) extends Commons {
+  private val runEOPath = Paths.get(".").toAbsolutePath.getParent.getParent + "/runEO"
+
+  @Test def testDef(): Unit = {
+    val test = new File(path)
+    val yamlData = yaml2python(test)
+
+    Transpile(test.getName.replace(".yaml", ""), yamlData) match {
+      case None => fail(s"could not transpile ${test.getName}");
+      case Some(transpiled) =>
+        val path = writeFile(test, "genCageEO", ".eo", transpiled)
+
+        if (!run(path)) {
+          fail(s"could not run EO ${test.getName}")
+        }
+    }
+  }
+
+  private def run(file: File): Boolean = {
+    val result = Files.copy(file.toPath, Path.of(s"$runEOPath/test.eo"), REPLACE_EXISTING)
+    val ret = Process("mvn clean test", new File(runEOPath)).! == 0
+
+    Files delete result
+
+    ret
+  }
+}