commit 37cec24748ae49a4521287bf28a0d7ca47e2aad9
author Andrew Brown <andrew.brown@intel.com> Mon May 11 14:24:13 2015 -0700
committer Andrew Brown <andrew.brown@intel.com> Mon May 11 14:24:13 2015 -0700
tree dfb3cb267be81dec3a6f766b9c8bb16a36c19f2d
parent 776184ee08701dcf6c3a36958f20dc2d047c50b2

Fix strategy encoding; NFD returns a dataset with the ControlParameters encoding of a strategy

src/test/java/com/intel/jndn/management/StrategyTestIT.java

diff --git a/src/test/java/com/intel/jndn/management/StrategyTestIT.java b/src/test/java/com/intel/jndn/management/StrategyTestIT.java
index 3c63dd7..c0abd14 100644
--- a/src/test/java/com/intel/jndn/management/StrategyTestIT.java
+++ b/src/test/java/com/intel/jndn/management/StrategyTestIT.java
@@ -15,8 +15,8 @@
 
 import com.intel.jndn.management.types.StrategyChoice;
 import com.intel.jndn.mock.MockKeyChain;
-import com.intel.jndn.utils.SegmentedServer;
 import java.util.List;
+import java.util.Random;
 import java.util.logging.Logger;
 import static junit.framework.Assert.assertEquals;
 import net.named_data.jndn.Face;
@@ -36,7 +36,7 @@
   Face face;
 
   public StrategyTestIT() throws net.named_data.jndn.security.SecurityException {
-    this.prefix = new Name("/test/strategy");
+    this.prefix = new Name("/test/strategy").append("random:" + new Random().nextInt());
     this.face = new Face("localhost"); // strategy commands only available on localhost
     KeyChain mockKeyChain = MockKeyChain.configure(new Name("/test/server"));
     face.setCommandSigningInfo(mockKeyChain, mockKeyChain.getDefaultCertificateName());
@@ -48,6 +48,8 @@
     int oldSize = choices.size();
 
     NFD.setStrategy(face, prefix, Strategies.CLIENT_CONTROL);
+    Thread.sleep(1000); // strategy takes a while to register
+
     choices = NFD.getStrategyList(face);
     assertEquals(oldSize + 1, choices.size());
 

src/test/java/com/intel/jndn/management/types/StrategyChoiceTest.java

diff --git a/src/test/java/com/intel/jndn/management/types/StrategyChoiceTest.java b/src/test/java/com/intel/jndn/management/types/StrategyChoiceTest.java
index a7323a0..1b2ab64 100644
--- a/src/test/java/com/intel/jndn/management/types/StrategyChoiceTest.java
+++ b/src/test/java/com/intel/jndn/management/types/StrategyChoiceTest.java
@@ -21,16 +21,15 @@
 import org.junit.Test;
 
 /**
+ * Test StrategyCHoice encoding/decoding
  *
  * @author Andrew Brown <andrew.brown@intel.com>
  */
 public class StrategyChoiceTest {
 
-  public StrategyChoiceTest() {
-  }
-
   /**
    * Test of wireEncode method, of class StrategyChoice.
+   * @throws net.named_data.jndn.encoding.EncodingException
    */
   @Test
   public void testEncodeDecode() throws EncodingException {