commit 2d7ee8d51ee6b5bf81071134f6ed753cc8841a31
author andrewsbrown <andrew.brown@intel.com> Wed Apr 15 12:40:58 2015 -0700
committer andrewsbrown <andrew.brown@intel.com> Wed Apr 15 12:40:58 2015 -0700
tree 653bf1687fbd5337d68fc7e22554cf205dffdcb0
parent 300cd3ca9112fd7920f68c4918d7b273ff2745b7

Add packet names to logging messages

src/test/java/com/intel/jndn/utils/SegmentedClientTest.java

diff --git a/src/test/java/com/intel/jndn/utils/SegmentedClientTest.java b/src/test/java/com/intel/jndn/utils/SegmentedClientTest.java
index 11f17a9..319ee6a 100644
--- a/src/test/java/com/intel/jndn/utils/SegmentedClientTest.java
+++ b/src/test/java/com/intel/jndn/utils/SegmentedClientTest.java
@@ -14,7 +14,6 @@
 package com.intel.jndn.utils;
 
 import com.intel.jndn.mock.MockFace;
-import com.intel.jndn.mock.MockTransport;
 import com.intel.jndn.utils.client.SegmentedFutureData;
 import java.io.IOException;
 import java.util.List;
@@ -22,7 +21,6 @@
 import java.util.concurrent.Future;
 import java.util.logging.Logger;
 import net.named_data.jndn.Data;
-import net.named_data.jndn.Face;
 import net.named_data.jndn.Interest;
 import net.named_data.jndn.Name;
 import net.named_data.jndn.Name.Component;
@@ -42,9 +40,9 @@
 
   private static final Logger logger = Logger.getLogger(SimpleClient.class.getName());
   private MockFace face;
-  
+
   @Before
-  public void beforeTest(){
+  public void beforeTest() {
     face = new MockFace();
   }
 
@@ -143,6 +141,28 @@
   }
 
   /**
+   * Verify that segmented content is the correct length when retrieved by the
+   * client.
+   *
+   * @throws Exception
+   */
+  @Test
+  public void testContentLength() throws Exception {
+    Data data1 = new Data(new Name("/test/content-length").appendSegment(0));
+    data1.setContent(new Blob("0123456789"));
+    data1.getMetaInfo().setFinalBlockId(Name.Component.fromNumberWithMarker(1, 0x00));
+    face.addResponse(data1.getName(), data1);
+    
+    Data data2 = new Data(new Name("/test/content-length").appendSegment(1));
+    data2.setContent(new Blob("0123456789"));
+    data1.getMetaInfo().setFinalBlockId(Name.Component.fromNumberWithMarker(1, 0x00));
+    face.addResponse(data2.getName(), data2);
+
+    Future<Data> result = SegmentedClient.getDefault().getAsync(face, new Name("/test/content-length").appendSegment(0));
+    assertEquals(20, result.get().getContent().size());
+  }
+
+  /**
    * If a Data packet does not have a FinalBlockId, the SegmentedClient should
    * just return the packet.
    *