Fix UTs

Author: cstamas

src/main/java/io/ipfs/api/IPFS.java

@@ -832,7 +832,7 @@ public List<MultiAddress> add() throws IOException {
         }
 
         public List<MultiAddress> list() throws IOException {
-            return ((List<String>)retrieveMap("bootstrap/list").get("Peers"))
+            return ((List<String>)retrieveMap("bootstrap/list?expand-auto=true").get("Peers"))
                     .stream().map(x -> new MultiAddress(x)).collect(Collectors.toList());
         }
 

src/main/java/io/ipfs/api/Peer.java

@@ -27,8 +27,15 @@ public static Peer fromJSON(Object json) {
             throw new IllegalStateException("Incorrect json for Peer: " + JSONParser.toString(json));
         Map m = (Map) json;
         Function<String, String> val = key -> (String) m.get(key);
-        long latency = val.apply("Latency").length() > 0 ? Long.parseLong(val.apply("Latency")) : -1;
-        return new Peer(new MultiAddress(val.apply("Addr")), Cid.decode(val.apply("Peer")), latency, val.apply("Muxer"), val.apply("Streams"));
+        String peerId = val.apply("Peer");
+        Multihash peer; // Multihash bug? Throws IAEx Base1 not supported
+        try {
+            peer = Multihash.fromBase58(peerId);
+        } catch (Exception e) {
+            peer = Multihash.decode(peerId);
+        }
+        long latency = m.containsKey("Latency") ? Long.parseLong(val.apply("Latency")) : -1;
+        return new Peer(new MultiAddress(val.apply("Addr")), peer, latency, val.apply("Muxer"), val.apply("Streams"));
     }
 
     @Override

src/test/java/io/ipfs/api/APITest.java

@@ -7,6 +7,7 @@
 import org.junit.*;
 
 import java.io.*;
+import java.nio.charset.StandardCharsets;
 import java.nio.file.*;
 import java.util.*;
 import java.util.function.*;
@@ -396,31 +397,40 @@ public void rawLeafNodePinUpdate() throws IOException {
 
     @Test
     public void indirectPinTest() throws IOException {
-        Multihash EMPTY = ipfs.object._new(Optional.empty()).hash;
-        io.ipfs.api.MerkleNode data = ipfs.object.patch(EMPTY, "set-data", Optional.of("childdata".getBytes()), Optional.empty(), Optional.empty());
-        Multihash child = data.hash;
+        String path = "/test/indirectPinTest-" + UUID.randomUUID();
+        ipfs.files.write(path + "/content", new NamedStreamable.ByteArrayWrapper("something".getBytes(StandardCharsets.UTF_8)), true, true);
+        Multihash content = Multihash.decode((String) ipfs.files.stat(path + "/content").get("Hash"));
 
-        io.ipfs.api.MerkleNode tmp1 = ipfs.object.patch(EMPTY, "set-data", Optional.of("parent1_data".getBytes()), Optional.empty(), Optional.empty());
-        Multihash parent1 = ipfs.object.patch(tmp1.hash, "add-link", Optional.empty(), Optional.of(child.toString()), Optional.of(child)).hash;
-        ipfs.pin.add(parent1);
+        // adding one more extra entry to parent1 to keep its hash different from parent2
+        ipfs.files.mkdir(path + "/parent1", true);
+        ipfs.files.write(path + "/parent1/content1", new NamedStreamable.ByteArrayWrapper("somethingelse".getBytes(StandardCharsets.UTF_8)), true, true);
+        ipfs.files.cp("/ipfs/" + content, path + "/parent1/content2", true);
+
+        ipfs.files.mkdir(path + "/parent2", true);
+        ipfs.files.cp("/ipfs/" + content, path + "/parent2/content", true);
 
-        io.ipfs.api.MerkleNode tmp2 = ipfs.object.patch(EMPTY, "set-data", Optional.of("parent2_data".getBytes()), Optional.empty(), Optional.empty());
-        Multihash parent2 = ipfs.object.patch(tmp2.hash, "add-link", Optional.empty(), Optional.of(child.toString()), Optional.of(child)).hash;
+        Multihash parent1 = Multihash.decode((String) ipfs.files.stat(path + "/parent1").get("Hash"));
+        Multihash parent2 = Multihash.decode((String) ipfs.files.stat(path + "/parent2").get("Hash"));
+
+        ipfs.pin.add(parent1);
         ipfs.pin.add(parent2);
         ipfs.pin.rm(parent1, true);
 
         Map<Multihash, Object> ls = ipfs.pin.ls(IPFS.PinType.all);
-        boolean childPresent = ls.containsKey(child);
+        boolean childPresent = ls.containsKey(content);
         if (!childPresent)
-            throw new IllegalStateException("Child not present!");
+            throw new IllegalStateException("Child not present: " + ls);
 
         ipfs.repo.gc();
         Map<Multihash, Object> ls2 = ipfs.pin.ls(IPFS.PinType.all);
-        boolean childPresentAfterGC = ls2.containsKey(child);
+        boolean childPresentAfterGC = ls2.containsKey(content);
         if (!childPresentAfterGC)
-            throw new IllegalStateException("Child not present!");
-}
+            throw new IllegalStateException("Child not present:" + ls);
 
+        ipfs.files.rm(path, true, true);
+    }
+
+    @Ignore("RPC API removed")
     @Test
     public void objectPatch() throws IOException {
         MerkleNode obj = ipfs.object._new(Optional.empty());
@@ -462,6 +472,7 @@ public void refsTest() throws IOException {
         }
     }
 
