}
@Test(groups = "Functional")
- public void testFindColumn_wrapped()
+ public void testFindColumn_and_FindAlignmentColumn_wrapped()
{
Cache.applicationProperties.setProperty("WRAP_ALIGNMENT", "true");
AlignFrame alignFrame = new FileLoader().LoadFileWaitTillLoaded(
MouseEvent evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0,
x, 0, 0, 0, 0, false, 0);
assertEquals(testee.findColumn(evt), 0);
+ assertEquals(testee.findAlignmentColumn(evt), 0);
/*
* not quite one charWidth across
evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
0, false, 0);
assertEquals(testee.findColumn(evt), 0);
+ assertEquals(testee.findAlignmentColumn(evt), 0);
/*
* one charWidth across
evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
0, false, 0);
assertEquals(testee.findColumn(evt), 1);
+ assertEquals(testee.findAlignmentColumn(evt), 1);
/*
* x over scale left (before drawn columns) results in -1
evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
0, false, 0);
assertEquals(testee.findColumn(evt), -1);
+ assertEquals(testee.findAlignmentColumn(evt), 0);
+
x = labelWidth;
evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
0, false, 0);
assertEquals(testee.findColumn(evt), 0);
+ assertEquals(testee.findAlignmentColumn(evt), 0);
+
/*
* x over right edge of last residue (including scale left)
evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
0, false, 0);
assertEquals(testee.findColumn(evt), residuesWide - 1);
+ assertEquals(testee.findAlignmentColumn(evt), residuesWide-1);
+
/*
* x over scale right (beyond drawn columns) results in -1
x += 1; // just over left edge of scale right
evt = new MouseEvent(testee, MouseEvent.MOUSE_MOVED, 0L, 0, x, 0, 0, 0,
0, false, 0);
+ // on scale
assertEquals(testee.findColumn(evt), -1);
+ // return right-most column visible
+ assertEquals(testee.findAlignmentColumn(evt), residuesWide2-1);
+
// todo add startRes offset, hidden columns