From 2072903670c0fe57a22fdc0c6cb12eda5c6b52c7 Mon Sep 17 00:00:00 2001 From: maxonfjvipon Date: Wed, 17 Jan 2024 00:52:15 +0300 Subject: [PATCH] fix(#2778): pretty phi --- .../resources/org/eolang/maven/phi/to-phi.xsl | 75 +++++++++++++++---- .../java/org/eolang/maven/PhiMojoTest.java | 23 ++++-- 2 files changed, 77 insertions(+), 21 deletions(-) diff --git a/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.xsl b/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.xsl index 725eb9b7e9..0ba752cb3a 100644 --- a/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.xsl +++ b/eo-maven-plugin/src/main/resources/org/eolang/maven/phi/to-phi.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. --> - + @@ -74,6 +74,7 @@ SOFTWARE. + @@ -81,6 +82,7 @@ SOFTWARE. . + @@ -139,6 +141,7 @@ SOFTWARE. + @@ -159,46 +162,71 @@ SOFTWARE. + + - , + , + + + + + + + + + { + + - + + + + - + + + - + Package + - + + + + } + - - + + + + @@ -233,6 +261,7 @@ SOFTWARE. + @@ -254,25 +283,33 @@ SOFTWARE. ( + + + ) - + + + ( + + + ) @@ -286,37 +323,45 @@ SOFTWARE. ( + + ) + + Lambda - , + - - + + + + + + - + @@ -330,7 +375,9 @@ SOFTWARE. - + + + 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 index a70f214e56..437c877f93 100644 --- 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,18 +64,27 @@ 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 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() ), - new TextOf( - new FakeMaven(temp) - .withProgram(map.get("eo").toString()) - .execute(new FakeMaven.Phi()) - .result() - .get("target/phi/foo/x/main.phi") - ).asString(), + phi, +// 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()) ); }