diff --git a/tds/src/integrationTests/java/thredds/server/catalog/TestServiceDefaults.java b/tds/src/integrationTests/java/thredds/server/catalog/TestServiceDefaults.java index 3492583da7..6346032894 100644 --- a/tds/src/integrationTests/java/thredds/server/catalog/TestServiceDefaults.java +++ b/tds/src/integrationTests/java/thredds/server/catalog/TestServiceDefaults.java @@ -39,7 +39,7 @@ public void testStandardServices() throws IOException { Service s = ds.getServiceDefault(); Assert.assertNotNull(s); Assert.assertTrue(s.getType() == ServiceType.Compound); - Assert.assertEquals(10, s.getNestedServices().size()); + Assert.assertEquals(7, s.getNestedServices().size()); } // Relies on: @@ -62,7 +62,7 @@ public void testStandardServicesDatasetScan() throws IOException { Assert.assertNotNull(s); Assert.assertTrue(s.getType() == ServiceType.Compound); - Assert.assertEquals(10, s.getNestedServices().size()); + Assert.assertEquals(7, s.getNestedServices().size()); } @Test @@ -72,7 +72,7 @@ public void testUserDefinedServices() throws IOException { Assert.assertEquals(3, cat.getServices().size()); check(cat, "all", 11); - check(cat, "GridServices", 10); + check(cat, "GridServices", 7); check(cat, "opendapOnly", 1); Service localServices = cat.findService("opendapOnly"); diff --git a/tds/src/integrationTests/java/thredds/server/catalog/TestTdsGrib.java b/tds/src/integrationTests/java/thredds/server/catalog/TestTdsGrib.java index 8c6afcbda2..7ba5429af8 100644 --- a/tds/src/integrationTests/java/thredds/server/catalog/TestTdsGrib.java +++ b/tds/src/integrationTests/java/thredds/server/catalog/TestTdsGrib.java @@ -89,7 +89,7 @@ public void testTPanalyis() throws IOException { Dataset full = cat.findDatasetByID("HRRR/analysis/TP"); Assert.assertNotNull(full); - Assert.assertEquals(9, full.getAccess().size()); + Assert.assertEquals(6, full.getAccess().size()); Assert.assertNull(full.getAccess(ServiceType.Resolver)); Assert.assertNull(full.getAccess(ServiceType.HTTPServer)); Assert.assertNotNull(full.getAccess(ServiceType.CdmRemote)); @@ -170,7 +170,7 @@ public void testDeclaredServicesInNestedDatasets() throws IOException { public void testDefaultGribServices() throws IOException { String catalog = "/catalog/grib.v5/NDFD/CONUS_5km/catalog.xml"; // no service name, should use GRID default Catalog cat = TdsLocalCatalog.open(catalog); - testCat(cat, 9, true, null, 0); + testCat(cat, 6, true, null, 0); Dataset top = cat.getDatasetsLocal().get(0); Assert.assertTrue(!top.hasAccess()); @@ -181,7 +181,7 @@ public void testDefaultGribServices() throws IOException { } else { CatalogRef catref = (CatalogRef) ds; Catalog cat2 = TdsLocalCatalog.openFromURI(catref.getURI()); - testCat(cat2, 9, false, "GridServices", 10); + testCat(cat2, 6, false, "GridServices", 7); break; } }