Add binary attachment unit test (failing)

Author: brianjmiller

src/main/java/com/rusticisoftware/tincan/Attachment.java

@@ -29,11 +29,11 @@
 import com.rusticisoftware.tincan.http.HTTPPart;
 import com.rusticisoftware.tincan.json.JSONBase;
 import com.rusticisoftware.tincan.json.Mapper;
+import org.apache.commons.codec.binary.Hex;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.apache.commons.codec.binary.Hex;
 
 /**
  * Attachment Class
@@ -96,7 +96,6 @@ public Attachment(JsonNode jsonNode, byte[] content) throws URISyntaxException,
         }
     }
 
-
     public void setContent(byte[] content) throws NoSuchAlgorithmException {
         this.content = Arrays.copyOf(content, content.length);
         this.setLength(content.length);

src/main/java/com/rusticisoftware/tincan/RemoteLRS.java

@@ -15,13 +15,10 @@
 */
 package com.rusticisoftware.tincan;
 
-import javax.servlet.MultipartConfigElement;
-import javax.servlet.http.Part;
 import org.apache.commons.codec.binary.Base64;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.rusticisoftware.tincan.documents.ActivityProfileDocument;
 import com.rusticisoftware.tincan.documents.AgentProfileDocument;
 import com.rusticisoftware.tincan.documents.Document;
@@ -37,10 +34,7 @@
 import com.rusticisoftware.tincan.v10x.StatementsQuery;
 import org.eclipse.jetty.client.api.ContentResponse;
 import org.eclipse.jetty.client.api.Request;
-import org.eclipse.jetty.client.api.Response;
 import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Response.CompleteListener;
-import org.eclipse.jetty.client.api.Response.Listener;
 import org.eclipse.jetty.client.util.*;
 import org.eclipse.jetty.http.HttpField;
 import org.eclipse.jetty.http.HttpMethod;
@@ -53,9 +47,7 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.net.URLEncoder;
-import java.nio.ByteBuffer;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 /**
  * Class used to communicate with a TCAPI endpoint synchronously

src/test/java/com/rusticisoftware/tincan/RemoteLRSTest.java

@@ -15,7 +15,8 @@
 */
 package com.rusticisoftware.tincan;
 
-
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.net.MalformedURLException;
 import java.net.URI;
@@ -30,10 +31,8 @@
 
 import lombok.extern.java.Log;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
 
 import org.apache.commons.codec.binary.Hex;
 import org.joda.time.Period;
@@ -57,6 +56,7 @@ public class RemoteLRSTest {
     private static SubStatement subStatement;
     private static Attachment attachment1;
     private static Attachment attachment2;
+    private static Attachment attachment3;
 
     private static Properties config = new Properties();
 
@@ -142,6 +142,35 @@ public static void Init() throws Exception {
         attachment2.setDisplay(new LanguageMap());
         attachment2.getDisplay().put("en-US", "Test Display 2");
         attachment2.setUsageType(new URI("http://id.tincanapi.com/attachment/supporting_media"));
+
+
+        attachment3 = new Attachment();
+        attachment3.setContent(getResourceAsByteArray("/files/image.jpg"));
+        attachment3.setContentType("image/jpeg");
+        attachment3.setDescription(new LanguageMap());
+        attachment3.getDescription().put("en-US", "Test Description 3");
+        attachment3.setDisplay(new LanguageMap());
+        attachment3.getDisplay().put("en-US", "Test Display 3");
+        attachment3.setUsageType(new URI("http://id.tincanapi.com/attachment/supporting_media"));
+    }
+
+    //
+    // see http://stackoverflow.com/a/1264737/1464957
+    //
+    private static byte[] getResourceAsByteArray(String resourcePath) throws IOException {
+        InputStream resourceIs = RemoteLRSTest.class.getResourceAsStream(resourcePath);
+        ByteArrayOutputStream resourceData = new ByteArrayOutputStream();
+
+        int nRead;
+        byte[] buffer = new byte[16384];
+
+        while ((nRead = resourceIs.read(buffer, 0, buffer.length)) != -1) {
+            resourceData.write(buffer, 0, nRead);
+        }
+
+        resourceData.flush();
+
+        return resourceData.toByteArray();
     }
 
     @Test
@@ -446,6 +475,33 @@ public void testRetrieveStatementWithAttachment() throws Exception {
         Assert.assertEquals(hash1, hash2);
     }
 
+    @Test
+    public void testRetrieveStatementWithBinaryAttachment() throws Exception {
+        Statement statement = new Statement();
+        statement.setActor(agent);
+        statement.setVerb(verb);
+        statement.setObject(activity);
+        statement.addAttachment(attachment3);
+
+        StatementLRSResponse saveRes = lrs.saveStatement(statement);
+        Assert.assertTrue(saveRes.getSuccess());
+
+        StatementLRSResponse retRes = lrs.retrieveStatement(saveRes.getContent().getId().toString(), true);
+        Assert.assertTrue(retRes.getSuccess());
+
+        String hash1, hash2;
+        MessageDigest digest = MessageDigest.getInstance("SHA-256");
+        digest.update(attachment3.getContent());
+        byte[] hash = digest.digest();
+        hash1 = new String(Hex.encodeHex(hash));
+
+        digest.update(retRes.getContent().getAttachments().get(0).getContent());
+        hash = digest.digest();
+        hash2 = new String(Hex.encodeHex(hash));
+
+        Assert.assertEquals(hash1, hash2);
+    }
+
     @Test
     public void testQueryStatements() throws Exception {
         StatementsQuery query = new StatementsQuery();