修正配置系统的单元测试

NewLifeX · Jan 31, 2020 · 61b4201 · 61b4201
1 parent 1754b17
commit 61b4201
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,5 @@ bld/
 /BinSamples
 /Samples/SplitTableOrDatabase/Config
 /TestResults
+/BinCoreTest
+/BinXCodeTest
diff --git a/NewLife.Core/Configuration/FileConfigProvider.cs b/NewLife.Core/Configuration/FileConfigProvider.cs
@@ -82,6 +82,7 @@ public override void Save<T>(T model, String nameSpace = null)
 
             var fileName = GetFileName(typeof(T));
             fileName = fileName.GetBasePath();
+            fileName.EnsureDirectory(true);
 
             OnWrite(fileName, dic);
         }

diff --git a/NewLife.Core/NewLife.Core.csproj b/NewLife.Core/NewLife.Core.csproj
@@ -7,8 +7,8 @@
     <Description>算法、日志、网络、RPC、序列化、缓存、Windows服务、线程池</Description>
     <Company>新生命开发团队</Company>
     <Copyright>©2002-2020 NewLife</Copyright>
-    <Version>8.5.2020.0130</Version>
-    <FileVersion>8.5.2020.0130</FileVersion>
+    <Version>8.5.2020.0129</Version>
+    <FileVersion>8.5.2020.0129</FileVersion>
     <AssemblyVersion>8.5.*</AssemblyVersion>
     <Deterministic>false</Deterministic>
     <OutputPath>..\..\Bin</OutputPath>

diff --git a/XUnitTest.Core/Configuration/JsonConfigProviderTests.cs b/XUnitTest.Core/Configuration/JsonConfigProviderTests.cs
@@ -96,7 +96,7 @@ public void TestBind()
 }";
 
             var prv = new JsonConfigProvider { FileName = "Config/core2.json" };
-            var file = prv.FileName.GetFullPath();
+            var file = prv.FileName.GetFullPath().EnsureDirectory(true);
             File.WriteAllText(file, json);
 
             var set = new ConfigModel();

diff --git a/XUnitTest.Core/Configuration/XmlConfigProviderTests.cs b/XUnitTest.Core/Configuration/XmlConfigProviderTests.cs
@@ -97,7 +97,7 @@ public void TestBind()
 </core>";
 
             var prv = new XmlConfigProvider { FileName = "Config/core2.xml" };
-            var file = prv.FileName.GetFullPath();
+            var file = prv.FileName.GetFullPath().EnsureDirectory(true);
             File.WriteAllText(file, json);
 
             var set = new ConfigModel();

diff --git a/XUnitTest.Core/XUnitTest.Core.csproj b/XUnitTest.Core/XUnitTest.Core.csproj
@@ -6,6 +6,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\BinCoreTest</OutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Debug'">
     <DefineConstants>$(DefineConstants);DEBUG</DefineConstants>

diff --git a/XUnitTest.XCode/XUnitTest.XCode.csproj b/XUnitTest.XCode/XUnitTest.XCode.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <IsPackable>false</IsPackable>
+    <OutputPath>..\BinXCodeTest</OutputPath>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />