JAL-1541 minor code clean up, and added test for BioJsHTMLOutput

[jalview.git] / test / jalview / io / BioJsHTMLOutputTest.java

diff --git a/test/jalview/io/BioJsHTMLOutputTest.java b/test/jalview/io/BioJsHTMLOutputTest.java
index 694419f..8d9de77 100644 (file)
--- a/test/jalview/io/BioJsHTMLOutputTest.java
+++ b/test/jalview/io/BioJsHTMLOutputTest.java
@@ -1,96 +1,28 @@
 package jalview.io;
 
-import jalview.datamodel.Alignment;
-import jalview.datamodel.Sequence;
-
 import java.io.IOException;
-import java.util.Iterator;
 
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
 import org.junit.Assert;
 import org.junit.Test;
 
-import com.json.JSONException;
 
 public class BioJsHTMLOutputTest
 {
 
-
   @Test
   public void getJalviewAlignmentAsJsonString()
   {
-    BioJsHTMLOutput bioJsHtmlOuput = new BioJsHTMLOutput(null, null);
-    bioJsHtmlOuput.setGlobalColorScheme("Zappo");
-
-    Sequence[] seqs = new Sequence[1];
-    Sequence seq = new Sequence("name", "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 1, 26);
-    // SequenceFeature seqFeature = new SequenceFeature("type", "desc",
-    // "status", 1, 5, "jalview");
-    // seq.addSequenceFeature(seqFeature);
-    seq.setDatasetSequence(seq);
-    seqs[0] = seq;
-
-    Alignment al = new Alignment(seqs);
+    BioJsHTMLOutput bioJsHtmlOutput = new BioJsHTMLOutput(null, null);
+    String bjsTemplate = null;
     try
     {
-
-      JSONParser jsonParser = new JSONParser();
-      String actualJsonString = bioJsHtmlOuput
-              .getJalviewAlignmentAsJsonString(al);
-
-      JSONObject actualJsonObj = (JSONObject) jsonParser.parse(actualJsonString);
-
-      System.out.println("Output : " + actualJsonString);
-      Assert.assertTrue(actualJsonObj.get("globalColorScheme") != null); 
-      Assert.assertTrue((actualJsonObj.get("globalColorScheme").toString()).equals("zappo")); 
-      
-      Assert.assertTrue(actualJsonObj.get("webStartUrl") != null);
-      Assert.assertTrue((actualJsonObj.get("webStartUrl").toString())
-              .equals("http://www.jalview.org/services/launchApp"));
-
-      JSONArray actualSeqJsonObj = (JSONArray) actualJsonObj.get("seqs");
-      Assert.assertTrue(actualSeqJsonObj != null);
-      Assert.assertTrue(actualSeqJsonObj.size() == 1);
-
-      @SuppressWarnings("unchecked")
-      Iterator<JSONObject> jsonIter = actualSeqJsonObj.iterator();
-      JSONObject jsonSeq = jsonIter.next();
-      Assert.assertTrue(jsonSeq != null);
-
-      Assert.assertTrue(jsonSeq.get("name") != null);
-      Assert.assertTrue((jsonSeq.get("name").toString())
-              .equals("name/1-26"));
-
-      Assert.assertTrue(jsonSeq.get("seq") != null);
-      Assert.assertTrue((jsonSeq.get("seq").toString())
-              .equals("ABCDEFGHIJKLMNOPQRSTUVWXYZ"));
-
-      Assert.assertTrue(jsonSeq.get("id") != null);
-      Assert.assertTrue((jsonSeq.get("id").toString()).equals("1"));
-
-      Assert.assertTrue(jsonSeq.get("start") != null);
-      Assert.assertTrue((jsonSeq.get("start").toString()).equals("1"));
-
-      Assert.assertTrue(jsonSeq.get("end") != null);
-      Assert.assertTrue((jsonSeq.get("end").toString()).equals("26"));
-
-      Assert.assertTrue(jsonSeq.get("features") != null);
-      Assert.assertTrue(jsonSeq.get("features").toString().equals("[]"));
-
-
+      bjsTemplate = BioJsHTMLOutput
+              .getBioJsTemplateAsString(bioJsHtmlOutput);
+      // System.out.println(bjsTemplate);
     } catch (IOException e)
     {
       e.printStackTrace();
-    } catch (JSONException e)
-    {
-      e.printStackTrace();
-    } catch (ParseException e)
-    {
-      e.printStackTrace();
     }
+    Assert.assertNotNull(bjsTemplate);
   }
-  
 }