git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' into features/JAL-892varnaToProject
[jalview.git]
/
test
/
jalview
/
util
/
MappingUtilsTest.java
diff --git
a/test/jalview/util/MappingUtilsTest.java
b/test/jalview/util/MappingUtilsTest.java
index
ec9ace4
..
9985fb3
100644
(file)
--- a/
test/jalview/util/MappingUtilsTest.java
+++ b/
test/jalview/util/MappingUtilsTest.java
@@
-1,22
+1,12
@@
package jalview.util;
package jalview.util;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import java.awt.Color;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.junit.Test;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertSame;
+import static org.testng.AssertJUnit.assertTrue;
import jalview.api.AlignViewportI;
import jalview.datamodel.AlignedCodonFrame;
import jalview.api.AlignViewportI;
import jalview.datamodel.AlignedCodonFrame;
-import jalview.datamodel.Alignment;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.datamodel.SearchResults;
import jalview.datamodel.AlignmentI;
import jalview.datamodel.ColumnSelection;
import jalview.datamodel.SearchResults;
@@
-28,6
+18,16
@@
import jalview.gui.AlignViewport;
import jalview.io.AppletFormatAdapter;
import jalview.io.FormatAdapter;
import jalview.io.AppletFormatAdapter;
import jalview.io.FormatAdapter;
+import java.awt.Color;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.testng.annotations.Test;
+
public class MappingUtilsTest
{
private AlignViewportI dnaView;
public class MappingUtilsTest
{
private AlignViewportI dnaView;
@@
-248,7
+248,7
@@
public class MappingUtilsTest
protected AlignmentI loadAlignment(final String data, String format)
throws IOException
{
protected AlignmentI loadAlignment(final String data, String format)
throws IOException
{
- Alignment a = new FormatAdapter().readFile(data,
+ AlignmentI a = new FormatAdapter().readFile(data,
AppletFormatAdapter.PASTE, format);
a.setDataset(null);
return a;
AppletFormatAdapter.PASTE, format);
a.setDataset(null);
return a;