← Back to branch summary

~ubuntu-branches/ubuntu/trusty/monodevelop/trusty-proposed

« back to all changes in this revision

Viewing changes to src/addins/NUnit/Services/ExternalTestRunner.cs

  • Committer: Package Import Robot
  • Author(s): Jo Shields
  • Date: 2013-05-12 09:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 29.
  • Revision ID: package-import@ubuntu.com-20130512094603-mad323bzcxvmcam0
Tags: upstream-4.0.5+dfsg
Import upstream version 4.0.5+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/NUnit/Services/ExternalTestRunner.cs
74
74
                        string asm = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "NUnitRunner.dll");
75
75
                        Assembly.LoadFrom (asm);
76
76
                }
77
 
                
78
 
                public UnitTestResult Run (IRemoteEventListener listener, ITestFilter filter, string path, string suiteName, List<string> supportAssemblies)
 
77
 
 
78
                public UnitTestResult Run (IRemoteEventListener listener, ITestFilter filter, string path, string suiteName, List<string> supportAssemblies, string testRunnerType, string testRunnerAssembly)
79
79
                {
80
80
                        NUnitTestRunner runner = GetRunner (path);
81
81
                        EventListenerWrapper listenerWrapper = listener != null ? new EventListenerWrapper (listener) : null;
82
82
                        
83
 
                        TestResult res = runner.Run (listenerWrapper, filter, path, suiteName, supportAssemblies);
 
83
                        TestResult res = runner.Run (listenerWrapper, filter, path, suiteName, supportAssemblies, testRunnerType, testRunnerAssembly);
84
84
                        return listenerWrapper.GetLocalTestResult (res);
85
85
                }
86
86
                
98
98
                        AppDomain domain = Services.DomainManager.CreateDomain (package);
99
99
                        string asm = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "NUnitRunner.dll");
100
100
                        runner = (NUnitTestRunner)domain.CreateInstanceFromAndUnwrap (asm, "MonoDevelop.NUnit.External.NUnitTestRunner");
101
 
                        runner.Initialize (typeof(NF.Assert).Assembly.Location, typeof(NC.Test).Assembly.Location);
 
101
                        runner.PreloadAssemblies (typeof(NF.Assert).Assembly.Location, typeof (NC.TestSuiteBuilder).Assembly.Location, typeof(NC.Test).Assembly.Location);
 
102
                        runner.Initialize ();
102
103
                        return runner;
103
104
                }
104
105
        }