-
Notifications
You must be signed in to change notification settings - Fork 151
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1170 from nunit/issue-1168
Refactoring and moving RuntimeFramework class
- Loading branch information
Showing
26 changed files
with
1,235 additions
and
1,194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
60 changes: 26 additions & 34 deletions
60
src/NUnitEngine/nunit.engine.core.tests/Extensibility/ExtensionAssemblyTests.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,62 +1,54 @@ | ||
| // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt | ||
|
|
||
| using System; | ||
| using System.Reflection; | ||
| using System.IO; | ||
| using NUnit.Engine.Extensibility; | ||
| using NUnit.Framework; | ||
|
|
||
| namespace NUnit.Engine.Tests.Extensibility | ||
| #if NETFRAMEWORK | ||
| using FrameworkName = NUnit.Engine.Compatibility.FrameworkName; | ||
| #else | ||
| using FrameworkName = System.Runtime.Versioning.FrameworkName; | ||
| #endif | ||
|
|
||
| namespace NUnit.Engine.Extensibility | ||
| { | ||
| // TODO: This should actually give us 3.5 | ||
| [TestFixture("../net35/mock-assembly.dll", FrameworkIdentifiers.NetFramework, "2.0")] | ||
| [TestFixture("../netcoreapp2.1/mock-assembly.dll", FrameworkIdentifiers.NetCoreApp, "2.1")] | ||
| [TestFixture("../netcoreapp3.1/mock-assembly.dll", FrameworkIdentifiers.NetCoreApp, "3.1")] | ||
| [TestFixture("../net5.0/mock-assembly.dll", FrameworkIdentifiers.NetCoreApp, "5.0")] | ||
| [TestFixture("../net6.0/mock-assembly.dll", FrameworkIdentifiers.NetCoreApp, "6.0")] | ||
| public class ExtensionAssemblyTests | ||
| { | ||
| private static readonly Assembly THIS_ASSEMBLY = Assembly.GetExecutingAssembly(); | ||
| private static readonly string THIS_ASSEMBLY_PATH = THIS_ASSEMBLY.Location; | ||
| private static readonly string THIS_ASSEMBLY_FULL_NAME = THIS_ASSEMBLY.GetName().FullName; | ||
| private static readonly string THIS_ASSEMBLY_NAME = THIS_ASSEMBLY.GetName().Name; | ||
| private static readonly Version THIS_ASSEMBLY_VERSION = THIS_ASSEMBLY.GetName().Version; | ||
|
|
||
| private string _assemblyPath; | ||
| private string _assemblyFileName; | ||
| private FrameworkName _expectedTargetRuntime; | ||
| private ExtensionAssembly _ea; | ||
|
|
||
| [OneTimeSetUp] | ||
| public void CreateExtensionAssemblies() | ||
| { | ||
| _ea = new ExtensionAssembly(THIS_ASSEMBLY_PATH, false); | ||
| } | ||
|
|
||
| [Test] | ||
| public void AssemblyDefinition() | ||
| public ExtensionAssemblyTests(string assemblyPath, string expectedRuntime, string expectedVersion) | ||
| { | ||
| Assert.That(_ea.Assembly.FullName, Is.EqualTo(THIS_ASSEMBLY_FULL_NAME)); | ||
| _assemblyPath = assemblyPath; | ||
| _assemblyFileName = Path.GetFileNameWithoutExtension(assemblyPath); | ||
| _expectedTargetRuntime = new FrameworkName(expectedRuntime, new Version(expectedVersion)); | ||
| } | ||
|
|
||
| [Test] | ||
| public void MainModule() | ||
| [OneTimeSetUp] | ||
| public void CreateExtensionAssemblies() | ||
| { | ||
| Assert.That(_ea.MainModule.Assembly.FullName, Is.EqualTo(THIS_ASSEMBLY_FULL_NAME)); | ||
| _ea = new ExtensionAssembly(_assemblyPath, false); | ||
| } | ||
|
|
||
| [Test] | ||
| public void AssemblyName() | ||
| { | ||
| Assert.That(_ea.AssemblyName, Is.EqualTo(THIS_ASSEMBLY_NAME)); | ||
| Assert.That(_ea.AssemblyName, Is.EqualTo(_assemblyFileName)); | ||
| } | ||
|
|
||
| [Test] | ||
| public void AssemblyVersion() | ||
| { | ||
| Assert.That(_ea.AssemblyVersion, Is.EqualTo(THIS_ASSEMBLY_VERSION)); | ||
| } | ||
|
|
||
| #if NETFRAMEWORK | ||
| [Test] | ||
| public void TargetFramework() | ||
| { | ||
| Assert.Multiple(() => | ||
| { | ||
| Assert.That(_ea.TargetFramework, Has.Property(nameof(RuntimeFramework.Runtime)).EqualTo(RuntimeType.Any)); | ||
| Assert.That(_ea.TargetFramework, Has.Property(nameof(RuntimeFramework.FrameworkVersion)).EqualTo(new Version(2, 0))); | ||
| }); | ||
| Assert.That(_ea.TargetRuntime, Is.EqualTo(_expectedTargetRuntime)); | ||
| } | ||
| #endif | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.