X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fdatamodel%2FSequenceDummyTest.java;h=fa7602bb327fd16f4cd0b5d4286148ccc8be5d73;hb=a17d89e1193d22cb05cd0f7605c7dc14564ede28;hp=ca1ac7d6c935fe3a2b20ce1e617f559962eda6d8;hpb=44f876a4d3b0adfd680ddfa84e14cc7940d6f877;p=jalview.git

diff --git a/test/jalview/datamodel/SequenceDummyTest.java b/test/jalview/datamodel/SequenceDummyTest.java
index ca1ac7d..fa7602b 100644
--- a/test/jalview/datamodel/SequenceDummyTest.java
+++ b/test/jalview/datamodel/SequenceDummyTest.java
@@ -1,30 +1,61 @@
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
+ * 
+ * This file is part of Jalview.
+ * 
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
+ * Jalview is distributed in the hope that it will be useful, but 
+ * WITHOUT ANY WARRANTY; without even the implied warranty 
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
+ * PURPOSE.  See the GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
+ */
 package jalview.datamodel;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertTrue;
+
+import jalview.gui.JvOptionPane;
 
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
 
 @Test
 public class SequenceDummyTest
 {
+
+  @BeforeClass(alwaysRun = true)
+  public void setUpJvOptionPane()
+  {
+    JvOptionPane.setInteractiveMode(false);
+    JvOptionPane.setMockResponse(JvOptionPane.CANCEL_OPTION);
+  }
+
   /**
    * test for become method
    */
+  @Test(groups = { "Functional" })
   public void testBecome()
   {
     SequenceI seq = new Sequence("OrigSeq", "ASEQUENCE");
     SequenceFeature ofeat = new SequenceFeature("NewFeat", "somedesc", 3,
             12, 2.3f, "none");
-    
+
     SequenceDummy dummySeq = new SequenceDummy("OrigSeq");
     dummySeq.addSequenceFeature(ofeat);
     dummySeq.become(seq);
-    Assert.assertFalse(dummySeq.isDummy(),
-            "Dummy sequence did not become a full sequence");
-    Assert.assertTrue(
-            seq.getSequenceAsString()
-                    .equals(dummySeq.getSequenceAsString()),
-            "Sequence was not updated from template");
+    assertFalse("Dummy sequence did not become a full sequence",
+            dummySeq.isDummy());
+    assertTrue("Sequence was not updated from template", seq
+            .getSequenceAsString().equals(dummySeq.getSequenceAsString()));
     boolean found = false;
     for (SequenceFeature sf : dummySeq.getSequenceFeatures())
     {
@@ -34,7 +65,7 @@ public class SequenceDummyTest
         break;
       }
     }
-    Assert.assertTrue(found, "Didn't retain original sequence feature");
+    assertTrue("Didn't retain original sequence feature", found);
 
     // todo - should test all aspect of copy constructor
   }