Loading tools/TestCastSupport/TestCastAdapter/loopback-part-9.jar +80.5 KiB (709 KiB) File changed.No diff preview for this file type. View original file View changed file tools/TestCastSupport/TestCastTester/src/FileUtils.java +54 −9 Original line number Diff line number Diff line Loading @@ -14,15 +14,21 @@ import java.util.regex.Pattern; public class FileUtils { public static void visitAllFiles(File f, ArrayList<T3ScriptFile> files) { public static boolean visitAllFiles(File f, ArrayList<T3ScriptFile> files) { boolean bRes = false; if (f.isDirectory()) { String[] children = f.list(); ArrayList<File> t3Files = null, xsdFiles = null; ArrayList<File> t3Files = null, xsdFiles = null, directories = null; File xmlFile = null; for (int i = 0; i < children.length; i++) { File localFile = new File(f, children[i]); if (localFile.isDirectory()) visitAllFiles(localFile, files); if (localFile.isDirectory()) { if (!visitAllFiles(localFile, files)) { if (directories == null) directories = new ArrayList<File>(); directories.add(localFile); } } else { String fileName = localFile.toString(); if (fileName.endsWith(".ttcn")) { Loading @@ -39,13 +45,16 @@ public class FileUtils { } } if (t3Files == null) return; return false; for(File t3File : t3Files) { files.add(new T3ScriptFile(t3File, xsdFiles, xmlFile)); files.add(new T3ScriptFile(t3File, xsdFiles, xmlFile, directories)); bRes = true; } } else if (f.toString().endsWith(".ttcn")) { files.add(new T3ScriptFile(f, null, null)); files.add(new T3ScriptFile(f, null, null, null)); bRes = true; } return bRes; } // ----------------------------------------------------------------------------------------------- Loading Loading @@ -81,6 +90,36 @@ public class FileUtils { } } public static void copyDirectory(File sourceLocation , File targetLocation) throws IOException { if (sourceLocation.isDirectory()) { if (!targetLocation.exists()) { targetLocation.mkdir(); } String[] children = sourceLocation.list(); for (int i = 0; i < children.length; i++) { copyDirectory(new File(sourceLocation, children[i]), new File(targetLocation, children[i])); } } else { copyFile(sourceLocation, targetLocation); } } public static void deleteDirectoryContent(File dir) { File[] files = dir.listFiles(); if(files != null) { //some JVMs return null for empty dirs for(File f: files) { if(f.isDirectory()) { deleteDirectoryContent(f); } f.delete(); } } } // ----------------------------------------------------------------------------------------------- public static int countT3Modules(File f) { Loading Loading @@ -108,6 +147,9 @@ public class FileUtils { // ----------------------------------------------------------------------------------------------- private static Pattern s_verdictPassMatch = Pattern.compile("^^\\s*\\*\\*\\s*@verdict\\s*pass\\s*(.*)"); private static Pattern s_verdictMatch = Pattern.compile("^\\s*\\*\\*\\s*@verdict\\s*.*"); private static Pattern s_configMatch = Pattern.compile("^\\s*\\*\\*\\s*@configuration\\s*(.*)"); public static T3ExpectedOutput extractExpectedOutput(File f) { T3ExpectedOutput t3ExpectedOutput = new T3ExpectedOutput(); Loading @@ -117,9 +159,10 @@ public class FileUtils { BufferedReader br = new BufferedReader(new InputStreamReader(in)); String strLine = ""; Matcher configMatch; while ((strLine = br.readLine()) != null) { if (strLine.matches("^\\s*\\*\\*\\s*@verdict\\s*.*")) { Matcher matcher = Pattern.compile("^^\\s*\\*\\*\\s*@verdict\\s*pass\\s*(.*)").matcher(strLine); if (s_verdictMatch.matcher(strLine).matches()) { Matcher matcher = s_verdictPassMatch.matcher(strLine); if (matcher.find()) { String result = matcher.group(1); String[] split = result.split(","); Loading @@ -129,6 +172,8 @@ public class FileUtils { } // System.out.println(strLine); } else if ((configMatch = s_configMatch.matcher(strLine)).matches()) { t3ExpectedOutput.setConfiguration(configMatch.group(1)); } } in.close(); Loading tools/TestCastSupport/TestCastTester/src/T3ExpectedOutput.java +12 −0 Original line number Diff line number Diff line public class T3ExpectedOutput { private String expectedOutput; private String executionResult; private String m_configuration; public String getExpectedOutput() { return expectedOutput; Loading @@ -24,4 +25,15 @@ public class T3ExpectedOutput { + ", executionResult=" + executionResult + "]"; } public void setConfiguration(String config) { m_configuration = config; } public String getConfiguration() { return m_configuration; } public boolean isConfiguration(String config) { return m_configuration != null && m_configuration.equals(config); } } tools/TestCastSupport/TestCastTester/src/T3ScriptFile.java +4 −2 Original line number Diff line number Diff line Loading @@ -4,13 +4,15 @@ import java.util.ArrayList; public class T3ScriptFile { private File t3File, xmlFile; private ArrayList<File> xsdFiles; public T3ScriptFile (File t3File, ArrayList<File> xsdFiles, File xmlFile) { private ArrayList<File> xsdFiles, m_direcories; public T3ScriptFile (File t3File, ArrayList<File> xsdFiles, File xmlFile, ArrayList<File> directories) { this.t3File = t3File; this.xsdFiles = xsdFiles; this.xmlFile = xmlFile; m_direcories = directories; } public File getT3File() { return t3File; } public File getXmlFile() { return xmlFile; } public ArrayList<File> getXsdFiles() { return xsdFiles; } public ArrayList<File> getDirectories() { return m_direcories;} } tools/TestCastSupport/TestCastTester/src/TestCastProjectBuilder.java +33 −6 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ import java.io.PrintWriter; public class TestCastProjectBuilder { private String files = ""; private String sut = ""; private boolean m_bElemSubst, m_bTypeSubst; private String template1 = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<solution>\n" + Loading @@ -33,7 +34,7 @@ public class TestCastProjectBuilder { " </TestCampaigns>\n" + " <ttcn3_settings>\n" + " <tc_block />\n" + " <ttcn3_version>Ttcn3_2013</ttcn3_version>\n" + " <ttcn3_version>Ttcn3_2016</ttcn3_version>\n" + " <asn>BER</asn>\n" + " <dll_timeout>10</dll_timeout>\n" + " <port>7777</port>\n" + Loading @@ -50,11 +51,18 @@ public class TestCastProjectBuilder { " <ws> \\t</ws>\n" + " <sep>;</sep>\n" + " </text>\n" + " </enc>\n" + " </enc>\n"; private String template4 = " <no_bs_dq />\n" + " <length-form>definite</length-form>\n" + " <forbidden_ctrl_warn />\n" + " <omit-match-err />\n" + " <log-tmpt-names />\n" + " <strict-def-check />\n" + " <default-step>0.1</default-step>\n" + " <strict-ver-check />\n" + " <dll_ctimeout>10</dll_ctimeout>\n" + " </ttcn3_settings>\n" + "</solution>"; Loading @@ -80,7 +88,18 @@ public class TestCastProjectBuilder { } public String getProjectFileString() { return template1 + files + template2 + sut + template3; StringBuilder sb = new StringBuilder(); sb.append(template1); sb.append(files); sb.append(template2); sb.append(sut); sb.append(template3); if (m_bElemSubst) sb.append(" <elem_subst />"); if (m_bTypeSubst) sb.append(" <type_subst />"); sb.append(template4); return sb.toString(); } public void saveProjectFile(File f) { Loading @@ -93,4 +112,12 @@ public class TestCastProjectBuilder { e.printStackTrace(); } } public void setElementSubstitutions(boolean bEnabled) { m_bElemSubst = bEnabled; } public void setTypeSubstitutions(boolean bEnabled) { m_bTypeSubst = bEnabled; } } Loading
tools/TestCastSupport/TestCastAdapter/loopback-part-9.jar +80.5 KiB (709 KiB) File changed.No diff preview for this file type. View original file View changed file
tools/TestCastSupport/TestCastTester/src/FileUtils.java +54 −9 Original line number Diff line number Diff line Loading @@ -14,15 +14,21 @@ import java.util.regex.Pattern; public class FileUtils { public static void visitAllFiles(File f, ArrayList<T3ScriptFile> files) { public static boolean visitAllFiles(File f, ArrayList<T3ScriptFile> files) { boolean bRes = false; if (f.isDirectory()) { String[] children = f.list(); ArrayList<File> t3Files = null, xsdFiles = null; ArrayList<File> t3Files = null, xsdFiles = null, directories = null; File xmlFile = null; for (int i = 0; i < children.length; i++) { File localFile = new File(f, children[i]); if (localFile.isDirectory()) visitAllFiles(localFile, files); if (localFile.isDirectory()) { if (!visitAllFiles(localFile, files)) { if (directories == null) directories = new ArrayList<File>(); directories.add(localFile); } } else { String fileName = localFile.toString(); if (fileName.endsWith(".ttcn")) { Loading @@ -39,13 +45,16 @@ public class FileUtils { } } if (t3Files == null) return; return false; for(File t3File : t3Files) { files.add(new T3ScriptFile(t3File, xsdFiles, xmlFile)); files.add(new T3ScriptFile(t3File, xsdFiles, xmlFile, directories)); bRes = true; } } else if (f.toString().endsWith(".ttcn")) { files.add(new T3ScriptFile(f, null, null)); files.add(new T3ScriptFile(f, null, null, null)); bRes = true; } return bRes; } // ----------------------------------------------------------------------------------------------- Loading Loading @@ -81,6 +90,36 @@ public class FileUtils { } } public static void copyDirectory(File sourceLocation , File targetLocation) throws IOException { if (sourceLocation.isDirectory()) { if (!targetLocation.exists()) { targetLocation.mkdir(); } String[] children = sourceLocation.list(); for (int i = 0; i < children.length; i++) { copyDirectory(new File(sourceLocation, children[i]), new File(targetLocation, children[i])); } } else { copyFile(sourceLocation, targetLocation); } } public static void deleteDirectoryContent(File dir) { File[] files = dir.listFiles(); if(files != null) { //some JVMs return null for empty dirs for(File f: files) { if(f.isDirectory()) { deleteDirectoryContent(f); } f.delete(); } } } // ----------------------------------------------------------------------------------------------- public static int countT3Modules(File f) { Loading Loading @@ -108,6 +147,9 @@ public class FileUtils { // ----------------------------------------------------------------------------------------------- private static Pattern s_verdictPassMatch = Pattern.compile("^^\\s*\\*\\*\\s*@verdict\\s*pass\\s*(.*)"); private static Pattern s_verdictMatch = Pattern.compile("^\\s*\\*\\*\\s*@verdict\\s*.*"); private static Pattern s_configMatch = Pattern.compile("^\\s*\\*\\*\\s*@configuration\\s*(.*)"); public static T3ExpectedOutput extractExpectedOutput(File f) { T3ExpectedOutput t3ExpectedOutput = new T3ExpectedOutput(); Loading @@ -117,9 +159,10 @@ public class FileUtils { BufferedReader br = new BufferedReader(new InputStreamReader(in)); String strLine = ""; Matcher configMatch; while ((strLine = br.readLine()) != null) { if (strLine.matches("^\\s*\\*\\*\\s*@verdict\\s*.*")) { Matcher matcher = Pattern.compile("^^\\s*\\*\\*\\s*@verdict\\s*pass\\s*(.*)").matcher(strLine); if (s_verdictMatch.matcher(strLine).matches()) { Matcher matcher = s_verdictPassMatch.matcher(strLine); if (matcher.find()) { String result = matcher.group(1); String[] split = result.split(","); Loading @@ -129,6 +172,8 @@ public class FileUtils { } // System.out.println(strLine); } else if ((configMatch = s_configMatch.matcher(strLine)).matches()) { t3ExpectedOutput.setConfiguration(configMatch.group(1)); } } in.close(); Loading
tools/TestCastSupport/TestCastTester/src/T3ExpectedOutput.java +12 −0 Original line number Diff line number Diff line public class T3ExpectedOutput { private String expectedOutput; private String executionResult; private String m_configuration; public String getExpectedOutput() { return expectedOutput; Loading @@ -24,4 +25,15 @@ public class T3ExpectedOutput { + ", executionResult=" + executionResult + "]"; } public void setConfiguration(String config) { m_configuration = config; } public String getConfiguration() { return m_configuration; } public boolean isConfiguration(String config) { return m_configuration != null && m_configuration.equals(config); } }
tools/TestCastSupport/TestCastTester/src/T3ScriptFile.java +4 −2 Original line number Diff line number Diff line Loading @@ -4,13 +4,15 @@ import java.util.ArrayList; public class T3ScriptFile { private File t3File, xmlFile; private ArrayList<File> xsdFiles; public T3ScriptFile (File t3File, ArrayList<File> xsdFiles, File xmlFile) { private ArrayList<File> xsdFiles, m_direcories; public T3ScriptFile (File t3File, ArrayList<File> xsdFiles, File xmlFile, ArrayList<File> directories) { this.t3File = t3File; this.xsdFiles = xsdFiles; this.xmlFile = xmlFile; m_direcories = directories; } public File getT3File() { return t3File; } public File getXmlFile() { return xmlFile; } public ArrayList<File> getXsdFiles() { return xsdFiles; } public ArrayList<File> getDirectories() { return m_direcories;} }
tools/TestCastSupport/TestCastTester/src/TestCastProjectBuilder.java +33 −6 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ import java.io.PrintWriter; public class TestCastProjectBuilder { private String files = ""; private String sut = ""; private boolean m_bElemSubst, m_bTypeSubst; private String template1 = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<solution>\n" + Loading @@ -33,7 +34,7 @@ public class TestCastProjectBuilder { " </TestCampaigns>\n" + " <ttcn3_settings>\n" + " <tc_block />\n" + " <ttcn3_version>Ttcn3_2013</ttcn3_version>\n" + " <ttcn3_version>Ttcn3_2016</ttcn3_version>\n" + " <asn>BER</asn>\n" + " <dll_timeout>10</dll_timeout>\n" + " <port>7777</port>\n" + Loading @@ -50,11 +51,18 @@ public class TestCastProjectBuilder { " <ws> \\t</ws>\n" + " <sep>;</sep>\n" + " </text>\n" + " </enc>\n" + " </enc>\n"; private String template4 = " <no_bs_dq />\n" + " <length-form>definite</length-form>\n" + " <forbidden_ctrl_warn />\n" + " <omit-match-err />\n" + " <log-tmpt-names />\n" + " <strict-def-check />\n" + " <default-step>0.1</default-step>\n" + " <strict-ver-check />\n" + " <dll_ctimeout>10</dll_ctimeout>\n" + " </ttcn3_settings>\n" + "</solution>"; Loading @@ -80,7 +88,18 @@ public class TestCastProjectBuilder { } public String getProjectFileString() { return template1 + files + template2 + sut + template3; StringBuilder sb = new StringBuilder(); sb.append(template1); sb.append(files); sb.append(template2); sb.append(sut); sb.append(template3); if (m_bElemSubst) sb.append(" <elem_subst />"); if (m_bTypeSubst) sb.append(" <type_subst />"); sb.append(template4); return sb.toString(); } public void saveProjectFile(File f) { Loading @@ -93,4 +112,12 @@ public class TestCastProjectBuilder { e.printStackTrace(); } } public void setElementSubstitutions(boolean bEnabled) { m_bElemSubst = bEnabled; } public void setTypeSubstitutions(boolean bEnabled) { m_bTypeSubst = bEnabled; } }