ckaczor/sqltoolsservice
1
0
Fork 0
mirror of https://github.com/ckaczor/sqltoolsservice.git synced 2026-02-17 02:51:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix default test server names file path construction (#941)

Browse Source 
FileUtils.TestServerNamesDefaultFileName_get uses '… + @"\\" + …'
construct to build the default path for the test server names file.
While escaping a backslash in a verbatim string is a typo, the
approach was error-prone. Replace string manipulation and environment
variables magic with calls to well-tested library functions.

GetSettingFileContent() displays a message on switching to VS Code
settings when SQL connection instances were configured.
Move the message to the branch for the absent test configuration file.
This commit is contained in:
Aleksei Guzev
2020-04-06 18:43:02 +03:00
committed by GitHub
parent 6cecba4f85
commit 1cb0b98148
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/Microsoft.SqlTools.ServiceLayer.Test.Common/FileUtils.cs
View File

@@ -4,6 +4,7 @@
// //
using System; using System;
using System.IO;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
namespace Microsoft.SqlTools.ServiceLayer.Test.Common namespace Microsoft.SqlTools.ServiceLayer.Test.Common
@@ -53,17 +54,25 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
get get
{ {
string testServerFileName = "testServerNames.json"; string testServerFileName = "testServerNames.json";
return Path.Combine(TestServerNamesDefaultDirectory, testServerFileName);
}
}
public static string TestServerNamesDefaultDirectory
{
get
{
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{ {
return Environment.GetEnvironmentVariable("APPDATA") + @"\\" + testServerFileName; return Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData);
} }
else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{ {
return Environment.GetEnvironmentVariable("HOME") + @"/" + testServerFileName; return Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
} }
else else
{ {
return Environment.GetEnvironmentVariable("HOME") + @"/" + testServerFileName; return Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
} }
} }
} }

2
test/Microsoft.SqlTools.ServiceLayer.Test.Common/TestConfigPersistenceHelper.cs
View File

@@ -152,11 +152,11 @@ namespace Microsoft.SqlTools.ServiceLayer.Test.Common
if (File.Exists(DefaultSettingFileName)) if (File.Exists(DefaultSettingFileName))
{ {
settingsFileName = DefaultSettingFileName; settingsFileName = DefaultSettingFileName;
Console.WriteLine(DefaultSettingFileName + " SQL connection instances are not configured. Will try to get connections from VS code settings.json");
} }
else else
{ {
//If the SQL connection settings is not set use the VS code one //If the SQL connection settings is not set use the VS code one
Console.WriteLine(DefaultSettingFileName + " SQL connection instances are not configured. Will try to get connections from VS code settings.json");
settingsFileName = FileUtils.VsCodeSettingsFileName; settingsFileName = FileUtils.VsCodeSettingsFileName;
} }
} }