--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/tests/gov/nasa/jpf/vm/choice/IntChoiceFromSetTest.java	Fri Jan 23 10:14:01 2015 -0800
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2014, United States Government, as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All rights reserved.
+ *
+ * The Java Pathfinder core (jpf-core) platform is licensed under the
+ * Apache License, Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the License at
+ * 
+ *        http://www.apache.org/licenses/LICENSE-2.0. 
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and 
+ * limitations under the License.
+ */
+
+package gov.nasa.jpf.vm.choice;
+
+import gov.nasa.jpf.util.test.TestJPF;
+import gov.nasa.jpf.vm.ChoiceGenerator;
+import gov.nasa.jpf.vm.choice.IntChoiceFromSet;
+
+import org.junit.Test;
+
+/**
+ * unit test for IntChoiceFromSet
+ */
+public class IntChoiceFromSetTest extends TestJPF {
+
+  private void testSetContents(ChoiceGenerator<Integer> cg) {
+    cg.advance();
+    assertTrue (cg.hasMoreChoices());
+    assertEquals ((int)cg.getNextChoice(), 1);
+    cg.advance();
+    assertTrue (cg.hasMoreChoices());
+    assertEquals ((int)cg.getNextChoice(), 2);
+    cg.advance();
+    assertTrue (cg.hasMoreChoices());
+    assertEquals ((int)cg.getNextChoice(), 3);
+    cg.advance();
+    assertFalse (cg.hasMoreChoices());
+    assertEquals ((int)cg.getNextChoice(), 4);
+  }
+
+  @Test
+  public void testSetWithOutDuplicates() {
+    IntChoiceFromSet cg = new IntChoiceFromSet("test", 1, 2, 3, 4);
+    testSetContents(cg);
+  }
+
+  @Test
+  public void testSetWithDuplicates() {
+    IntChoiceFromSet cg = new IntChoiceFromSet("test1", 1, 2, 3, 4, 4, 4);
+    testSetContents(cg);
+  }
+
+  @Test
+  public void testSetWithDuplicates2() {
+    IntChoiceFromSet cg = new IntChoiceFromSet("test2", 1, 2, 1, 2, 1, 2);
+    cg.advance();
+    assertTrue (cg.hasMoreChoices());
+    assertEquals ((int)cg.getNextChoice(), 1);
+    cg.advance();
+    assertFalse (cg.hasMoreChoices());
+    assertEquals ((int)cg.getNextChoice(), 2);
+  }
+}