Commit 599fec5e authored by Pakulin's avatar Pakulin
Browse files

Fixed handling of test_data

parent 55306c42

src/TestMacroProcessor.java

+11 −3
Original line number Original line Diff line number Diff line
@@ -167,13 +167,14 @@ public class TestMacroProcessor { 
		File[] listXSDFiles = null;

		File[] listXSDFiles = null;

		File parentFile = inputFile.getParentFile();

		File parentFile = inputFile.getParentFile();

		File testData = new File(parentFile, "test_data");

		File testData = new File(parentFile, "test_data");



		boolean fromTestData = false;

		// First try to load XSD files from "test_data" subfolder

		// First try to load XSD files from "test_data" subfolder

		if (testData.exists() && testData.isDirectory()) {

		if (testData.exists() && testData.isDirectory()) {

			listXSDFiles = parentFile.listFiles(new FilenameFilter() {

			listXSDFiles = testData.listFiles(new FilenameFilter() {

				public boolean accept(File dir, String name) {

				public boolean accept(File dir, String name) {

					return name.toLowerCase().endsWith(".xsd");

					return name.toLowerCase().endsWith(".xsd");

				}

				}

				

			});			

			});			

		} 

		} 

		if (listXSDFiles == null || listXSDFiles.length == 0) {

		if (listXSDFiles == null || listXSDFiles.length == 0) {
@@ -183,14 +184,21 @@ public class TestMacroProcessor { 
					return name.toLowerCase().endsWith(".xsd");

					return name.toLowerCase().endsWith(".xsd");

				}

				}

			});

			});

		} else {

			fromTestData = true;

		}

		}

		

		boolean firstFile = true;

		boolean firstFile = true;

		for (File xsdFile : listXSDFiles) {

		for (File xsdFile : listXSDFiles) {

			if (!firstFile) {

			if (!firstFile) {

				xsdFileList.append(", ");

				xsdFileList.append(", ");

			}

			}

			firstFile = false;

			firstFile = false;

			xsdFileList.append("\"").append(xsdFile.getName()).append("\"");

			xsdFileList.append("\"");

			if (fromTestData) {

				xsdFileList.append("test_data").append('/');

			}

			xsdFileList.append(xsdFile.getName()).append("\"");

		}

		}

		xsdFileList.append(" }");

		xsdFileList.append(" }");

		macroString = macroString.replace("${xsdFileList}", xsdFileList);

		macroString = macroString.replace("${xsdFileList}", xsdFileList);