X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FPairwiseAlignmentPanelTest.java;h=e74849ffa98d2ab5a459b3cdd02912ca7a833cfa;hb=89783fd8b12b50270d561017d5481de089d86d70;hp=4d09f43ae935764248b6f0f119771fa7beaa2de8;hpb=427421de47dacacac55ac29deca78e2f0a1c5408;p=jalview.git diff --git a/test/jalview/gui/PairwiseAlignmentPanelTest.java b/test/jalview/gui/PairwiseAlignmentPanelTest.java index 4d09f43..e74849f 100644 --- a/test/jalview/gui/PairwiseAlignmentPanelTest.java +++ b/test/jalview/gui/PairwiseAlignmentPanelTest.java @@ -9,10 +9,10 @@ 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") @@ -37,12 +37,13 @@ public class PairwiseAlignmentPanelTest PairwiseAlignPanel testee = new PairwiseAlignPanel(viewport); - String text = ((JTextArea) PA.getValue(testee, "textarea")).getText(); + String text = ((JTextArea) PA.getValue(testee, "textarea")).getText() + .replaceAll("\r", ""); 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); } @@ -62,12 +63,13 @@ public class PairwiseAlignmentPanelTest PairwiseAlignPanel testee = new PairwiseAlignPanel(viewport); - String text = ((JTextArea) PA.getValue(testee, "textarea")).getText(); + String text = ((JTextArea) PA.getValue(testee, "textarea")).getText() + .replaceAll("\r", ""); 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); } }