Merge branch '__rultor'

objectionary · Nov 23, 2023 · 4e2582b · 4e2582b · 0pdd · Nov 23, 2023
2 parents 5165a0b + 05ba13d
commit 4e2582b
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 24 deletions.
diff --git a/eo-maven-plugin/src/test/java/org/eolang/maven/SodgMojoTest.java b/eo-maven-plugin/src/test/java/org/eolang/maven/SodgMojoTest.java
@@ -56,12 +56,6 @@
  * Test case for {@link SodgMojo}.
  *
  * @since 0.1
- * @todo #2555:30min Enable the test. The test {@link SodgMojoTest#generatesSodgForPacks(String)}
- *  was disabled because it does not pass after changing tuple implementation. Need to refactor it
- *  and enable. Don't forget to remove the puzzle.
- * @todo #2437:30min Enable the tests: Some tests in the class were disabled after changing
- *  "explicit-data.xsl". Need to fix them and enable. Don't forget to remove the puzzle.
- *  Disabled tests: {@link SodgMojoTest#generatesSodgForPacks(String)}.
  */
 @SuppressWarnings("PMD.AvoidDuplicateLiterals")
 final class SodgMojoTest {
@@ -91,9 +85,8 @@ void transformsThroughSheets(final String yaml) {
         );
     }
 
-    @Disabled
     @ParameterizedTest
-    @ClasspathSource(value = "org/eolang/maven/sodgs", glob = "**.yaml")
+    @ClasspathSource(value = "org/eolang/maven/sodgs/", glob = "**.yaml")
     @SuppressWarnings("PMD.JUnitTestContainsTooManyAsserts")
     void generatesSodgForPacks(final String pack) throws Exception {
         final Map<String, Object> map = new Yaml().load(pack);

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/abstracts.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/abstracts.yaml
@@ -1,7 +1,7 @@
 locators:
   - .org .eolang .int
-  - .foo .bar .a .x .α0 .Δ δ=00-00-00-00-00-00-00-2A
-  - .foo .bar .b .y .α0 .Δ δ=00-00-00-00-00-00-01-00
+  - .foo .bar .a .x .α0 .α0 .Δ δ=00-00-00-00-00-00-00-2A
+  - .foo .bar .b .y .α0 .α0 .Δ δ=00-00-00-00-00-00-01-00
   - .foo .bar .a .x .α0 .π >int ν=$Φ.org.eolang.int
   - .foo .bar .a .x .π >bar .ρ ν=ν0
 eo: |

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/arrays.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/arrays.yaml
@@ -2,10 +2,10 @@ locators:
   - .org .eolang .test
   - .org .eolang .int
   - .arrays .z .π >tuple
-  - .arrays .z .α0 .ε >test
+  - .arrays .z .α0 .α0 .ε >test
   - .arrays .z .α1 .π >tuple
-  - .arrays .z .α1 .α0 .Δ δ=00-00-00-00-00-00-00-2A
-  - .arrays .z .α1 .α1 .Δ δ=00-00-00-00-00-00-00-2B
+  - .arrays .z .α1 .α0 .α1 .α0 .Δ δ=00-00-00-00-00-00-00-2A
+  - .arrays .z .α1 .α1 .α0 .Δ δ=00-00-00-00-00-00-00-2B
 eo: |
   [] > arrays
     * > z

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/data.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/data.yaml
@@ -1,11 +1,11 @@
 locators:
-  - .data .f .Δ δ=40-09-21-FB-4D-12-D8-4A
+  - .data .f .α0 .Δ δ=40-09-21-FB-4D-12-D8-4A
   - .data .f .π >float
-  - .data .b .Δ δ=01
+  - .data .b .α0 .Δ δ=01
   - .data .b .π >bool
-  - .data .i .Δ δ=00-00-00-00-00-01-00-00
+  - .data .i .α0 .Δ δ=00-00-00-00-00-01-00-00
   - .data .i .π >int
-  - .data .s .Δ δ=D0-B4-D1-80-D1-83-D0-B3
+  - .data .s .α0 .Δ δ=D0-B4-D1-80-D1-83-D0-B3
   - .data .s .π >string
 eo: |
   [] > data

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/dots.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/dots.yaml
@@ -2,10 +2,10 @@ locators:
   - .org .eolang .bool
   - .org .eolang .bool !.not
   - .org .eolang .int !.plus
-  - .dots .x .ε .β .not .Δ δ=01
+  - .dots .x .ε .β .not .α0 .Δ δ=01
   - .dots .x .ε .β .not .π >bool
   - .dots .y >b
-  - .dots .z .π .β .times .π .β .plus .Δ δ=00-00-00-00-00-00-00-2A
+  - .dots .z .π .β .times .π .β .plus .α0 .Δ δ=00-00-00-00-00-00-00-2A
   - .dots .z .π .β .times .π .β .plus .π >int
 eo: |
   [] > dots

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/inclusions.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/inclusions.yaml
@@ -1,8 +1,8 @@
 inclusion:
   - foo.x.*
 locators:
-  - .a .x .α0 .Δ δ=00-00-00-00-00-00-00-2A
-  - .b .y .α0 .Δ δ=00-00-00-00-00-00-01-00
+  - .a .x .α0 .α0 .Δ δ=00-00-00-00-00-00-00-2A
+  - .b .y .α0 .α0 .Δ δ=00-00-00-00-00-00-01-00
 eo: |
   [f] > a
     b 42 > x

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/refs.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/refs.yaml
@@ -1,5 +1,5 @@
 locators:
-  - .refs .x .Δ δ=01
+  - .refs .x .α0 .Δ δ=01
   - .refs .x .π >bool
   - .refs .y .ε
 eo: |

diff --git a/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/simple.yaml b/eo-maven-plugin/src/test/resources/org/eolang/maven/sodgs/simple.yaml
@@ -4,9 +4,9 @@ locators:
   - .boom
   - .foo
   - .bar
-  - .simple .φ .ρ .φ .ρ .φ .α0 .α0 .Δ δ=01
+  - .simple .φ .ρ .φ .ρ .φ .α0 .α0 .α0 .Δ δ=01
   - .simple .φ .ρ .φ .ρ .φ .α0 .α0 .π >bool
-  - .simple .φ .α1 .Δ δ=00-00-00-00-00-00-00-2A
+  - .simple .φ .α1 .α0 .Δ δ=00-00-00-00-00-00-00-2A
   - .simple .φ .α1 .π >int
   - .simple .φ .α2 >boom
 eo: |