Updated tests model.cfg referencing to be consistent with other projects.

pull/204/head
Andrew Moorcroft 6 years ago
parent da8529cabd
commit e274fcee91

@ -200,7 +200,7 @@ namespace tests
[Test ()] [Test ()]
public void CreateModelFromFile() public void CreateModelFromFile()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
Assert.NotNull (iedModel); Assert.NotNull (iedModel);
} }
@ -208,7 +208,7 @@ namespace tests
[Test ()] [Test ()]
public void StartStopSimpleServer() public void StartStopSimpleServer()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
IedServer iedServer = new IedServer (iedModel); IedServer iedServer = new IedServer (iedModel);
@ -228,7 +228,7 @@ namespace tests
[Test ()] [Test ()]
public void ConnectToServer() public void ConnectToServer()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
IedServer iedServer = new IedServer (iedModel); IedServer iedServer = new IedServer (iedModel);
@ -252,7 +252,7 @@ namespace tests
[Test ()] [Test ()]
public void ReadNonExistingObject() public void ReadNonExistingObject()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
IedServer iedServer = new IedServer (iedModel); IedServer iedServer = new IedServer (iedModel);
@ -276,7 +276,7 @@ namespace tests
[Test ()] [Test ()]
public void AccessDataModelServerSide() public void AccessDataModelServerSide()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
ModelNode modelNode = iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.AnIn1"); ModelNode modelNode = iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.AnIn1");
@ -292,7 +292,7 @@ namespace tests
[Test ()] [Test ()]
public void AccessDataModelClientServer() public void AccessDataModelClientServer()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile("model.cfg");
@ -333,7 +333,7 @@ namespace tests
public void ControlWriteAccessToServer() public void ControlWriteAccessToServer()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
IEC61850.Server.DataAttribute opDlTmms = (IEC61850.Server.DataAttribute) iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.OpDlTmms.setVal"); IEC61850.Server.DataAttribute opDlTmms = (IEC61850.Server.DataAttribute) iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.OpDlTmms.setVal");
IEC61850.Server.DataAttribute rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference ("GenericIO/PDUP1.RsDlTmms.setVal"); IEC61850.Server.DataAttribute rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference ("GenericIO/PDUP1.RsDlTmms.setVal");
@ -389,7 +389,7 @@ namespace tests
public void WriteAccessPolicy() public void WriteAccessPolicy()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
IEC61850.Server.DataAttribute opDlTmms = (IEC61850.Server.DataAttribute) iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.OpDlTmms.setVal"); IEC61850.Server.DataAttribute opDlTmms = (IEC61850.Server.DataAttribute) iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.OpDlTmms.setVal");
IEC61850.Server.DataAttribute rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.RsDlTmms.setVal"); IEC61850.Server.DataAttribute rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.RsDlTmms.setVal");
@ -435,7 +435,7 @@ namespace tests
[Ignore("has to be fixed")] [Ignore("has to be fixed")]
public void ControlHandler() public void ControlHandler()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
DataObject spcso1 = (DataObject)iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.SPCSO1"); DataObject spcso1 = (DataObject)iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.SPCSO1");
@ -486,7 +486,7 @@ namespace tests
[Test()] [Test()]
public void ConnectionHandler() public void ConnectionHandler()
{ {
IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg"); IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
int handlerCalled = 0; int handlerCalled = 0;
int connectionCount = 0; int connectionCount = 0;

@ -38,7 +38,7 @@
<ConsolePause>false</ConsolePause> <ConsolePause>false</ConsolePause>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<DebugType>none</DebugType> <DebugType>none</DebugType>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
<Optimize>true</Optimize> <Optimize>true</Optimize>
<OutputPath>bin\x64\Release</OutputPath> <OutputPath>bin\x64\Release</OutputPath>
@ -57,6 +57,9 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="model.cfg">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="packages.config" /> <None Include="packages.config" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

Loading…
Cancel
Save