Merge branch 'master' into tdsdap4fixes1.dmh

Unidata · Jan 10, 2024 · 12b4f1b · 12b4f1b
2 parents 7a7d07b + 6bc6e64
commit 12b4f1b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/tds/src/integrationTests/java/thredds/tds/TestS3Ncml.java b/tds/src/integrationTests/java/thredds/tds/TestS3Ncml.java
@@ -21,15 +21,23 @@ public void shouldOpenNcmlOnS3() {
   }
 
   @Test
-  public void shouldOpenNcmlWithOtherExtensionOnS3() {
-    final String endpoint = TestOnLocalServer.withHttpPath(S3_NCML_PATH + "testStandaloneNcml.otherExt.ascii?time");
+  public void shouldOpenNcmlWithXmlExtensionOnS3() {
+    final String endpoint = TestOnLocalServer.withHttpPath(S3_NCML_PATH + "testStandalone.xml.ascii?time");
     final byte[] content = TestOnLocalServer.getContent(endpoint, HttpServletResponse.SC_OK);
     final String stringContent = new String(content, StandardCharsets.UTF_8);
 
     assertThat(stringContent).contains("time[2]");
     assertThat(stringContent).contains("6, 18");
   }
 
+  @Test
+  public void shouldOpenNcmlWithOtherExtensionOnS3() {
+    // Can't currently open an S3 NcML file with an extension other than xml or ncml.
+    // Peaking inside the file to check if it's ncml is too slow
+    final String endpoint = TestOnLocalServer.withHttpPath(S3_NCML_PATH + "testStandaloneNcml.otherExt.ascii?time");
+    TestOnLocalServer.getContent(endpoint, HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+  }
+
   @Test
   public void shouldOpenAggregationWithRelativePathsOnS3() {
     final String endpoint = TestOnLocalServer.withHttpPath(S3_NCML_PATH + "nc/namExtract/test_agg.ncml.ascii?time");

diff --git a/tds/src/test/java/thredds/server/ncss/view/dsg/DsgSubsetWriterTest.java b/tds/src/test/java/thredds/server/ncss/view/dsg/DsgSubsetWriterTest.java
@@ -6,6 +6,7 @@
 package thredds.server.ncss.view.dsg;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
@@ -39,6 +40,7 @@
  * Created by cwardgar on 2014/05/27.
  */
 @RunWith(Parameterized.class)
+@Ignore("TODO: fix to work with new cfpointwriters")
 public class DsgSubsetWriterTest {
   private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
   @Rule