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
JAL-2089 patch broken merge to master for Release 2.10.0b1
[jalview.git]
/
test
/
jalview
/
io
/
HtmlFileTest.java
diff --git
a/test/jalview/io/HtmlFileTest.java
b/test/jalview/io/HtmlFileTest.java
index
3b99208
..
6c13e26
100644
(file)
--- a/
test/jalview/io/HtmlFileTest.java
+++ b/
test/jalview/io/HtmlFileTest.java
@@
-20,8
+20,6
@@
*/
package jalview.io;
*/
package jalview.io;
-import static org.junit.Assert.fail;
-
import org.testng.annotations.Test;
public class HtmlFileTest
import org.testng.annotations.Test;
public class HtmlFileTest
@@
-30,7
+28,7
@@
public class HtmlFileTest
@Test(groups = { "Functional" }, enabled = false)
public void test()
{
@Test(groups = { "Functional" }, enabled = false)
public void test()
{
- fail("Not yet implemented");
+ org.testng.AssertJUnit.fail("Not yet implemented");
}
}
}
}