X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Fgui%2FFeatureSettingsTest.java;h=7cc4cc1884e80230308e104c66aaa3b26d3905ee;hb=6ca8a32d88328b8f2162512f41c657c87e131045;hp=1b988ec61d547f4aa13c7152720a6c8738e6cb72;hpb=82174e483ca40892252a783eeef9b4d686a33b00;p=jalview.git
diff --git a/test/jalview/gui/FeatureSettingsTest.java b/test/jalview/gui/FeatureSettingsTest.java
index 1b988ec..7cc4cc1 100644
--- a/test/jalview/gui/FeatureSettingsTest.java
+++ b/test/jalview/gui/FeatureSettingsTest.java
@@ -42,7 +42,10 @@ import jalview.datamodel.features.FeatureMatcher;
import jalview.datamodel.features.FeatureMatcherSet;
import jalview.datamodel.features.FeatureMatcherSetI;
import jalview.io.DataSourceType;
+import jalview.io.FileFormat;
+import jalview.io.FileFormatI;
import jalview.io.FileLoader;
+import jalview.io.IdentifyFile;
import jalview.schemes.FeatureColour;
import jalview.schemes.FeatureColourTest;
import jalview.util.matcher.Condition;
@@ -57,7 +60,7 @@ public class FeatureSettingsTest
* use read-only test properties file
*/
Cache.loadProperties("test/jalview/io/testProps.jvprops");
- Jalview.main(new String[] { "-nonews" });
+ Jalview.main(new String[] { "--nonews" });
}
@AfterMethod(alwaysRun = true)
@@ -278,4 +281,13 @@ public class FeatureSettingsTest
"By Score (> 4.0)
" + simpleTooltip
+ "");
}
+ String fsfile="",fsfile2="\n";
+ @Test(groups="Functional")
+ public void testIdentifyFeatureSettingsFile() throws Exception
+ {
+ FileFormatI type = new IdentifyFile().identify(fsfile, DataSourceType.PASTE);
+ assertTrue(FileFormat.FeatureSettings==type,"Feature settings file was identified as "+type);
+ type = new IdentifyFile().identify(fsfile2, DataSourceType.PASTE);
+ assertTrue(FileFormat.FeatureSettings==type,"Feature settings file with newline was identified as "+type);
+ }
}