JAL-3449 merge from develop

[jalview.git] / test / jalview / io / vcf / VCFLoaderTest.java

diff --git a/test/jalview/io/vcf/VCFLoaderTest.java b/test/jalview/io/vcf/VCFLoaderTest.java
index 87cf727..b206f8c 100644 (file)
--- a/test/jalview/io/vcf/VCFLoaderTest.java
+++ b/test/jalview/io/vcf/VCFLoaderTest.java
@@ -3,7 +3,6 @@ package jalview.io.vcf;
 import static jalview.io.gff.SequenceOntologyI.SEQUENCE_VARIANT;
 import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNull;
-import static org.testng.Assert.assertSame;
 import static org.testng.Assert.assertTrue;
 
 import jalview.bin.Cache;
@@ -543,7 +542,7 @@ public class VCFLoaderTest
     assertEquals(sf.getValue("alleles"), "C,T");
     map = (Map) sf.getValue("CSQ");
     assertEquals(map.size(), 9);
-    assertEquals(map.get("PolyPhen"), "Bad++"); // %3B%3B decoded
+    assertEquals(map.get("PolyPhen"), "Bad;;"); // %3B%3B decoded
 
     sf = geneFeatures.get(2);
     assertEquals(sf.getBegin(), 9);
@@ -762,16 +761,4 @@ public class VCFLoaderTest
     assertEquals(sf.getEnd(), 15);
     assertEquals(sf.getDescription(), "T,C");
   }
-
-  @Test(groups = "Functional")
-  public void testDecodeSpecialCharacters() throws IOException
-  {
-    String encoded = "hello world";
-    String decoded = VCFLoader.decodeSpecialCharacters(encoded);
-    assertSame(encoded, decoded); // no change needed
-
-    encoded = "ab%3Acd%3Bef%3Dgh%25ij%2Ckl%3A";
-    decoded = VCFLoader.decodeSpecialCharacters(encoded);
-    assertEquals(decoded, "ab:cd;ef=gh%ij,kl:");
-  }
 }
\ No newline at end of file