Test case for SequenceIDIterator added.

diff --git a/.gitattributes b/.gitattributes
index d3b0c2db22c41e97f051afaedbb4df220f7b04c6..b777e5c2d3624bc23e675dc42b58c032d616db92 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1991,5 +1991,6 @@ eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/
 eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/CDMSequenceMatrixAdapter.java -text
 eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/ExportSingleReadAlignmentWizardPage.java -text
 eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java -text
+eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIteratorTest.java -text
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours
 eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours

diff --git a/eu.etaxonomy.taxeditor.molecular/.classpath b/eu.etaxonomy.taxeditor.molecular/.classpath
index 60dea2f68d1f381ff10da83942a19d76d08ab4e8..6bca977bed3b6d2bc7f202c8a811de4878f0c42b 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/.classpath
+++ b/eu.etaxonomy.taxeditor.molecular/.classpath
@@ -3,5 +3,6 @@
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+       <classpathentry kind="src" path="src/test/java"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/eu.etaxonomy.taxeditor.molecular/.gitignore b/eu.etaxonomy.taxeditor.molecular/.gitignore
index 15df7649cca0f956188580cd62ad1db69dcb8200..29eb2f8cf13938350b6fb67ad0869eddce05a473 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/.gitignore
+++ b/eu.etaxonomy.taxeditor.molecular/.gitignore
@@ -6,3 +6,45 @@
 !src/main/java/eu/etaxonomy/taxeditor/molecular/io/.directory
 !src/main/java/eu/etaxonomy/taxeditor/molecular/io/hibernate.log
 !src/main/java/eu/etaxonomy/taxeditor/molecular/io/.settings
+!src/test/java/eu/etaxonomy/taxeditor/molecular/io/.project
+!src/test/java/eu/etaxonomy/taxeditor/molecular/io/integration-test.log
+!src/test/java/eu/etaxonomy/taxeditor/molecular/io/target
+!src/test/java/eu/etaxonomy/taxeditor/molecular/io/.directory
+!src/test/java/eu/etaxonomy/taxeditor/molecular/io/hibernate.log
+!src/test/java/eu/etaxonomy/taxeditor/molecular/io/.settings
+!src/test/java/eu/etaxonomy/taxeditor/molecular/.project
+!src/test/java/eu/etaxonomy/taxeditor/molecular/integration-test.log
+!src/test/java/eu/etaxonomy/taxeditor/molecular/target
+!src/test/java/eu/etaxonomy/taxeditor/molecular/.directory
+!src/test/java/eu/etaxonomy/taxeditor/molecular/hibernate.log
+!src/test/java/eu/etaxonomy/taxeditor/molecular/.settings
+!src/test/java/eu/etaxonomy/taxeditor/.project
+!src/test/java/eu/etaxonomy/taxeditor/integration-test.log
+!src/test/java/eu/etaxonomy/taxeditor/target
+!src/test/java/eu/etaxonomy/taxeditor/.directory
+!src/test/java/eu/etaxonomy/taxeditor/hibernate.log
+!src/test/java/eu/etaxonomy/taxeditor/.settings
+!src/test/java/eu/etaxonomy/.project
+!src/test/java/eu/etaxonomy/integration-test.log
+!src/test/java/eu/etaxonomy/target
+!src/test/java/eu/etaxonomy/.directory
+!src/test/java/eu/etaxonomy/hibernate.log
+!src/test/java/eu/etaxonomy/.settings
+!src/test/java/eu/.project
+!src/test/java/eu/integration-test.log
+!src/test/java/eu/target
+!src/test/java/eu/.directory
+!src/test/java/eu/hibernate.log
+!src/test/java/eu/.settings
+!src/test/java/.project
+!src/test/java/integration-test.log
+!src/test/java/target
+!src/test/java/.directory
+!src/test/java/hibernate.log
+!src/test/java/.settings
+!src/test/.project
+!src/test/integration-test.log
+!src/test/target
+!src/test/.directory
+!src/test/hibernate.log
+!src/test/.settings

diff --git a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java
index 75e750b6874af49d1901699e5f16a295ae26f025..74f8ece8c262ce13499763d621ba2d47f15d08bb 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java
+++ b/eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java
@@ -20,7 +20,7 @@ import java.util.NoSuchElementException;
  * @author Ben Stöver\r
  * @date 29.04.2016\r
  */\r
-public class SequenceIDIterator implements Iterator<String> {\r
+class SequenceIDIterator implements Iterator<String> {\r
     private int singleReadPos;\r
     private int singleReadCount;\r
 \r

diff --git a/eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIteratorTest.java b/eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIteratorTest.java
new file mode 100644 (file)
index 0000000..23cf9f1
--- /dev/null
+++ b/eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIteratorTest.java
@@ -0,0 +1,41 @@
+// $Id$\r
+/**\r
+* Copyright (C) 2016 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+package eu.etaxonomy.taxeditor.molecular.io;\r
+\r
+\r
+import static org.junit.Assert.assertEquals;\r
+import static org.junit.Assert.assertFalse;\r
+import static org.junit.Assert.assertTrue;\r
+\r
+import org.junit.Test;\r
+\r
+\r
+\r
+/**\r
+ * @author bstoe_01\r
+ * @date 29.04.2016\r
+ *\r
+ */\r
+public class SequenceIDIteratorTest {\r
+    //TODO Why can't this class access SequenceIDIterator from here? (Workaround: Copy to molecular projekt to run test.)\r
+\r
+    @Test\r
+    public void test_next() {\r
+        SequenceIDIterator iterator = new SequenceIDIterator(3);\r
+\r
+        for (int i = 0; i < 3; i++) {\r
+            assertTrue(iterator.hasNext());\r
+            assertEquals("seqSingleRead" + i, iterator.next());\r
+        }\r
+        assertTrue(iterator.hasNext());\r
+        assertEquals("seqConsensus", iterator.next());\r
+        assertFalse(iterator.hasNext());\r
+    }\r
+}\r