[#79] Failure with recursive add with binary in sub directory

tdiesler · tdiesler · commit 7efe0b69dcb7 · 2018-07-17T21:22:30.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
+.classpath
+.project
+.settings
+.DS_Store
 *.class
 *.log
 dist/*
diff --git a/README.md b/README.md
@@ -38,7 +38,7 @@ for Maven, add the following sections to your pom.xml (replacing $LATEST_VERSION
 
   <dependencies>
     <dependency>
-      <groupId>com.github.ipfs</groupId>
+      <groupId>io.ipfs</groupId>
       <artifactId>java-ipfs-api</artifactId>
       <version>$LATEST_VERSION</version>
     </dependency>
@@ -49,7 +49,7 @@ for Maven, add the following sections to your pom.xml (replacing $LATEST_VERSION
 
 * Clone this repository
 * Run `ant dist`
-* Copy `dist/ipfs.jar` into your project. Appropriate versions of other [dependencies](#Dependencies) are also included in `dist/lib/`.
+* Copy `dist/ipfs.jar` into your project. Appropriate versions of other [dependencies](#dependencies) are also included in `dist/lib/`.
 * Run tests using `ant test`.
 
 ### Running tests
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>io.ipfs</groupId>
 	<artifactId>api</artifactId>
-	<version>v1.2.0</version>
+	<version>v1.2.1-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>java-ipfs-api</name>
diff --git a/src/test/java/io/ipfs/api/APITest.java b/src/test/java/io/ipfs/api/APITest.java
@@ -585,6 +585,7 @@ public void fileContentsTest() throws IOException {
     }
 
     @Test
+    @Ignore("name test may hang forever")
     public void nameTest() throws IOException {
         MerkleNode pointer = new MerkleNode("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");
         Map pub = ipfs.name.publish(pointer.hash);
@@ -605,6 +606,7 @@ public void mountTest() throws IOException {
     }
 
     @Test
+    @Ignore("dht test may hang forever")
     public void dhtTest() throws IOException {
         Multihash pointer = Multihash.fromBase58("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");
         Map get = ipfs.dht.get(pointer);
diff --git a/src/test/java/io/ipfs/api/RecursiveAddTest.java b/src/test/java/io/ipfs/api/RecursiveAddTest.java
@@ -0,0 +1,26 @@
+package io.ipfs.api;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import io.ipfs.multiaddr.MultiAddress;
+
+public class RecursiveAddTest {
+
+    private final IPFS ipfs = new IPFS(new MultiAddress("/ip4/127.0.0.1/tcp/5001"));
+    
+    @Test
+    public void testAdd() throws Exception {
+        
+        String TEST_HASH = "QmWVMRbFTrA6pMhsfXzsyoWqmrhy5FPd4VitfX79R5bguw";
+        
+        System.out.println("ipfs version: " + ipfs.version());
+        
+        Path path = Paths.get("src/test/resources/html");
+        MerkleNode node = ipfs.add(new NamedStreamable.FileWrapper(path.toFile())).get(0);
+        Assert.assertEquals(TEST_HASH, node.hash.toBase58());
+    }
+}
diff --git a/src/test/resources/html/README.html b/src/test/resources/html/README.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./css/default.css">
+</head>
+<body>
+<p><img src="img/logo.png" alt="logo" /> <a href="README.html">Home</a></p>
+<p><a href="chap/ch01.html">chapter one</a></p>
+</body>
+</html>
diff --git a/src/test/resources/html/chap/ch01.html b/src/test/resources/html/chap/ch01.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <title>IPFS</title>
+    <meta charset="utf-8" />
+    <link rel="stylesheet" href="./../css/default.css">
+</head>
+<body>
+<p><img src="../img/logo.png" alt="logo" /> <a href="../README.html">Home</a></p>
+<h2>Chapter 01</h2>
+<p>Yada yada</p>
+</body>
+</html>
diff --git a/src/test/resources/html/css/default.css b/src/test/resources/html/css/default.css
@@ -0,0 +1,38 @@
+body {
+    font-family: "Verdana";
+    color: #137cb9
+}
+
+a {
+    #text-decoration: none;
+    color: #137cb9
+}
+
+a.gray {
+    color: gray;
+}
+
+h1 {
+	font-weight: normal;
+    font-size: 20px;
+}
+
+h2 {
+    font-weight: normal;
+	font-size: 15px;
+}
+
+th {
+	text-align: left;
+    font-weight: normal;
+    font-size: 14px;
+    color: gray;
+}
+
+td.gray {
+    color: gray;
+}
+tr.gray {
+    color: gray;
+}
+
diff --git a/src/test/resources/html/img/logo.png b/src/test/resources/html/img/logo.png

Original file line number	Diff line number	Diff line change
`@@ -585,6 +585,7 @@ public void fileContentsTest() throws IOException {`
`585`	`585`	`}`
`586`	`586`
`587`	`587`	`@Test`
	`588`	`+ @Ignore("name test may hang forever")`
`588`	`589`	`public void nameTest() throws IOException {`
`589`	`590`	`MerkleNode pointer = new MerkleNode("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");`
`590`	`591`	`Map pub = ipfs.name.publish(pointer.hash);`
`@@ -605,6 +606,7 @@ public void mountTest() throws IOException {`
`605`	`606`	`}`
`606`	`607`
`607`	`608`	`@Test`
	`609`	`+ @Ignore("dht test may hang forever")`
`608`	`610`	`public void dhtTest() throws IOException {`
`609`	`611`	`Multihash pointer = Multihash.fromBase58("QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB");`
`610`	`612`	`Map get = ipfs.dht.get(pointer);`