feat(#3042): tests

objectionary · Apr 10, 2024 · 5d3b790 · 5d3b790
1 parent 7e791c0
commit 5d3b790
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 16 deletions.
diff --git a/eo-maven-plugin/src/main/resources/org/eolang/maven/pre/to-java.xsl b/eo-maven-plugin/src/main/resources/org/eolang/maven/pre/to-java.xsl
@@ -246,11 +246,6 @@ SOFTWARE.
       </xsl:with-param>
       <xsl:with-param name="rho" select="'this'"/>
     </xsl:apply-templates>
-    <xsl:if test="o[@const]">
-      <xsl:value-of select="eo:tabs(3)"/>
-      <xsl:text>ret = new PhConst(ret);</xsl:text>
-      <xsl:value-of select="eo:eol(0)"/>
-    </xsl:if>
     <xsl:value-of select="eo:tabs(3)"/>
     <xsl:text>return ret;</xsl:text>
     <xsl:value-of select="eo:eol(2)"/>
@@ -268,11 +263,6 @@ SOFTWARE.
       </xsl:with-param>
       <xsl:with-param name="rho" select="'rho'"/>
     </xsl:apply-templates>
-    <xsl:if test="o[@const]">
-      <xsl:value-of select="eo:tabs(3)"/>
-      <xsl:text>ret = new PhConst(ret);</xsl:text>
-      <xsl:value-of select="eo:eol(0)"/>
-    </xsl:if>
     <xsl:value-of select="eo:tabs(3)"/>
     <xsl:text>return ret;</xsl:text>
     <xsl:value-of select="eo:eol(2)"/>

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/mess.eo b/eo-maven-plugin/src/test/resources/org/eolang/maven/mess.eo
@@ -17,7 +17,7 @@
       666
       two.f1.f2 x
   stdout > z
-    sprintf > f!
+    sprintf > f
       "Hello, ".trim
       x 0x1fff n
 

diff --git a/eo-parser/src/main/resources/org/eolang/parser/const-to-dataized.xsl b/eo-parser/src/main/resources/org/eolang/parser/const-to-dataized.xsl
@@ -22,7 +22,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 -->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:eo="https://www.eolang.org"  id="const-to-dataized" version="2.0">
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:eo="https://www.eolang.org" id="const-to-dataized" version="2.0">
   <!--
   Here we go through all objects and find what their @base
   are referring to. If we find the object they refer to,
@@ -52,6 +52,8 @@ SOFTWARE.
     <xsl:element name="o">
       <xsl:attribute name="base" select="'.as-bytes'"/>
       <xsl:attribute name="name" select="@name"/>
+      <xsl:attribute name="line" select="@line"/>
+      <xsl:attribute name="pos" select="@pos + 8"/>
       <xsl:element name="o">
         <xsl:attribute name="base" select="'org.eolang.dataized'"/>
         <xsl:element name="o">

diff --git a/eo-parser/src/test/resources/org/eolang/parser/packs/const-to-dataized.yaml b/eo-parser/src/test/resources/org/eolang/parser/packs/const-to-dataized.yaml
@@ -1,8 +1,9 @@
 tests:
-  - //o[@base='.as-bytes' and @name='x' and o[@base='org.eolang.dataized' and o[@base='org.eolang.int' and not(@name)]]]
-  - //o[@base='.as-bytes' and @name='m' and o[@base='org.eolang.dataized' and o[@abstract and @name='m-3' and count(o)=2]]]
-  - //o[@base='.as-bytes' and @name='z' and o[@base='org.eolang.dataized' and o[@base='.o' and not(@name) and count(o)=1]]]
-  - //o[@base='.as-bytes' and @name='y' and o[@base='org.eolang.dataized' and o[@base='org.eolang.c' and not(@name)]]]
+  - //o[@base='.as-bytes' and @line and @pos and @name='x' and o[@base='org.eolang.dataized' and o[@base='org.eolang.int' and not(@name)]]]
+  - //o[@base='.as-bytes' and @line and @pos and @name='m' and o[@base='org.eolang.dataized' and o[@abstract and @name='m-3' and count(o)=2]]]
+  - //o[@base='.as-bytes' and @line and @pos and @name='z' and o[@base='org.eolang.dataized' and o[@base='.o' and not(@name) and count(o)=1]]]
+  - //o[@base='.as-bytes' and @line and @pos and @name='y' and o[@base='org.eolang.dataized' and o[@base='org.eolang.c' and not(@name)]]]
+  - //objects[count(//o[@const])=0]
 eo: |
   # This is the default 64+ symbols comment in front of abstract object.
   [] > foo