Update ReadsBundleTest to use more defined constants.

Author: cmnbroad

src/test/java/htsjdk/beta/plugin/reads/ReadsBundleTest.java

@@ -43,11 +43,17 @@ public void testReadsBundleReadsAndIndex() {
     public void testNoReadsInSerializedBundle() {
         final String vcfJSON = """
             {
-                "schemaVersion":"0.1.0",
+                "schemaVersion":"%s",
                 "schemaName":"htsbundle",
-                "VARIANT_CONTEXTS":{"path":"my.vcf","format":"VCF"},
-                "primary":"VARIANT_CONTEXTS"
-            }""";
+                "%s":{"path":"my.vcf","format":"%s"},
+                "primary":"%s"
+            }"""
+                .formatted(
+                        BundleJSON.JSON_SCHEMA_VERSION,
+                        BundleResourceType.PRIMARY_CT_VARIANT_CONTEXTS,
+                        BundleResourceType.FMT_VARIANTS_VCF,
+                        BundleResourceType.PRIMARY_CT_VARIANT_CONTEXTS
+                );
         try {
             ReadsBundle.getReadsBundleFromString(vcfJSON);
         } catch (final IllegalArgumentException e) {
@@ -76,22 +82,29 @@ public Object[][] getRoundTripJSONTestData() {
                     // reads only, without format included
                     """
                     {
-                        "schemaVersion":"0.1.0",
+                        "schemaVersion":"%s",
                         "schemaName":"htsbundle",
-                        "ALIGNED_READS":{"path":"%s"},
-                        "primary":"ALIGNED_READS"
-                    }""".formatted(BAM_FILE),
+                        "%s":{"path":"%s"},
+                        "primary":"%s"
+                    }""".formatted(
+                            BundleJSON.JSON_SCHEMA_VERSION,
+                            BundleResourceType.PRIMARY_CT_ALIGNED_READS, BAM_FILE,
+                            BundleResourceType.PRIMARY_CT_ALIGNED_READS
+                    ),
                     new ReadsBundle<IOPath>(new HtsPath(BAM_FILE))
                 },
                 {
                     // reads only, with format included
                     """
                     {
-                        "schemaVersion":"0.1.0",
+                        "schemaVersion":"%s",
                         "schemaName":"htsbundle",
-                        "ALIGNED_READS":{"path":"%s", "format":"BAM"},
-                        "primary":"ALIGNED_READS"
-                    }""".formatted(BAM_FILE),
+                        "%s":{"path":"%s", "format":"%s"},
+                        "primary":"%s"
+                    }""".formatted(
+                            BundleJSON.JSON_SCHEMA_VERSION,
+                            BundleResourceType.PRIMARY_CT_ALIGNED_READS, BAM_FILE, BundleResourceType.FMT_READS_BAM,
+                            BundleResourceType.PRIMARY_CT_ALIGNED_READS),
                     // ReadsBundle doesn't automatically infer format, so create one manually
                     new ReadsBundle(
                             new BundleBuilder()
@@ -106,12 +119,17 @@ public Object[][] getRoundTripJSONTestData() {
                     // reads with index, with format included
                     """
                     {
-                        "schemaVersion":"0.1.0",
+                        "schemaVersion":"%s",
                         "schemaName":"htsbundle",
-                        "ALIGNED_READS":{"path":"%s", "format":"BAM"},
-                        "READS_INDEX":{"path":"%s", "format":"BAI"},
-                        "primary":"ALIGNED_READS"
-                    }""".formatted(BAM_FILE, INDEX_FILE),
+                        "%s":{"path":"%s", "format":"%s"},
+                        "%s":{"path":"%s", "format":"%s"},
+                        "primary":"%s"
+                    }""".formatted(
+                            BundleJSON.JSON_SCHEMA_VERSION,
+                            BundleResourceType.PRIMARY_CT_ALIGNED_READS, BAM_FILE, BundleResourceType.FMT_READS_BAM,
+                            BundleResourceType.SECONDARY_CT_READS_INDEX, INDEX_FILE, BundleResourceType.FMT_READS_INDEX_BAI,
+                            BundleResourceType.PRIMARY_CT_ALIGNED_READS
+                    ),
                     // ReadsBundle doesn't automatically infer format, so create one manually
                     new ReadsBundle(
                             new BundleBuilder()