Merge pull request #5983 from SJuliez/move-test-scenarios-to-test-dir

Move test setup scenarios to testresources

megamek/src/megamek/client/ui/swing/scenario/ScenarioChooser.java

@@ -134,6 +134,12 @@ private static List<Scenario> getScenarioInfos() {
  File subDir = new File(userDir, Configuration.scenariosDir().toString());
  scenarios.addAll(parseScenariosInDirectory(subDir));
  }
+
+ // Add testdata scenarios - these should not be present in releases
+ File testdataDir = new File("testresources/data/scenarios/test_setups");
+ if (testdataDir.exists() && testdataDir.isDirectory()) {
+ scenarios.addAll(parseScenariosInDirectory(testdataDir));
+ }
  return scenarios;
  }