Merge branch '__rultor'

src/main/java/org/jpeek/graph/XmlGraph.java

@@ -31,16 +31,17 @@
 import org.cactoos.map.MapOf;
 import org.cactoos.scalar.Sticky;
 import org.cactoos.scalar.Unchecked;
-import org.cactoos.text.Joined;
 import org.jpeek.skeleton.Skeleton;
 
 /**
  * Graph implementation built on skeleton.
  * @since 0.30.9
- * @todo #441:30min Continue the work started with extracting XmlMethodCall
- *  and XmlMethodArgs and extract more code from this class pertaining
- *  to serializing XML to string. The objective is to have tested classes
- *  and to remove the checkstyle suppression below.
+ * @todo #445:30min Continue the work started with extracting XmlMethodCall,
+ *  XmlMethodArgs and XmlMethodSignature, and extract more code from this class
+ *  pertaining to serializing XML to string. The objective is to have tested
+ *  classes and to remove the checkstyle suppression below. Finally consider
+ *  extracting the whole 'build' method body into a separate class extending
+ *  ListEnvelope.
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
 public final class XmlGraph implements Graph {
@@ -73,28 +74,31 @@ public List<Node> nodes() {
      * @param skeleton XML representation on whiwh to build the graph
      * @return List of nodes
      * @throws IOException If fails
+     * @todo #445:30min This method works only for skeletons with a single
+     *  class because it assigns all methods in the skeleton to the first class
+     *  it finds. Instead, it should iterate through classes and then through
+     *  methods of each class.
      */
     private static List<Node> build(final Skeleton skeleton) throws IOException {
         final Map<XML, Node> byxml = new org.cactoos.map.Sticky<>(
             method -> method,
             method -> new Node.Simple(
-                new Joined(
-                    "", skeleton.xml().xpath("//class/@id").get(0),
-                    ".", method.xpath("@name").get(0),
-                    ".", new XmlMethodArgs(method).asString()
+                new XmlMethodSignature(
+                    skeleton.xml().nodes("//class").get(0),
+                    method
                 ).asString()
             ), skeleton.xml().nodes(
                 "//methods/method[@ctor='false' and @abstract='false']"
             )
         );
         final Map<String, Node> byname = new MapOf<>(
-            node -> node.name(),
+            Node::name,
             node -> node,
             byxml.values()
         );
-        for (final XML method : byxml.keySet()) {
-            final List<XML> calls = method.nodes("ops/op[@code='call']");
-            final Node caller = byxml.get(method);
+        for (final Map.Entry<XML, Node> entry : byxml.entrySet()) {
+            final List<XML> calls = entry.getKey().nodes("ops/op[@code='call']");
+            final Node caller = entry.getValue();
             for (final XML call : calls) {
                 final String name = new XmlMethodCall(call).asString();
                 if (byname.containsKey(name)) {

src/main/java/org/jpeek/graph/XmlMethodArgs.java

@@ -53,7 +53,7 @@ public final class XmlMethodArgs implements Text {
     public String asString() throws IOException {
         return new Joined(
             ":",
-            this.method.xpath("op/args/arg/@type")
+            this.method.xpath("args/arg/@type")
         ).asString();
     }
 }

src/main/java/org/jpeek/graph/XmlMethodCall.java

@@ -53,7 +53,7 @@ public final class XmlMethodCall implements Text {
     public String asString() throws IOException {
         return new Joined(
             "", this.call.xpath("op/name/text()").get(0),
-            ".", new XmlMethodArgs(this.call).asString()
+            ".", new XmlMethodArgs(this.call.nodes("op").get(0)).asString()
         ).asString();
     }
 }

src/main/java/org/jpeek/graph/XmlMethodSignature.java

@@ -0,0 +1,52 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017-2019 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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.
+ */
+package org.jpeek.graph;
+
+import com.jcabi.xml.XML;
+import org.cactoos.text.Joined;
+import org.cactoos.text.TextEnvelope;
+import org.cactoos.text.TextOf;
+
+/**
+ * Text signature of a class method, extracted from XML Skeleton.
+ * @since 0.30.9
+ */
+public final class XmlMethodSignature extends TextEnvelope {
+
+    /**
+     * Ctor.
+     * @param clazz The class element of XML skeleton.
+     * @param method The method element of XML skeleton.
+     */
+    public XmlMethodSignature(final XML clazz, final XML method) {
+        super(
+            new Joined(
+                new TextOf("."),
+                new TextOf(clazz.xpath("./@id").get(0)),
+                new TextOf(method.xpath("@name").get(0)),
+                new XmlMethodArgs(method)
+            )
+        );
+    }
+}

src/test/java/org/jpeek/graph/XmlMethodArgsTest.java

@@ -28,18 +28,17 @@
 import org.hamcrest.core.IsEqual;
 import org.jpeek.FakeBase;
 import org.jpeek.skeleton.Skeleton;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.llorllale.cactoos.matchers.Assertion;
 
 /**
  * Test case for {@link XmlMethodArgs}.
  * @since 0.30.9
  */
-public final class XmlMethodArgsTest {
+final class XmlMethodArgsTest {
 
     @Test
-    public void returnsEmptyStringWhenNoArgsSpecificied() throws IOException {
+    void returnsEmptyStringWhenNoArgsSpecificied() throws IOException {
         final XML method = new Skeleton(new FakeBase("MethodMethodCalls")).xml().nodes(
             "//method[@name='methodOne']"
         ).get(0);
@@ -50,11 +49,8 @@ public void returnsEmptyStringWhenNoArgsSpecificied() throws IOException {
         ).affirm();
     }
 
-    @Disabled
-    // @todo #444:30min This test was disabled because the implementation of XmlMethodArgs
-    //  was modified to comply with what will be done in #437. Wait until #437 is resolved and then
-    //  reenable this test
-    public void givesArgsForMultipleArgs() throws IOException {
+    @Test
+    void givesArgsForMultipleArgs() throws IOException {
         final XML method = new Skeleton(new FakeBase("MethodsWithDiffParamTypes")).xml().nodes(
             "//method[@name='methodThree']"
         ).get(0);

src/test/java/org/jpeek/graph/XmlMethodSignatureTest.java

@@ -0,0 +1,55 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017-2019 Yegor Bugayenko
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * 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.
+ */
+package org.jpeek.graph;
+
+import com.jcabi.xml.XML;
+import org.hamcrest.core.IsEqual;
+import org.jpeek.FakeBase;
+import org.jpeek.skeleton.Skeleton;
+import org.junit.jupiter.api.Test;
+import org.llorllale.cactoos.matchers.Assertion;
+
+/**
+ * Test case for {@link XmlMethodSignature}.
+ * @since 0.30.9
+ */
+final class XmlMethodSignatureTest {
+
+    @Test
+    void givesArgsForMultipleArgs() throws Exception {
+        final XML skeleton = new Skeleton(
+            new FakeBase("MethodsWithDiffParamTypes")
+        ).xml();
+        new Assertion<>(
+            "Must create method signature with multiple arguments.",
+            new XmlMethodSignature(
+                skeleton.nodes("//class").get(0),
+                skeleton.nodes("//method[@name='methodThree']").get(0)
+            ).asString(),
+            new IsEqual<>(
+                "MethodsWithDiffParamTypes.methodThree.Ljava/lang/String:I"
+            )
+        ).affirm();
+    }
+}