Merge branch '__rultor'

objectionary · Jul 7, 2024 · 9b9d6de · 9b9d6de · 0pdd · Jul 7, 2024
2 parents 483c2fe + ce4acc0
commit 9b9d6de
Show file tree

Hide file tree

Showing 65 changed files with 1,379 additions and 321 deletions.
diff --git a/src/it/annotations/README.md b/src/it/annotations/README.md
@@ -5,5 +5,5 @@ The integration test verifies that the program can run successfully, and the jeo
 If you only need to run this test, use the following command:
 
 ```shell
-mvn clean integration-test invoker:run -Dinvoker.test=annotations -DskipTests
+mvn clean integration-test -Dinvoker.test=annotations -DskipTests
 ```
diff --git a/src/it/annotations/pom.xml b/src/it/annotations/pom.xml
@@ -63,7 +63,7 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.38.1</version>
+        <version>0.38.4</version>
         <executions>
           <execution>
             <id>convert-xmir-to-eo</id>
@@ -72,7 +72,6 @@ SOFTWARE.
               <goal>xmir-to-phi</goal>
             </goals>
             <configuration>
-              <phiOptimize>false</phiOptimize>
               <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
               <phiOutputDir>${project.build.directory}/generated-sources/jeo-eo</phiOutputDir>
             </configuration>

diff --git a/src/it/bytecode-to-eo/README.md b/src/it/bytecode-to-eo/README.md
@@ -0,0 +1,7 @@
+# Bytecode To Eo Integration Test
+
+If you need to run only this test, use the following command:
+
+```shell
+mvn clean integration-test -Dinvoker.test=bytecode-to-eo -DskipTests
+```
diff --git a/src/it/bytecode-to-eo/pom.xml b/src/it/bytecode-to-eo/pom.xml
@@ -30,7 +30,7 @@ SOFTWARE.
   <packaging>jar</packaging>
   <description>Integration test.
     If you need to run only this test, use the following command:
-    "mvn clean integration-test invoker:run -Dinvoker.test=bytecode-to-eo -DskipTests"
+    "mvn clean integration-test -Dinvoker.test=bytecode-to-eo -DskipTests"
   </description>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -93,6 +93,24 @@ SOFTWARE.
       <!--          </execution>-->
       <!--        </executions>-->
       <!--      </plugin>-->
+      <plugin>
+        <groupId>org.eolang</groupId>
+        <artifactId>eo-maven-plugin</artifactId>
+        <version>0.38.4</version>
+        <executions>
+          <execution>
+            <id>convert-xmir-to-eo</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>xmir-to-phi</goal>
+            </goals>
+            <configuration>
+              <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
+              <phiOutputDir>${project.build.directory}/generated-sources/jeo-eo</phiOutputDir>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/custom-transformations/README.md b/src/it/custom-transformations/README.md
@@ -6,5 +6,5 @@ the plugin didn't break anything. If you need to run only this test, use the
 following command:
 
 ```shell
-mvn clean integration-test invoker:run -Dinvoker.test=custom-transformations -DskipTests
+mvn clean integration-test -Dinvoker.test=custom-transformations -DskipTests
 ```
diff --git a/src/it/custom-transformations/pom.xml b/src/it/custom-transformations/pom.xml
@@ -93,17 +93,17 @@ SOFTWARE.
              Once it is implemented, this comment should be removed and the goal
              should be enabled.
           -->
-          <!--          <execution>-->
-          <!--            <id>convert-xmir-to-phi</id>-->
-          <!--            <phase>process-classes</phase>-->
-          <!--            <goals>-->
-          <!--              <goal>xmir-to-phi</goal>-->
-          <!--            </goals>-->
-          <!--            <configuration>-->
-          <!--              <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>-->
-          <!--              <phiOutputDir>${project.build.directory}/generated-sources/jeo-phi</phiOutputDir>-->
-          <!--            </configuration>-->
-          <!--          </execution>-->
+          <execution>
+            <id>convert-xmir-to-phi</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>xmir-to-phi</goal>
+            </goals>
+            <configuration>
+              <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
+              <phiOutputDir>${project.build.directory}/generated-sources/jeo-phi</phiOutputDir>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>

diff --git a/src/it/eo-to-bytecode/README.md b/src/it/eo-to-bytecode/README.md
@@ -7,5 +7,5 @@ generated XMIR files to bytecode. In other words, it checks the
 If you need to run only this test, use the following command:
 
 ```shell
-mvn clean integration-test invoker:run -Dinvoker.test=eo-to-bytecode -DskipTests
+mvn clean integration-test -Dinvoker.test=eo-to-bytecode -DskipTests
 ```
diff --git a/src/it/exceptions/README.md b/src/it/exceptions/README.md
@@ -6,5 +6,5 @@ that utilizes exceptions.
 If you need to run only this test, use the following command:
 
 ```shell
-mvn clean integration-test invoker:run -Dinvoker.test=exceptions -DskipTests
+mvn clean integration-test -Dinvoker.test=exceptions -DskipTests
 ```
