#142 - Make XML presentation models test working.

neptuo · Feb 16, 2019 · 389e222 · 389e222
1 parent e5836d8
commit 389e222
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 8 deletions.
diff --git a/src/Neptuo.PresentationModels.Serialization.Xml/XmlModelValueGetter.cs b/src/Neptuo.PresentationModels.Serialization.Xml/XmlModelValueGetter.cs
@@ -54,7 +54,7 @@ public bool TryGetValue(string identifier, out object value)
                     return true;
                 }
 
-                if(Converts.Try(typeof(string), fieldDefinition.FieldType, stringValue, out value))
+                if (Converts.Try(typeof(string), fieldDefinition.FieldType, stringValue, out value))
                     return true;
             }
 

diff --git a/test/TestConsole/PresentationModels/TestXmlModelDefinition.cs b/test/TestConsole/PresentationModels/TestXmlModelDefinition.cs
@@ -1,4 +1,6 @@
-using Neptuo.FileSystems;
+using Neptuo;
+using Neptuo.Converters;
+using Neptuo.FileSystems;
 using Neptuo.PresentationModels;
 using Neptuo.PresentationModels.Serialization;
 using System;
@@ -14,8 +16,10 @@ class TestXmlModelDefinition
     {
         public static void Test()
         {
-            var personXmlFile = new LocalFileContentFactory("../../PresentationModels/PersonDefinition.xml", FileMode.Open);
-            var organizationXmlFile = new LocalFileContentFactory("../../PresentationModels/OrganizationDefinition.xml", FileMode.Open);
+            Converts.Repository.AddStringTo<int>(Int32.TryParse);
+
+            var personXmlFile = new LocalFileContentFactory("PresentationModels/PersonDefinition.xml", FileMode.Open);
+            var organizationXmlFile = new LocalFileContentFactory("PresentationModels/OrganizationDefinition.xml", FileMode.Open);
 
             XmlTypeMappingCollection typeMappings = new XmlTypeMappingCollection().AddStandartKeywords();
             IModelDefinition personDefiniton = new XmlModelDefinitionBuilder(typeMappings, personXmlFile).Create();
@@ -28,7 +32,7 @@ public static void Test()
                 Console.WriteLine(writer);
             }
 
-            var mixedXmlFile = new LocalFileContentFactory("../../PresentationModels/MixedDataSource.xml", FileMode.Open);
+            var mixedXmlFile = new LocalFileContentFactory("PresentationModels/MixedDataSource.xml", FileMode.Open);
             XmlModelValueGetterFactory getterFactory = new XmlModelValueGetterFactory(mixedXmlFile.Create());
 
             XmlModelValueGetterCollection persons = getterFactory.Create(personDefiniton);
@@ -65,7 +69,7 @@ public static void Test()
                 organizationCopier.Update(setterFactory.Create(organizationDefinition), getter);
 
             //IFile newMixedFile = (IFile)new LocalFileContentFactory("../../PresentationModels/MixedDataSourceNEW.xml");
-            using (FileStream stream = new FileStream("../../PresentationModels/MixedDataSourceNEW.xml", FileMode.OpenOrCreate))
+            using (FileStream stream = new FileStream("PresentationModels/MixedDataSourceNEW.xml", FileMode.OpenOrCreate))
             {
                 setterFactory.SaveToStream(stream);
             }

diff --git a/test/TestConsole/Program.cs b/test/TestConsole/Program.cs
@@ -1,4 +1,6 @@
-using Neptuo.Collections.Specialized;
+using Neptuo;
+using Neptuo.Converters;
+using Neptuo.Collections.Specialized;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -17,7 +19,7 @@ class Program
     {
         private static void Main(string[] args)
         {
-            //TestXmlModelDefinition.Test();
+            TestXmlModelDefinition.Test();
             //TestDelegates.Test();
             //TestBootstrap.Test();
             //TestBehaviors.Test();

diff --git a/test/TestConsole/TestConsole.csproj b/test/TestConsole/TestConsole.csproj
@@ -26,5 +26,29 @@
   <ItemGroup>
     <PackageReference Include="log4net" version="2.0.3" />
   </ItemGroup>
+
+  <ItemGroup>
+    <None Update="PresentationModels\AddressDefinition.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PresentationModels\MixedDataSource.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PresentationModels\MixedDataSourceNEW.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PresentationModels\OrganizationDefinition.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PresentationModels\Organizations.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PresentationModels\PersonDefinition.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="PresentationModels\Persons.xml">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
 
 </Project>