Rename expected test output files.

broadinstitute · Sep 9, 2020 · 3608f07 · 3608f07
1 parent 79d60dd
commit 3608f07
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/src/test/java/org/broadinstitute/hellbender/utils/help/WDLGenerationIntegrationTest.java b/src/test/java/org/broadinstitute/hellbender/utils/help/WDLGenerationIntegrationTest.java
@@ -54,7 +54,7 @@ private void wdlGenSmokeTest() throws IOException, ParseException {
     // companions, to ensure that the various templates use the template maps correctly.
     @Test
     private void wdlGenTemplateTest() throws IOException, ParseException {
-        final File expectedResultsDir = new File("src/test/resources/org/broadinstitute/hellbender/utils/wdltest/");
+        final File expectedResultsDir = new File("src/test/resources/org/broadinstitute/hellbender/utils/WDLTestExpectedOutputs/");
         final File wdlTestTargetDir = createTempDir("wdlgentemplatetest");
 
         doWDLGenTest(
@@ -65,41 +65,41 @@ private void wdlGenTemplateTest() throws IOException, ParseException {
         // index
         final String indexHTML = "index.html";
         IntegrationTestSpec.assertEqualTextFiles(
-                new File(expectedResultsDir, indexHTML),
+                new File(expectedResultsDir, "expected" + indexHTML),
                 new File(wdlTestTargetDir, indexHTML));
 
         // wdls
         final String defaultWDL = "TestWDLTool.wdl";
         IntegrationTestSpec.assertEqualTextFiles(
-                new File(expectedResultsDir, defaultWDL),
+                new File(expectedResultsDir, "expected" + defaultWDL),
                 new File(wdlTestTargetDir, defaultWDL));
 
         final String allArgsWDL = "TestWDLToolAllArgs.wdl";
         IntegrationTestSpec.assertEqualTextFiles(
-                new File(expectedResultsDir, allArgsWDL),
+                new File(expectedResultsDir, "expected" + allArgsWDL),
                 new File(wdlTestTargetDir, allArgsWDL));
 
         final String allArgsTestWDL = "TestWDLToolAllArgsTest.wdl";
         IntegrationTestSpec.assertEqualTextFiles(
-                new File(expectedResultsDir, allArgsTestWDL),
+                new File(expectedResultsDir, "expected" + allArgsTestWDL),
                 new File(wdlTestTargetDir, allArgsTestWDL));
 
         // jsons
         final String defaultWDLInputs = "TestWDLToolInputs.json";
         IntegrationTestSpec.assertEqualTextFiles(
-                new File(expectedResultsDir, defaultWDLInputs),
+                new File(expectedResultsDir, "expected" + defaultWDLInputs),
                 new File(wdlTestTargetDir, defaultWDLInputs));
         assertValidJSONFile(new File(wdlTestTargetDir, defaultWDLInputs));
 
         final String allArgsWDLInputs = "TestWDLToolAllArgsInputs.json";
         IntegrationTestSpec.assertEqualTextFiles(
-                new File(expectedResultsDir, allArgsWDLInputs),
+                new File(expectedResultsDir, "expected" + allArgsWDLInputs),
                 new File(wdlTestTargetDir, allArgsWDLInputs));
         assertValidJSONFile(new File(wdlTestTargetDir, allArgsWDLInputs));
 
         final String allArgsTestWDLInputs = "TestWDLToolAllArgsTestInputs.json";
         IntegrationTestSpec.assertEqualTextFiles(
-                new File(expectedResultsDir, allArgsTestWDLInputs),
+                new File(expectedResultsDir, "expected" + allArgsTestWDLInputs),
                 new File(wdlTestTargetDir, allArgsTestWDLInputs));
         assertValidJSONFile(new File(wdlTestTargetDir, allArgsTestWDLInputs));
     }

diff --git a/.../hellbender/utils/wdltest/TestWDLTool.wdl → ...stExpectedOutputs/expectedTestWDLTool.wdl b/.../hellbender/utils/wdltest/TestWDLTool.wdl → ...stExpectedOutputs/expectedTestWDLTool.wdl
diff --git a/...nder/utils/wdltest/TestWDLToolAllArgs.wdl → ...tedOutputs/expectedTestWDLToolAllArgs.wdl b/...nder/utils/wdltest/TestWDLToolAllArgs.wdl → ...tedOutputs/expectedTestWDLToolAllArgs.wdl
diff --git a/...ils/wdltest/TestWDLToolAllArgsInputs.json → ...uts/expectedTestWDLToolAllArgsInputs.json b/...ils/wdltest/TestWDLToolAllArgsInputs.json → ...uts/expectedTestWDLToolAllArgsInputs.json
diff --git a/.../utils/wdltest/TestWDLToolAllArgsTest.wdl → ...utputs/expectedTestWDLToolAllArgsTest.wdl b/.../utils/wdltest/TestWDLToolAllArgsTest.wdl → ...utputs/expectedTestWDLToolAllArgsTest.wdl
diff --git a/...wdltest/TestWDLToolAllArgsTestInputs.json → ...expectedTestWDLToolAllArgsTestInputs.json b/...wdltest/TestWDLToolAllArgsTestInputs.json → ...expectedTestWDLToolAllArgsTestInputs.json
diff --git a/...nder/utils/wdltest/TestWDLToolInputs.json → ...tedOutputs/expectedTestWDLToolInputs.json b/...nder/utils/wdltest/TestWDLToolInputs.json → ...tedOutputs/expectedTestWDLToolInputs.json
diff --git a/...itute/hellbender/utils/wdltest/index.html → ...WDLTestExpectedOutputs/expectedindex.html b/...itute/hellbender/utils/wdltest/index.html → ...WDLTestExpectedOutputs/expectedindex.html