diff --git a/src/it/exceptions/pom.xml b/src/it/exceptions/pom.xml
@@ -78,6 +78,24 @@ SOFTWARE.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eolang</groupId>
+        <artifactId>eo-maven-plugin</artifactId>
+        <version>0.38.4</version>
+        <executions>
+          <execution>
+            <id>convert-xmir-to-eo</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>xmir-to-phi</goal>
+            </goals>
+            <configuration>
+              <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
+              <phiOutputDir>${project.build.directory}/generated-sources/jeo-eo</phiOutputDir>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/src/it/generics/README.md b/src/it/generics/README.md
@@ -0,0 +1,10 @@
+# Generics Integration Test
+
+Integration test that checks correct transformation Java generics from
+bytecode into EO and back.
+
+To run only this test, just run the following command:
+
+```shell
+mvn clean integration-test -Dinvoker.test=generics -DskipTests
+```
diff --git a/src/it/generics/pom.xml b/src/it/generics/pom.xml
@@ -60,6 +60,24 @@ SOFTWARE.
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eolang</groupId>
+        <artifactId>eo-maven-plugin</artifactId>
+        <version>0.38.4</version>
+        <executions>
+          <execution>
+            <id>convert-xmir-to-eo</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>xmir-to-phi</goal>
+            </goals>
+            <configuration>
+              <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
+              <phiOutputDir>${project.build.directory}/generated-sources/jeo-phi</phiOutputDir>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>

diff --git a/src/it/spring-fat/README.md b/src/it/spring-fat/README.md
@@ -24,7 +24,7 @@ The process is as follows:
 To exclusively run this test, execute the command below:
 
 ```shell
-mvn clean integration-test invoker:run -Dinvoker.test=spring-fat -DskipTests
+mvn clean integration-test -Dinvoker.test=spring-fat -DskipTests
 ```
 
 ## The First Results

diff --git a/src/it/spring-fat/pom.xml b/src/it/spring-fat/pom.xml
@@ -108,6 +108,31 @@ SOFTWARE.
           </execution>
         </executions>
       </plugin>
+      <!--
+        @todo #627:30min Too Long PHI Printing In Spring-Fat IT
+         We need to optimize PHI pringint in `eo-maven-plugin`
+         and then enable the code below.
+         You can check the progress of the issue by the link:
+         https://github.com/objectionary/eo/issues/3257
+      -->
+      <!--            <plugin>-->
+      <!--              <groupId>org.eolang</groupId>-->
+      <!--              <artifactId>eo-maven-plugin</artifactId>-->
+      <!--              <version>0.38.4</version>-->
+      <!--              <executions>-->
+      <!--                <execution>-->
+      <!--                  <id>convert-xmir-to-phi</id>-->
+      <!--                  <phase>process-classes</phase>-->
+      <!--                  <goals>-->
+      <!--                    <goal>xmir-to-phi</goal>-->
+      <!--                  </goals>-->
+      <!--                  <configuration>-->
+      <!--                    <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>-->
+      <!--                    <phiOutputDir>${project.build.directory}/generated-sources/jeo-phi</phiOutputDir>-->
+      <!--                  </configuration>-->
+      <!--                </execution>-->
+      <!--              </executions>-->
+      <!--            </plugin>-->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>

diff --git a/src/it/spring/README.md b/src/it/spring/README.md
@@ -7,5 +7,5 @@ application with several beans and prints results to the console.
 If you need to run only this test, use the following command:
 
 ```shell
-mvn clean integration-test invoker:run -Dinvoker.test=spring -DskipTests
+mvn clean integration-test -Dinvoker.test=spring -DskipTests
 ```
diff --git a/src/it/spring/pom.xml b/src/it/spring/pom.xml
@@ -66,18 +66,38 @@ SOFTWARE.
         <executions>
           <execution>
             <id>bytecode-to-eo</id>
+            <phase>process-classes</phase>
             <goals>
               <goal>disassemble</goal>
             </goals>
           </execution>
           <execution>
             <id>eo-to-bytecode</id>
+            <phase>generate-test-sources</phase>
             <goals>
               <goal>assemble</goal>
             </goals>
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eolang</groupId>
+        <artifactId>eo-maven-plugin</artifactId>
+        <version>0.38.4</version>
+        <executions>
+          <execution>
+            <id>convert-xmir-to-phi</id>
+            <phase>process-classes</phase>
+            <goals>
+              <goal>xmir-to-phi</goal>
+            </goals>
+            <configuration>
+              <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
+              <phiOutputDir>${project.build.directory}/generated-sources/phi-jeo</phiOutputDir>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>

diff --git a/src/it/takes/pom.xml b/src/it/takes/pom.xml
@@ -79,18 +79,17 @@ SOFTWARE.
       <plugin>
         <groupId>org.eolang</groupId>
         <artifactId>eo-maven-plugin</artifactId>
-        <version>0.38.1</version>
+        <version>0.38.4</version>
         <executions>
           <execution>
-            <id>convert-xmir-to-eo</id>
+            <id>convert-xmir-to-phi</id>
             <phase>process-classes</phase>
             <goals>
               <goal>xmir-to-phi</goal>
             </goals>
             <configuration>
-              <phiOptimize>false</phiOptimize>
               <phiInputDir>${project.build.directory}/generated-sources/jeo-xmir</phiInputDir>
-              <phiOutputDir>${project.build.directory}/generated-sources/jeo-eo</phiOutputDir>
+              <phiOutputDir>${project.build.directory}/generated-sources/jeo-phi</phiOutputDir>
             </configuration>
           </execution>
         </executions>