X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=test%2Fjalview%2Futil%2FDnaUtilsTest.java;h=d7a76b9ab2f10dae94af794e1f766a0997ee7c79;hb=9c39e96af6b84257604da448101505361dced686;hp=9e978fe6224cef2673a85da3290033ab8609a8fa;hpb=67538ac6c16cf7a413023a1faf0593a20b1634e3;p=jalview.git diff --git a/test/jalview/util/DnaUtilsTest.java b/test/jalview/util/DnaUtilsTest.java index 9e978fe..d7a76b9 100644 --- a/test/jalview/util/DnaUtilsTest.java +++ b/test/jalview/util/DnaUtilsTest.java @@ -92,7 +92,7 @@ public class DnaUtilsTest * valid things we don't yet handle */ assertNull(DnaUtils.parseLocation("<34..126")); - assertNull(DnaUtils.parseLocation("34..>126")); + assertNull(DnaUtils.parseLocation("35..>126")); assertNull(DnaUtils.parseLocation("34.126")); assertNull(DnaUtils.parseLocation("34^126")); assertNull(DnaUtils.parseLocation("order(34..126,130..180)")); @@ -114,6 +114,19 @@ public class DnaUtilsTest { // expected } + + /* + * nested joins are not allowed; just as well since this fails to parse + * (splitting tokens by comma fragments the inner join expression) + */ + assertNull(DnaUtils + .parseLocation("join(1..2,join(4..5,10..12),18..22)")); + /* + * complement may not enclose multiple ranges + * parsing fails for the same reason + */ + assertNull(DnaUtils + .parseLocation("join(complement(36618..36700,4000..4200),86988..87064)")); } }