Bamboo test #11 - adding single threaded and thread names

diff --git a/test/jalview/gui/AlignmentPanelTest.java b/test/jalview/gui/AlignmentPanelTest.java
index f16b2ee..5ae8f20 100644 (file)
--- a/test/jalview/gui/AlignmentPanelTest.java
+++ b/test/jalview/gui/AlignmentPanelTest.java
@@ -36,6 +36,7 @@ import java.lang.reflect.InvocationTargetException;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+@Test(singleThreaded = true)
 public class AlignmentPanelTest
 {
   SequenceI seq1 = new Sequence(

diff --git a/test/jalview/gui/SeqCanvasTest.java b/test/jalview/gui/SeqCanvasTest.java
index d74ef57..6f5fa2e 100644 (file)
--- a/test/jalview/gui/SeqCanvasTest.java
+++ b/test/jalview/gui/SeqCanvasTest.java
@@ -38,11 +38,14 @@ import org.testng.annotations.Test;
 
 import junit.extensions.PA;
 
+@Test(singleThreaded = true)
 public class SeqCanvasTest
 {
   @BeforeClass(alwaysRun = true)
   public void setUp()
   {
+    Thread.currentThread().setName("SeqCanvasTest Setup " + ++nTest);
+
     Cache.initLogger();
     Jalview.setSynchronous(true);
   }
@@ -54,6 +57,7 @@ public class SeqCanvasTest
   @Test(groups = "Functional")
   public void testCalculateWrappedGeometry_noAnnotations()
   {
+    Thread.currentThread().setName("SeqCanvasTest noAnn " + ++nTest);
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
             "examples/uniref50.fa", DataSourceType.FILE);
     AlignViewport av = af.getViewport();
@@ -248,6 +252,7 @@ public class SeqCanvasTest
   @Test(groups = "Functional")
   public void testCalculateWrappedGeometry_withAnnotations()
   {
+    Thread.currentThread().setName("SeqCanvasTest wAnn " + ++nTest);
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
             "examples/uniref50.fa", DataSourceType.FILE);
     AlignViewport av = af.getViewport();
@@ -364,6 +369,7 @@ public class SeqCanvasTest
     assertEquals(PA.getValue(testee, "wrappedVisibleWidths"), 3);
   }
 
+  private static int nTest = 0;
   /**
    * Test simulates loading an unwrapped alignment, shrinking it vertically so
    * not all sequences are visible, then changing to wrapped mode. The ranges
@@ -373,6 +379,7 @@ public class SeqCanvasTest
   @Test(groups = "Functional")
   public void testCalculateWrappedGeometry_fromScrolled()
   {
+    Thread.currentThread().setName("SeqCanvasTest fromScrolled " + ++nTest);
     AlignFrame af = new FileLoader().LoadFileWaitTillLoaded(
             "examples/uniref50.fa", DataSourceType.FILE);
     AlignViewport av = af.getViewport();