diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2020-09-24 13:21:27 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-24 13:21:27 +0300 |
| commit | 48cfbdf9848d9c27c359cb3dc04e9db434ac9a88 (patch) | |
| tree | de8b855a5eccca38f82172bf63dc67e8ade4bb97 | |
| parent | 6788491d545966417e7d7842cd176dc38da1772d (diff) | |
| parent | b6531c14d6b9ef7fe40f45fdf61e2e27f8bc5b4b (diff) | |
Merge pull request #165 from mono/fix-tests
Fix unit tests
| -rw-r--r-- | Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs | 5 | ||||
| -rw-r--r-- | Test/UnitTests/TestBase.cs | 7 | ||||
| -rw-r--r-- | Test/UnitTests/TestScanDataFileGeneration.cs | 4 |
3 files changed, 13 insertions, 3 deletions
diff --git a/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs b/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs index 74e16d2..6c812c4 100644 --- a/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs +++ b/Mono.Addins/Mono.Addins.Database/AddinFileSystemExtension.cs @@ -174,6 +174,11 @@ namespace Mono.Addins.Database Type t; string asmFile = Path.Combine (Path.GetDirectoryName (GetType().Assembly.Location), "Mono.Addins.CecilReflector.dll"); if (File.Exists (asmFile)) { + // Make sure to load the Mono.Cecil next to the cecil reflector + var cecil = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "Mono.Cecil.dll"); + if (File.Exists (cecil)) + Assembly.LoadFile (cecil); + Assembly asm = Assembly.LoadFrom (asmFile); t = asm.GetType ("Mono.Addins.CecilReflector.Reflector"); } diff --git a/Test/UnitTests/TestBase.cs b/Test/UnitTests/TestBase.cs index f5485f6..0742fec 100644 --- a/Test/UnitTests/TestBase.cs +++ b/Test/UnitTests/TestBase.cs @@ -30,8 +30,11 @@ namespace UnitTests Directory.Delete (TempDir, true); Directory.CreateDirectory (TempDir); } - - AddinManager.Initialize (TempDir); + + // Provide the current assembly as startup assembly, otherwise it will pick the + // unit test runner as startup assembly + + AddinManager.AddinEngine.Initialize (GetType().Assembly, null, TempDir, null, null); if (firstRun) AddinManager.Registry.Update (new ConsoleProgressStatus (true)); diff --git a/Test/UnitTests/TestScanDataFileGeneration.cs b/Test/UnitTests/TestScanDataFileGeneration.cs index e50d72b..bb5c713 100644 --- a/Test/UnitTests/TestScanDataFileGeneration.cs +++ b/Test/UnitTests/TestScanDataFileGeneration.cs @@ -262,5 +262,7 @@ namespace UnitTests FileList.AddFile (path); return base.OpenFile (path); } - } + + public override bool RequiresIsolation => false; + } } |