#413 - Fixed and enabled tests.

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

@@ -52,7 +52,7 @@ final class Simple implements Node {
         /**
          * Node name.
          */
-        private final String nme;
+        private final String name;
 
         /**
          * Nodes connected to this node.
@@ -64,18 +64,23 @@ final class Simple implements Node {
          * @param name Node name
          */
         public Simple(final String name) {
-            this.nme = name;
+            this.name = name;
             this.connect = new HashSet<Node>(1);
         }
 
         @Override
         public String name() {
-            return this.nme;
+            return this.name;
         }
 
         @Override
         public Set<Node> connections() {
             return this.connect;
         }
+
+        @Override
+        public String toString() {
+            return this.name;
+        }
     }
 }

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

@@ -46,9 +46,8 @@ public final class XmlGraph implements Graph {
     /**
      * Ctor.
      * @param skeleton XMl representation on whiwh to build the graph
-     * @throws IOException If fails
      */
-    public XmlGraph(final Skeleton skeleton) throws IOException {
+    public XmlGraph(final Skeleton skeleton) {
         this.nds = new Unchecked<>(
             new Sticky<>(
                 () -> XmlGraph.build(skeleton)

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

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

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

@@ -23,7 +23,6 @@
  */
 package org.jpeek.graph;
 
-import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import org.cactoos.list.ListOf;
@@ -32,54 +31,51 @@
 import org.hamcrest.core.AllOf;
 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;
 import org.llorllale.cactoos.matchers.HasValues;
 import org.llorllale.cactoos.matchers.HasValuesMatching;
 
 /**
  * Test case for {@link XmlGraph}.
  * @since 0.30.9
- * @todo #413:30min In #413 we evolved graph connection building to take into account overloaded
- *  method differentiation as stated in #403. Wait until #403 is fully resolved (for now, it still
- *  has the puzzle #437) and then activate back the 2 tests in this class.
  * @checkstyle ClassDataAbstractionCouplingCheck (500 lines)
  */
-public final class XmlGraphTest {
+final class XmlGraphTest {
 
     /**
      * First method name.
      */
-    private static final String METHOD_ONE = "MethodMethodCalls.methodOne";
+    private static final String METHOD_ONE = "MethodMethodCalls.methodOne.";
 
     /**
      * Second method name.
      */
-    private static final String METHOD_TWO = "MethodMethodCalls.methodTwo";
+    private static final String METHOD_TWO = "MethodMethodCalls.methodTwo.";
 
     /**
      * Third method name.
      */
-    private static final String METHOD_THREE = "MethodMethodCalls.methodThree";
+    private static final String METHOD_THREE = "MethodMethodCalls.methodThree.";
 
     /**
      * Fourth method name.
      */
-    private static final String METHOD_FOUR = "MethodMethodCalls.methodFour";
+    private static final String METHOD_FOUR = "MethodMethodCalls.methodFour.";
 
     /**
      * Fifth method name.
      */
-    private static final String METHOD_FIVE = "MethodMethodCalls.methodFive";
+    private static final String METHOD_FIVE = "MethodMethodCalls.methodFive.";
 
     /**
      * Class name.
      */
     private static final String CLASS_NAME = "MethodMethodCalls";
 
-    @Disabled
     @SuppressWarnings("unchecked")
-    public void buildsMethodsAsNodes() throws IOException {
+    @Test
+    void buildsMethodsAsNodes() {
         final List<Node> nodes = new XmlGraph(
             new Skeleton(new FakeBase(XmlGraphTest.CLASS_NAME))
         ).nodes();
@@ -89,39 +85,29 @@ public void buildsMethodsAsNodes() throws IOException {
             new AllOf<Iterable<Node>>(
                 new ListOf<>(
                     new HasValuesMatching<>(
-                        node -> {
-                            return node.name().equals(XmlGraphTest.METHOD_ONE);
-                        }
+                        node -> node.name().equals(XmlGraphTest.METHOD_ONE)
                     ),
                     new HasValuesMatching<>(
-                        node -> {
-                            return node.name().equals(XmlGraphTest.METHOD_TWO);
-                        }
+                        node -> node.name().equals(XmlGraphTest.METHOD_TWO)
                     ),
                     new HasValuesMatching<>(
-                        node -> {
-                            return node.name().equals(XmlGraphTest.METHOD_THREE);
-                        }
+                        node -> node.name().equals(XmlGraphTest.METHOD_THREE)
                     ),
                     new HasValuesMatching<>(
-                        node -> {
-                            return node.name().equals(XmlGraphTest.METHOD_FOUR);
-                        }
+                        node -> node.name().equals(XmlGraphTest.METHOD_FOUR)
                     ),
                     new HasValuesMatching<>(
-                        node -> {
-                            return node.name().equals(XmlGraphTest.METHOD_FIVE);
-                        }
+                        node -> node.name().equals(XmlGraphTest.METHOD_FIVE)
                     )
                 )
             )
         ).affirm();
     }
 
-    @Disabled
-    public void buildsConnections() throws IOException {
+    @Test
+    void buildsConnections() {
         final Map<String, Node> byname = new MapOf<>(
-            node -> node.name(),
+            Node::name,
             node -> node,
             new XmlGraph(
                 new Skeleton(new FakeBase(XmlGraphTest.CLASS_NAME))
@@ -135,27 +121,27 @@ public void buildsConnections() throws IOException {
         new Assertion<>(
             "Must build nodes connections when called",
             one.connections(),
-            new HasValues<Node>(two)
+            new HasValues<>(two)
         ).affirm();
         new Assertion<>(
             "Must build nodes connections when called or calling",
             two.connections(),
-            new HasValues<Node>(one, four)
+            new HasValues<>(one, four)
         ).affirm();
         new Assertion<>(
             "Must build nodes connections when neither called nor calling",
             three.connections(),
-            new IsEmptyCollection<Node>()
+            new IsEmptyCollection<>()
         ).affirm();
         new Assertion<>(
             "Must build nodes connections when calling",
             four.connections(),
-            new HasValues<Node>(two)
+            new HasValues<>(two)
         ).affirm();
         new Assertion<>(
             "Must build nodes connections when throwing",
             five.connections(),
-            new IsEmptyCollection<Node>()
+            new IsEmptyCollection<>()
         ).affirm();
     }
 }

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

@@ -52,7 +52,7 @@ void hasClassMethodAndArgs() throws IOException {
                         "  </args>",
                         "</op>"
                     ).asString()
-                )
+                ).nodes("//op").get(0)
             ).asString(),
             new IsEqual<>(
                 "OverloadMethods.methodOne.Ljava/lang/String:Z"