Added support for extra XSD in test_data subfolder (55306c42) · Commits · MTS - Methods for Testing and Specification / TTCN-3_Compiler_Tests / TTCN3_PART9

src/TestMacroProcessor.java

+20 −5

Original line number	Diff line number	Diff line
		@@ -164,11 +164,26 @@ public class TestMacroProcessor {
		macroString = macroString.replace("${module}", moduleName);
		StringBuilder xsdFileList = new StringBuilder();
		xsdFileList.append("{ ");
		File[] listXSDFiles = inputFile.getParentFile().listFiles(new FilenameFilter() {
		File[] listXSDFiles = null;
		File parentFile = inputFile.getParentFile();
		File testData = new File(parentFile, "test_data");

		// First try to load XSD files from "test_data" subfolder
		if (testData.exists() && testData.isDirectory()) {
		listXSDFiles = parentFile.listFiles(new FilenameFilter() {
		public boolean accept(File dir, String name) {
		return name.toLowerCase().endsWith(".xsd");
		}
		});
		}
		if (listXSDFiles == null \|\| listXSDFiles.length == 0) {
		// No XSD files in "test_data" subfolder. Fallback to the main folder
		listXSDFiles = parentFile.listFiles(new FilenameFilter() {
		public boolean accept(File dir, String name) {
		return name.toLowerCase().endsWith(".xsd");
		}
		});
		}
		boolean firstFile = true;
		for (File xsdFile : listXSDFiles) {
		if (!firstFile) {