From 0475bb8c263ce457902130bd9364b4d9203b718b Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 29 Jun 2020 17:19:19 +0100 Subject: [PATCH] JAL-3493 failing test - creates a highlight and column selection and then called the deselect all alignfjame action and checks if highlight and selection are still present. Conflicts: test/jalview/gui/SeqCanvasTest.java --- test/jalview/gui/SeqCanvasTest.java | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java index 21d67f4..de33b52 100644 --- a/test/jalview/gui/SeqCanvasTest.java +++ b/test/jalview/gui/SeqCanvasTest.java @@ -20,12 +20,12 @@ */ package jalview.gui; -import static org.testng.Assert.assertEquals; - import jalview.bin.Cache; import jalview.bin.Jalview; import jalview.datamodel.AlignmentI; import jalview.io.DataSourceType; +import jalview.datamodel.SearchResults; +import jalview.datamodel.SearchResultsI; import jalview.io.FileLoader; import jalview.util.Platform; import jalview.viewmodel.ViewportRanges; @@ -35,6 +35,11 @@ import java.awt.FontMetrics; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertNull; +import static org.testng.Assert.assertTrue; import junit.extensions.PA; @@ -369,4 +374,24 @@ public class SeqCanvasTest int h = charHeight * (2 + al.getHeight()); assertEquals(repeatingHeight, h); } + @Test(groups = "Functional") + public void testClear_HighlightAndSelection() + { + AlignViewport av = af.getViewport(); + SearchResultsI highlight = new SearchResults(); + highlight.addResult( + av.getAlignment().getSequenceAt(1).getDatasetSequence(), 50, + 80); + af.alignPanel.highlightSearchResults(highlight); + af.avc.markHighlightedColumns(false, false, false); + assertNotNull(av.getSearchResults(), + "No highlight was created on alignment"); + assertFalse(av.getColumnSelection().isEmpty(), + "No selection was created from highlight"); + af.deselectAllSequenceMenuItem_actionPerformed(null); + assertTrue(av.getColumnSelection().isEmpty(), + "No Selection should be present after deselecting all."); + assertNull(av.getSearchResults(), + "No higlighted search results should be present after deselecting all."); + } } -- 1.7.10.2