Merge branch 'develop' into update_212_Dec_merge_with_21125_chamges

[jalview.git] / test / jalview / gui / PairwiseAlignmentPanelTest.java

diff --git a/test/jalview/gui/PairwiseAlignmentPanelTest.java b/test/jalview/gui/PairwiseAlignmentPanelTest.java
index 4d09f43..68da3c8 100644 (file)
--- a/test/jalview/gui/PairwiseAlignmentPanelTest.java
+++ b/test/jalview/gui/PairwiseAlignmentPanelTest.java
@@ -1,18 +1,38 @@
+/*
+ * 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.gui;
 
 import static org.testng.Assert.assertEquals;
 
+import jalview.api.AlignViewportI;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceGroup;
 import jalview.io.DataSourceType;
 import jalview.io.FileLoader;
-
 import javax.swing.JTextArea;
 
-import junit.extensions.PA;
-
 import org.testng.annotations.Test;
 
+import junit.extensions.PA;
+
 public class PairwiseAlignmentPanelTest
 {
   @Test(groups = "Functional")
@@ -20,7 +40,7 @@ public class PairwiseAlignmentPanelTest
   {
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
             "examples/uniref50.fa", DataSourceType.FILE);
-    AlignViewport viewport = af.getViewport();
+    AlignViewportI viewport = af.getViewport();
     AlignmentI al = viewport.getAlignment();
 
     /*
@@ -37,12 +57,12 @@ public class PairwiseAlignmentPanelTest
 
     PairwiseAlignPanel testee = new PairwiseAlignPanel(viewport);
 
-    String text = ((JTextArea) PA.getValue(testee, "textarea")).getText();
+    String text = ((JTextArea) PA.getValue(testee, "textarea")).getText().replace("\r\n", "\n");
     String expected = "Score = 80.0\n" + "Length of alignment = 4\n"
             + "Sequence     FER1_PEA/29-32 (Sequence length = 7)\n"
             + "Sequence Q93XJ9_SOLTU/23-26 (Sequence length = 7)\n\n"
             + "    FER1_PEA/29-32 TKAF\n" + "                    ||.\n"
-            + "Q93XJ9_SOLTU/23-26 LKAI\n" + "Percentage ID = 50.00\n\n";
+            + "Q93XJ9_SOLTU/23-26 LKAI\n\n" + "Percentage ID = 50.00\n\n";
     assertEquals(text, expected);
   }
 
@@ -58,16 +78,16 @@ public class PairwiseAlignmentPanelTest
     String seqs = ">Q93XJ9_SOLTU/23-29\nL-KAISNV\n>FER1_PEA/26-32\nV-TTTKAF\n";
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(seqs,
             DataSourceType.PASTE);
-    AlignViewport viewport = af.getViewport();
+    AlignViewportI viewport = af.getViewport();
 
     PairwiseAlignPanel testee = new PairwiseAlignPanel(viewport);
 
-    String text = ((JTextArea) PA.getValue(testee, "textarea")).getText();
+    String text = ((JTextArea) PA.getValue(testee, "textarea")).getText().replace("\r\n", "\n");
     String expected = "Score = 80.0\n" + "Length of alignment = 4\n"
             + "Sequence     FER1_PEA/29-32 (Sequence length = 7)\n"
             + "Sequence Q93XJ9_SOLTU/23-26 (Sequence length = 7)\n\n"
             + "    FER1_PEA/29-32 TKAF\n" + "                    ||.\n"
-            + "Q93XJ9_SOLTU/23-26 LKAI\n" + "Percentage ID = 50.00\n\n";
+            + "Q93XJ9_SOLTU/23-26 LKAI\n\n" + "Percentage ID = 50.00\n\n";
     assertEquals(text, expected);
   }
 }