From e274fcee91971e7fa78794189205604c41288408 Mon Sep 17 00:00:00 2001
From: Andrew Moorcroft <andrew.moorcroft@nortechonline.co.uk>
Date: Thu, 16 Jan 2020 11:08:09 +0000
Subject: [PATCH] Updated tests model.cfg referencing to be consistent with
 other projects.

---
 dotnet/tests/Test.cs      | 20 ++++++++++----------
 dotnet/tests/tests.csproj |  5 ++++-
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/dotnet/tests/Test.cs b/dotnet/tests/Test.cs
index a835d92b..19b698d3 100644
--- a/dotnet/tests/Test.cs
+++ b/dotnet/tests/Test.cs
@@ -200,7 +200,7 @@ namespace tests
 		[Test ()]
 		public void CreateModelFromFile()
 		{			
-			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
+			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
 
 			Assert.NotNull (iedModel);
 		}
@@ -208,7 +208,7 @@ namespace tests
 		[Test ()]
 		public void StartStopSimpleServer()
 		{	
-			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
+			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
 
 			IedServer iedServer = new IedServer (iedModel);
 
@@ -228,7 +228,7 @@ namespace tests
 		[Test ()]
 		public void ConnectToServer()
 		{	
-			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
+			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
 
 			IedServer iedServer = new IedServer (iedModel);
 
@@ -252,7 +252,7 @@ namespace tests
 		[Test ()]
 		public void ReadNonExistingObject()
 		{	
-			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
+			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
 
 			IedServer iedServer = new IedServer (iedModel);
 
@@ -276,7 +276,7 @@ namespace tests
 		[Test ()]
 		public void AccessDataModelServerSide()
 		{
-			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
+			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
 
 			ModelNode modelNode = iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.AnIn1");
 
@@ -292,7 +292,7 @@ namespace tests
 		[Test ()]
 		public void AccessDataModelClientServer()
 		{
-            IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile("../../model.cfg");
+            IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile("model.cfg");
 
 
 
@@ -333,7 +333,7 @@ namespace tests
 		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 rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference ("GenericIO/PDUP1.RsDlTmms.setVal");
@@ -389,7 +389,7 @@ namespace tests
 		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 rsDlTmms = (IEC61850.Server.DataAttribute)iedModel.GetModelNodeByShortObjectReference("GenericIO/PDUP1.RsDlTmms.setVal");
@@ -435,7 +435,7 @@ namespace tests
         [Ignore("has to be fixed")]
 		public void ControlHandler()
 		{
-			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
+			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
 
 			DataObject spcso1 = (DataObject)iedModel.GetModelNodeByShortObjectReference ("GenericIO/GGIO1.SPCSO1");
 
@@ -486,7 +486,7 @@ namespace tests
 		[Test()]
 		public void ConnectionHandler()
 		{
-			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("../../model.cfg");
+			IedModel iedModel = ConfigFileParser.CreateModelFromConfigFile ("model.cfg");
 
 			int handlerCalled = 0;
 			int connectionCount = 0;
diff --git a/dotnet/tests/tests.csproj b/dotnet/tests/tests.csproj
index 0c98f844..d7cc20a3 100644
--- a/dotnet/tests/tests.csproj
+++ b/dotnet/tests/tests.csproj
@@ -38,7 +38,7 @@
     <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <DebugType>none</DebugType>    
+    <DebugType>none</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <Optimize>true</Optimize>
     <OutputPath>bin\x64\Release</OutputPath>
@@ -57,6 +57,9 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <None Include="model.cfg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>