fix(#2778): tests + unphi

objectionary · Jan 17, 2024 · ea3933d · ea3933d
1 parent 5b52995
commit ea3933d
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 24 deletions.
diff --git a/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java b/eo-maven-plugin/src/main/java/org/eolang/maven/PhiMojo.java
@@ -91,7 +91,7 @@ public final class PhiMojo extends SafeMojo {
      * This flag is used for test in order not to optimize XMIR twice:
      * in {@link OptimizeMojo} and here.
      */
-    private boolean phiOptimize;
+    private boolean phiOptimize = true;
 
     @Override
     public void exec() {

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java b/eo-maven-plugin/src/test/java/org/eolang/maven/FakeMaven.java
@@ -238,6 +238,7 @@ public <T extends AbstractMojo> FakeMaven execute(final Class<T> mojo) throws IO
             this.params.putIfAbsent("objectionaries", new Objectionaries.Fake());
             this.params.putIfAbsent("rewriteBinaries", true);
             this.params.putIfAbsent("offline", false);
+            this.params.putIfAbsent("phiOptimize", false);
             this.params.putIfAbsent(
                 "eoPortalDir",
                 new File("../eo-runtime/src/main/rust/eo")

diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/PhiMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/PhiMojoTest.java
@@ -64,27 +64,18 @@ void createsFiles(@TempDir final Path temp) throws Exception {
     @ClasspathSource(value = "org/eolang/maven/phi", glob = "**.yaml")
     void checksPhiPacks(final String pack, @TempDir final Path temp) throws Exception {
         final Map<String, Object> map = new Yaml().load(pack);
-        String phi = new TextOf(
-            new FakeMaven(temp)
-                .withProgram(map.get("eo").toString())
-                .execute(new FakeMaven.Phi())
-                .result()
-                .get("target/phi/foo/x/main.phi")
-        ).asString();
-        System.out.println(phi);
         MatcherAssert.assertThat(
             String.format(
                 "Result phi expression should be equal to %s, but it doesn't",
                 map.get("phi").toString()
             ),
-            phi,
-//            new TextOf(
-//                new FakeMaven(temp)
-//                    .withProgram(map.get("eo").toString())
-//                    .execute(new FakeMaven.Phi())
-//                    .result()
-//                    .get("target/phi/foo/x/main.phi")
-//            ).asString(),
+            new TextOf(
+                new FakeMaven(temp)
+                    .withProgram(map.get("eo").toString())
+                    .execute(new FakeMaven.Phi())
+                    .result()
+                    .get("target/phi/foo/x/main.phi")
+            ).asString(),
             Matchers.equalTo(map.get("phi").toString())
         );
     }

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-data.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/phi/with-data.yaml
@@ -6,4 +6,4 @@ phi: |
         Δ ⤍ 00-00-00-00-00-00-00-05
       )
     )
-  }
+  }
diff --git a/eo-parser/src/main/resources/XMIR.xsd b/eo-parser/src/main/resources/XMIR.xsd
@@ -106,7 +106,7 @@ SOFTWARE.
                   <xs:element name="tail" type="xs:string"/>
                   <xs:element name="part" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
                 </xs:sequence>
-                <xs:attribute name="line" type="xs:decimal"/>
+                <xs:attribute name="line"/>
                 <xs:attribute name="expanded"/>
               </xs:complexType>
             </xs:element>

diff --git a/eo-parser/src/main/resources/org/eolang/parser/errors/external-weak-typed-atoms.xsl b/eo-parser/src/main/resources/org/eolang/parser/errors/external-weak-typed-atoms.xsl
@@ -40,9 +40,6 @@ SOFTWARE.
             <xsl:attribute name="severity">
               <xsl:text>error</xsl:text>
             </xsl:attribute>
-            <xsl:attribute name="msg">
-              <xsl:value-of select="$package"/>
-            </xsl:attribute>
             <xsl:text>Weak typing /? is allowed only inside org.eolang package</xsl:text>
           </xsl:element>
         </xsl:for-each>

diff --git a/eo-parser/src/test/java/org/eolang/parser/ParsingTrainTest.java b/eo-parser/src/test/java/org/eolang/parser/ParsingTrainTest.java
@@ -73,8 +73,8 @@ void stopsPipeline() {
                 new ParsingTrain()
             ).pass(xml),
             XhtmlMatchers.hasXPaths(
-                "/program/sheets[count(sheet)=2]",
-                "/program/errors/error[@severity='critical']"
+                "/program/sheets[count(sheet)=3]",
+                "/pro gram/errors/error[@severity='critical']"
             )
         );
     }