X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fws%2Fjabaws%2FJpredJabaStructExportImport.java;fp=test%2Fjalview%2Fws%2Fjabaws%2FJpredJabaStructExportImport.java;h=c522bc39b69e17afab2ce7eab709219adfadf78d;hb=1ae9824ef37ce4ed36d1da986003474b47d1ab11;hp=074358168ae02555f2b91ba19148020a9f55ebfb;hpb=b13f521553582ef2fbfd7815ae25e23284babdea;p=jalview.git diff --git a/test/jalview/ws/jabaws/JpredJabaStructExportImport.java b/test/jalview/ws/jabaws/JpredJabaStructExportImport.java index 0743581..c522bc3 100644 --- a/test/jalview/ws/jabaws/JpredJabaStructExportImport.java +++ b/test/jalview/ws/jabaws/JpredJabaStructExportImport.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -23,17 +23,6 @@ package jalview.ws.jabaws; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import jalview.datamodel.AlignmentI; -import jalview.gui.Jalview2XML; -import jalview.io.AnnotationFile; -import jalview.io.FormatAdapter; -import jalview.io.StockholmFileTest; -import jalview.ws.jws2.JPred301Client; -import jalview.ws.jws2.JabaParamStore; -import jalview.ws.jws2.Jws2Discoverer; -import jalview.ws.jws2.SequenceAnnotationWSClient; -import jalview.ws.jws2.jabaws2.Jws2Instance; -import jalview.ws.params.AutoCalcSetting; import java.awt.Component; import java.util.ArrayList; @@ -49,6 +38,18 @@ import org.junit.Test; import compbio.metadata.Argument; import compbio.metadata.WrongParameterException; +import jalview.datamodel.AlignmentI; +import jalview.gui.Jalview2XML; +import jalview.io.AnnotationFile; +import jalview.io.FormatAdapter; +import jalview.io.StockholmFileTest; +import jalview.ws.jws2.JPred301Client; +import jalview.ws.jws2.JabaParamStore; +import jalview.ws.jws2.Jws2Discoverer; +import jalview.ws.jws2.SequenceAnnotationWSClient; +import jalview.ws.jws2.jabaws2.Jws2Instance; +import jalview.ws.params.AutoCalcSetting; + public class JpredJabaStructExportImport { public static String testseqs = "examples/uniref50.fa"; @@ -81,7 +82,7 @@ public class JpredJabaStructExportImport if (jpredws == null) { - System.exit(0); + fail("jpredws is null"); } jalview.io.FileLoader fl = new jalview.io.FileLoader(false);