diff options
| author | Miguel Costa <miguel.costa@qt.io> | 2023-12-04 17:46:26 +0100 |
|---|---|---|
| committer | Miguel Costa <miguel.costa@qt.io> | 2023-12-06 14:41:36 +0000 |
| commit | d951f4999cfca3b620ebe20898d170a9e21c8984 (patch) | |
| tree | d4caa34445ecf3c5b27e9097ec66187f92ec155c | |
| parent | c87bf6379b866ee3482eb4e04ceb8979bd8ee258 (diff) | |
Amend f30289d1
* Build auto-tests will only be allowed for VS 2022.
This is due to the extension not matching the platform used in tests.
* Other test projects (Tasks, Core, Package) are now also included.
* Removed unnecessary refs project test project.
* Moved critical code path from Debug-only expression.
In Release, the expression in not evaluated, so the test fails.
* Use Assert.Inconclusive instead of throwing InvalidaOperation
Change-Id: I8879dde023a868a822eab53718d5a912ea4dca48
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | Tests/Test_QtVsTools.Core/Test_LazyFactory.cs | 4 | ||||
| -rw-r--r-- | Tests/Test_QtVsTools.Package/QtVsTestClient.cs | 3 | ||||
| -rw-r--r-- | Tests/Test_QtVsTools.Package/Test_QtVsTools.Package.csproj | 4 | ||||
| -rw-r--r-- | vstools.sln | 14 |
4 files changed, 14 insertions, 11 deletions
diff --git a/Tests/Test_QtVsTools.Core/Test_LazyFactory.cs b/Tests/Test_QtVsTools.Core/Test_LazyFactory.cs index 000d3596..b92883f3 100644 --- a/Tests/Test_QtVsTools.Core/Test_LazyFactory.cs +++ b/Tests/Test_QtVsTools.Core/Test_LazyFactory.cs @@ -19,7 +19,6 @@ namespace QtVsTools.Test.Core class LazyClass { LazyFactory Lazy { get; } = new(); - public ConcurrentBag<int> InitThread { get; } = new(); public string LazyProperty => Lazy.Get(() => LazyProperty, () => @@ -40,7 +39,8 @@ namespace QtVsTools.Test.Core var n = i; tasks[i] = Task.Run(() => { - Debug.WriteLine($"Lazy value #{n} is {lazyObject.LazyProperty}"); + var lazyValue = lazyObject.LazyProperty; + Debug.WriteLine($"Lazy value #{n} is {lazyValue}"); }); } await Task.WhenAll(tasks); diff --git a/Tests/Test_QtVsTools.Package/QtVsTestClient.cs b/Tests/Test_QtVsTools.Package/QtVsTestClient.cs index 701c2f52..0fa5cc8d 100644 --- a/Tests/Test_QtVsTools.Package/QtVsTestClient.cs +++ b/Tests/Test_QtVsTools.Package/QtVsTestClient.cs @@ -9,6 +9,7 @@ using System.IO; using System.IO.Pipes; using System.Linq; using System.Text; +using Microsoft.VisualStudio.TestTools.UnitTesting; namespace QtVsTools.Test { @@ -29,7 +30,7 @@ namespace QtVsTools.Test .FirstOrDefault(p => p.Id != Process.GetCurrentProcess().Id && !p.MainWindowTitle.StartsWith("vstools")); if (vsProc == null) - throw new InvalidOperationException("VS process not found"); + Assert.Inconclusive("VS process not found"); vsProcId = vsProc.Id; } var client = new QtVsTestClient(vsProcId.Value); diff --git a/Tests/Test_QtVsTools.Package/Test_QtVsTools.Package.csproj b/Tests/Test_QtVsTools.Package/Test_QtVsTools.Package.csproj index 03e8e75a..17d5acd2 100644 --- a/Tests/Test_QtVsTools.Package/Test_QtVsTools.Package.csproj +++ b/Tests/Test_QtVsTools.Package/Test_QtVsTools.Package.csproj @@ -58,10 +58,6 @@ // --> <Import Project="$(SolutionDir)\references.props" /> <ItemGroup> - <PackageReference Include="$(Name_Microsoft_VSSDK_BuildTools)" Version="$(Version_Microsoft_VSSDK_BuildTools)" /> - <PackageReference Include="$(Name_Microsoft_VisualStudio_SDK)" Version="$(Version_Microsoft_VisualStudio_SDK)" ExcludeAssets="runtime" /> - <PackageReference Include="$(Name_Microsoft_Build)" Version="$(Version_Microsoft_Build)" /> - <PackageReference Include="$(Name_Microsoft_Build_Tasks_Core)" Version="$(Version_Microsoft_Build_Tasks_Core)" /> <PackageReference Include="$(Name_MSTest_TestAdapter)" Version="$(Version_MSTest_TestAdapter)" /> <PackageReference Include="$(Name_MSTest_TestFramework)" Version="$(Version_MSTest_TestFramework)" /> </ItemGroup> diff --git a/vstools.sln b/vstools.sln index b0d7a186..c3eb1bb3 100644 --- a/vstools.sln +++ b/vstools.sln @@ -612,20 +612,17 @@ Global {12857847-9877-466C-B056-DD286A219093}.Tests|x64.ActiveCfg = Release|x64 {12857847-9877-466C-B056-DD286A219093}.Tests|x86.ActiveCfg = Release|x64 {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Debug|Any CPU.Build.0 = Debug|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Debug|x64.ActiveCfg = Debug|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Debug|x64.Build.0 = Debug|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Debug|x86.ActiveCfg = Debug|Any CPU - {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Debug|x86.Build.0 = Debug|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Release|Any CPU.ActiveCfg = Release|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Release|x64.ActiveCfg = Release|Any CPU + {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Release|x64.Build.0 = Release|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Release|x86.ActiveCfg = Release|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Tests|Any CPU.ActiveCfg = Release|Any CPU - {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Tests|Any CPU.Build.0 = Release|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Tests|x64.ActiveCfg = Release|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Tests|x64.Build.0 = Release|Any CPU {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Tests|x86.ActiveCfg = Release|Any CPU - {D90720E3-0D5E-42A3-90DE-A5265EA22F80}.Tests|x86.Build.0 = Release|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Debug|Any CPU.Build.0 = Debug|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -633,8 +630,11 @@ Global {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Debug|x86.ActiveCfg = Debug|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Debug|x86.Build.0 = Debug|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Release|Any CPU.Build.0 = Release|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Release|x64.ActiveCfg = Release|Any CPU + {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Release|x64.Build.0 = Release|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Release|x86.ActiveCfg = Release|Any CPU + {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Release|x86.Build.0 = Release|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Tests|Any CPU.ActiveCfg = Release|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Tests|Any CPU.Build.0 = Release|Any CPU {E809DDE3-AE76-4F7A-8DC5-775AC4900138}.Tests|x64.ActiveCfg = Release|Any CPU @@ -666,8 +666,11 @@ Global {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Debug|x86.ActiveCfg = Debug|Any CPU {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Debug|x86.Build.0 = Debug|Any CPU {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Release|Any CPU.Build.0 = Release|Any CPU {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Release|x64.ActiveCfg = Release|Any CPU + {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Release|x64.Build.0 = Release|Any CPU {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Release|x86.ActiveCfg = Release|Any CPU + {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Release|x86.Build.0 = Release|Any CPU {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Tests|Any CPU.ActiveCfg = Debug|Any CPU {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Tests|Any CPU.Build.0 = Debug|Any CPU {4B8FC08C-4901-45D4-BC00-C0C461292FF2}.Tests|x64.ActiveCfg = Debug|Any CPU @@ -681,8 +684,11 @@ Global {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Debug|x86.ActiveCfg = Debug|Any CPU {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Debug|x86.Build.0 = Debug|Any CPU {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Release|Any CPU.Build.0 = Release|Any CPU {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Release|x64.ActiveCfg = Release|Any CPU + {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Release|x64.Build.0 = Release|Any CPU {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Release|x86.ActiveCfg = Release|Any CPU + {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Release|x86.Build.0 = Release|Any CPU {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Tests|Any CPU.ActiveCfg = Debug|Any CPU {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Tests|Any CPU.Build.0 = Debug|Any CPU {AFD33401-2F15-4E72-AB35-42C3EE12E897}.Tests|x64.ActiveCfg = Debug|Any CPU |