Commit cf9118f8 authored by urbant's avatar urbant
Browse files

Updated TestCast support: 

- new TTCN-3 version
- support for XSD any to TTCN-3 anytype conversion
parent 9167f90a

tools/TestCastSupport/TestCastTester/resources/TestCastTester.properties

+6 −5
Original line number Original line Diff line number Diff line 
TestCastCommandLineTool=C:/Program Files/Elvior/TestCastT3/tc_cmd.exe

TestCastCommandLineTool=C:/SVN/TestCast/Source/TestCastT3/VS2010/bin/x86/Debug/tc_cmd.exe

LoopbackAdapterPath=D:/Work/STF 475/svn/misc/TestCastTester_GUI/loopback/loopback-part-9.cmd

LoopbackAdapterPath=C:/SVN/SVN 475/trunk/tools/TestCastSupport/TestCastAdapter/loopback-part-9.cmd

TempPath=D:/Work/STF 475/temp

TempPath=C:/Work/STF/STF 475/tmp

LogPath=D:/Work/STF 475/log

LogPath=C:/Work/STF/STF 475/log

ATSPath=D:/Work/STF 475/svn/trunk/ATS
 
ATSPath=C:/Work/STF/STF 521/Tmp/

 No newline at end of file
 
ATSPathX=C:/SVN/SVN 475/trunk/ATS/07_mapping_xsd_components/0701_attributes_of_xsd_component_declarations
 
 No newline at end of file

tools/TestCastSupport/TestCastTester/src/TestCastProjectBuilder.java

+12 −4
Original line number Original line Diff line number Diff line
@@ -7,7 +7,7 @@ import java.io.PrintWriter; 
public class TestCastProjectBuilder {

public class TestCastProjectBuilder {

	private String files = "";

	private String files = "";

	private String sut = "";

	private String sut = "";

	private boolean m_bElemSubst, m_bTypeSubst;

	private boolean m_bElemSubst, m_bTypeSubst, m_bXsdAnytype;

	

	

	private String template1 = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + 

	private String template1 = "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + 

	"<solution>\n" + 

	"<solution>\n" +
@@ -34,7 +34,7 @@ public class TestCastProjectBuilder { 
	" </TestCampaigns>\n" + 

	" </TestCampaigns>\n" + 

	" <ttcn3_settings>\n" + 

	" <ttcn3_settings>\n" + 

	"  <tc_block />\n" + 

	"  <tc_block />\n" + 

	"  <ttcn3_version>Ttcn3_2016</ttcn3_version>\n" + 

	"  <ttcn3_version>Ttcn3_2017</ttcn3_version>\n" + 

	"  <asn>BER</asn>\n" + 

	"  <asn>BER</asn>\n" + 

	"  <dll_timeout>10</dll_timeout>\n" + 

	"  <dll_timeout>10</dll_timeout>\n" + 

	"  <port>7777</port>\n" + 

	"  <port>7777</port>\n" +
@@ -62,8 +62,9 @@ public class TestCastProjectBuilder { 
	"  <strict-def-check />\n" +

	"  <strict-def-check />\n" +

	"  <default-step>0.1</default-step>\n" +

	"  <default-step>0.1</default-step>\n" +

	"  <strict-ver-check />\n" +

	"  <strict-ver-check />\n" +

	"  <dll_ctimeout>10</dll_ctimeout>\n" +

	"  <dll_ctimeout>10</dll_ctimeout>\n";

	" </ttcn3_settings>\n" + 

	

	private String template5 = " </ttcn3_settings>\n" + 

	"</solution>";

	"</solution>";

	

	

	public void addFile(String filename) {

	public void addFile(String filename) {
@@ -99,6 +100,9 @@ public class TestCastProjectBuilder { 
		if (m_bTypeSubst)

		if (m_bTypeSubst)

			sb.append("  <type_subst />");

			sb.append("  <type_subst />");

		sb.append(template4);

		sb.append(template4);

		if (m_bXsdAnytype)

			sb.append("  <xsd-any>anytype</xsd-any>");

		sb.append(template5);

		return sb.toString();

		return sb.toString();

	}

	}
@@ -120,4 +124,8 @@ public class TestCastProjectBuilder { 
	public void setTypeSubstitutions(boolean bEnabled) {

	public void setTypeSubstitutions(boolean bEnabled) {

		m_bTypeSubst = bEnabled;

		m_bTypeSubst = bEnabled;

	}

	}

	

	public void setXsdAnyToTtcn3Anytype(boolean bEnabled) {

		m_bXsdAnytype = bEnabled;

	}

}
 
}

tools/TestCastSupport/TestCastTester/src/TestCastTester.java

+1 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,7 @@ public class TestCastTester { 
			builder.setSUT(new File(config.get("LoopbackAdapterPath").toString()).getAbsolutePath());

			builder.setSUT(new File(config.get("LoopbackAdapterPath").toString()).getAbsolutePath());

			builder.setElementSubstitutions(expectedOutput.isConfiguration("elem_subst"));

			builder.setElementSubstitutions(expectedOutput.isConfiguration("elem_subst"));

			builder.setTypeSubstitutions(expectedOutput.isConfiguration("type_subst"));

			builder.setTypeSubstitutions(expectedOutput.isConfiguration("type_subst"));

			builder.setXsdAnyToTtcn3Anytype(expectedOutput.isConfiguration("any_to_anytype"));

			File projectFile = new File(config.get("TempPath") + "/testcast.tcproj");

			File projectFile = new File(config.get("TempPath") + "/testcast.tcproj");

			builder.saveProjectFile(projectFile);

			builder.saveProjectFile(projectFile);