+    @Ignore("RPC API removed")
     @Test
     public void objectTest() throws IOException {
         MerkleNode _new = ipfs.object._new(Optional.empty());
@@ -489,10 +500,8 @@ public void bulkBlockTest() throws IOException {
         List<MerkleNode> bulkPut = ipfs.block.put(Arrays.asList(raw, raw, raw, raw, raw), Optional.of("cbor"));
         List<Multihash> hashes = bulkPut.stream().map(m -> m.hash).collect(Collectors.toList());
         byte[] result = ipfs.block.get(hashes.get(0));
-        System.out.println();
     }
 
-//    @Ignore // Ignored because ipfs frequently times out internally in the publish call
     @Test
     public void publish() throws Exception {
         // JSON document
@@ -514,6 +523,15 @@ public void publish() throws Exception {
         assertEquals("Should be equals", resolved, "/ipfs/" + merkleNode.hash);
     }
 
+    @Test
+    public void resolveName() throws Exception {
+        // Resolve from DNSLinked domain
+        String resolved = ipfs.name.resolve("docs.ipfs.tech");
+        assertNotNull(resolved);
+        assertTrue(resolved.startsWith("/ipfs/"));
+        assertTrue(resolved.length() > 20); // this may change (content and encoding as well)
+    }
+
     @Test
     public void pubsubSynchronous() {
         String topic = "topic" + System.nanoTime();
@@ -587,7 +605,6 @@ public void merkleLinkInMap() throws IOException {
         // These commands can be used to reproduce this on the command line
         String reproCommand1 = "printf \"" + toEscapedHex(rawTarget) + "\" | ipfs block put --format=cbor";
         String reproCommand2 = "printf \"" + toEscapedHex(rawSource) + "\" | ipfs block put --format=cbor";
-        System.out.println();
     }
 
     @Test
@@ -652,7 +669,6 @@ public void rootMerkleLink() throws IOException {
         // These commands can be used to reproduce this on the command line
         String reproCommand1 = "printf \"" + toEscapedHex(rawTarget) + "\" | ipfs block put --format=cbor";
         String reproCommand2 = "printf \"" + toEscapedHex(obj2) + "\" | ipfs block put --format=cbor";
-        System.out.println();
     }
 
     /**
@@ -672,7 +688,6 @@ public void rootNull() throws IOException {
 
         // These commands can be used to reproduce this on the command line
         String reproCommand1 = "printf \"" + toEscapedHex(obj) + "\" | ipfs block put --format=cbor";
-        System.out.println();
     }
 
     /**
@@ -754,7 +769,6 @@ public void dhtTest() throws IOException {
     @Test
     public void localId() throws Exception {
         Map id = ipfs.id();
-        System.out.println();
     }
 
     @Test
@@ -856,6 +870,8 @@ public void bitswapTest() throws IOException {
         Map stat = ipfs.bitswap.stat();
         Map stat2 = ipfs.bitswap.stat(true);
     }
+
+    @Ignore("AutoConf.Enabled=true is default; prevents bootstrap removal")
     @Test
     public void bootstrapTest() throws IOException {
         List<MultiAddress> bootstrap = ipfs.bootstrap.list();