X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=testsrc%2Fcompbio%2Fdata%2Fsequence%2FSequenceUtilTester.java;h=a4bf4c90c992d89e43a3e65c339867028abfe9e6;hb=a79900255139dc7bcab23320de2a3630f6531107;hp=edb57a49b33254009ec6c7ee5ff070adbc25cfe8;hpb=4d6083e0cf39c4989e08bdaf9384e9d44c0da607;p=jabaws.git

diff --git a/testsrc/compbio/data/sequence/SequenceUtilTester.java b/testsrc/compbio/data/sequence/SequenceUtilTester.java
index edb57a4..a4bf4c9 100644
--- a/testsrc/compbio/data/sequence/SequenceUtilTester.java
+++ b/testsrc/compbio/data/sequence/SequenceUtilTester.java
@@ -24,6 +24,7 @@ import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -149,11 +150,11 @@ public class SequenceUtilTester {
 	/**
 	 * This test tests the loading of horizontally formatted Jronn output file
 	 * 
-	 * First seq 
+	 * First seq
 	 * 
-	 * M	0.86010	0.88512	0.37094
+	 * M 0.86010 0.88512 0.37094
 	 * 
-	 * T	0.79983	0.85864	0.44331
+	 * T 0.79983 0.85864 0.44331
 	 * 
 	 */
 	@SuppressWarnings("unchecked")
@@ -163,18 +164,86 @@ public class SequenceUtilTester {
 		FileInputStream fio;
 		try {
 			fio = new FileInputStream(AllTestSuit.TEST_DATA_PATH
-					+ "scores.out");
-			Map<FastaSequence, Set<Score>> aseqs = SequenceUtil
+					+ "disembl.out");
+			Map<FastaSequence, HashSet<Score>> aseqs = SequenceUtil
 					.readDisembl(fio);
 			assertNotNull(aseqs);
-			assertEquals(aseqs.size(), 3); 
-			System.out.println(aseqs);
-			for(FastaSequence fs: aseqs.keySet()) {
-				assertTrue(" Foobar_dundeefriends Foobar dundeefriends ".contains(fs.getId()));
-				Set<Score> scores = aseqs.get(fs); 
-				assertEquals(scores.size(),3);
+			assertEquals(aseqs.size(), 3);
+			// System.out.println(aseqs);
+			for (FastaSequence fs : aseqs.keySet()) {
+				assertTrue(" Foobar_dundeefriends Foobar dundeefriends "
+						.contains(fs.getId()));
+				Set<Score> scores = aseqs.get(fs);
+				assertEquals(scores.size(), 3);
 			}
-			  fio.close();
+			fio.close();
+		} catch (FileNotFoundException e) {
+			e.printStackTrace();
+			fail(e.getLocalizedMessage());
+		} catch (IOException e) {
+			e.printStackTrace();
+			fail(e.getLocalizedMessage());
+		} catch (UnknownFileFormatException e) {
+			e.printStackTrace();
+			fail(e.getLocalizedMessage());
+		}
+	}
+
+	/**
+	 * This test tests the loading of horizontally formatted Jronn output file
+	 * 
+	 * First sequence:
+	 * 
+	 * >Foobar_dundeefriends
+	 * 
+	 * # GlobDoms 2-358, 373-568
+	 * 
+	 * # Disorder 1-5, 206-218, 243-250, 288-300, 313-324, 359-372, 475-481
+	 * 
+	 * # RESIDUE DYDX RAW SMOOTHED
+	 * 
+	 * M 0.0044 -0.2259 -0.2259
+	 * 
+	 * T -0.1308 -0.2170 -0.2170
+	 * 
+	 * ............
+	 * 
+	 * > Second sequence
+	 */
+	@SuppressWarnings("unchecked")
+	@Test
+	public void testReadGlobPlotResults() {
+
+		FileInputStream fio;
+		try {
+			fio = new FileInputStream(AllTestSuit.TEST_DATA_PATH
+					+ "globplot.out");
+			HashMap<FastaSequence, HashSet<Score>> aseqs = SequenceUtil
+					.readGlobPlot(fio);
+			assertNotNull(aseqs);
+			assertEquals(aseqs.size(), 3);
+
+			FastaSequence fsdf = null;
+			Set<Score> scores = null;
+			for (FastaSequence fs : aseqs.keySet()) {
+				if ("Foobar_dundeefriends".contains(fs.getId())) {
+					fsdf = fs;
+					scores = aseqs.get(fs);
+				}
+				assertEquals(scores.size(), 5);
+			}
+			for (Score score : scores) {
+
+				if (score.getMethod() == (Enum<?>) GlobProtResult.Disorder) {
+					assertEquals(score.getRanges().size(), 7);
+					assertTrue(score.getScores().isEmpty());
+				}
+				if (score.getMethod() == (Enum<?>) GlobProtResult.Dydx) {
+					assertFalse(score.getScores().isEmpty());
+					assertTrue(score.getRanges().isEmpty());
+				}
+			}
+			fio.close();
 		} catch (FileNotFoundException e) {
 			e.printStackTrace();
 			fail(e.getLocalizedMessage());