From 80ae618ea73da805297498a6bd3691afa8504077 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 | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java index aaacce0..84d2b79 100644 --- a/test/jalview/gui/SeqCanvasTest.java +++ b/test/jalview/gui/SeqCanvasTest.java @@ -20,18 +20,26 @@ */ package jalview.gui; -import static org.testng.Assert.assertEquals; - import java.awt.Font; import java.awt.FontMetrics; import org.testng.annotations.BeforeMethod; 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 jalview.bin.Cache; import jalview.datamodel.AlignmentI; +import jalview.datamodel.SearchResults; +import jalview.datamodel.SearchResultsI; +import jalview.io.DataSourceType; import jalview.io.DataSourceType; import jalview.io.FileLoader; + import junit.extensions.PA; public class SeqCanvasTest @@ -358,4 +366,24 @@ public class SeqCanvasTest } } while (af.getViewport().getCalcManager().isWorking()); } + @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