mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2025-10-15 11:44:58 +08:00
Fixing some spec tests
Orchard.Themes is one of the modules needed to function Cleaning up some of the trace capture code --HG-- branch : dev
This commit is contained in:
@@ -16,8 +16,8 @@ namespace Orchard.Specs.Bindings {
|
||||
var webApp = Binding<WebAppHosting>();
|
||||
|
||||
webApp.GivenIHaveACleanSiteWith(TableData(
|
||||
new { extension = "module", names = "Orchard.Setup, Orchard.Users, Orchard.Roles, Orchard.Pages, Orchard.Comments, TinyMce" },
|
||||
new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Scheduling, Settings, Themes, XmlRpc" },
|
||||
new { extension = "module", names = "Orchard.Setup, Orchard.Themes, Orchard.Users, Orchard.Roles, Orchard.Pages, Orchard.Comments, TinyMce" },
|
||||
new { extension = "core", names = "Common, Dashboard, Feeds, HomePage, Navigation, Scheduling, Settings, XmlRpc" },
|
||||
new { extension = "theme", names = "SafeMode, Classic" }));
|
||||
|
||||
webApp.WhenIGoTo("Setup");
|
||||
|
@@ -40,17 +40,15 @@ namespace Orchard.Specs.Bindings {
|
||||
public void GivenIHaveACleanSiteBasedOn(string siteFolder) {
|
||||
_webHost = new WebHost();
|
||||
Host.Initialize(siteFolder, "/");
|
||||
var cb = new cb1();
|
||||
var shuttle = new Shuttle();
|
||||
Host.Execute(() => {
|
||||
log4net.Config.BasicConfigurator.Configure(new CallAppender(cb.cb2));
|
||||
HostingTraceListener.SetHook(msg => cb.sink.Receive(" "+ msg));
|
||||
log4net.Config.BasicConfigurator.Configure(new CastleAppender());
|
||||
HostingTraceListener.SetHook(msg => shuttle._sink.Receive(msg));
|
||||
});
|
||||
_messages = cb.sink;
|
||||
_messages = shuttle._sink;
|
||||
}
|
||||
|
||||
public class CallAppender : IAppender {
|
||||
private readonly cb2 _cb2;
|
||||
public CallAppender(cb2 cb2) { _cb2 = cb2; }
|
||||
private class CastleAppender : IAppender {
|
||||
public void Close() { }
|
||||
public string Name { get; set; }
|
||||
|
||||
@@ -72,20 +70,10 @@ namespace Orchard.Specs.Bindings {
|
||||
}
|
||||
|
||||
[Serializable]
|
||||
public class cb1 {
|
||||
public cb2 cb2 = new cb2();
|
||||
public MessageSink sink = new MessageSink();
|
||||
|
||||
class Shuttle {
|
||||
public readonly MessageSink _sink = new MessageSink();
|
||||
}
|
||||
|
||||
public class cb2 : MarshalByRefObject {
|
||||
private IDictionary<string, TraceSource> _sources;
|
||||
public void Trace(string loggerName, Level level, string message) {
|
||||
var traceLoggerFactory = new TraceLoggerFactory();
|
||||
traceLoggerFactory.Create(loggerName).Info(message);
|
||||
//System.Diagnostics.Trace.WriteLine(message);
|
||||
}
|
||||
}
|
||||
|
||||
[Given(@"I have module ""(.*)""")]
|
||||
public void GivenIHaveModule(string moduleName) {
|
||||
|
@@ -7,7 +7,7 @@ namespace Orchard.Specs.Hosting {
|
||||
readonly IList<string> _messages = new List<string>();
|
||||
|
||||
public void Receive(string message) {
|
||||
Trace.WriteLine(message);
|
||||
Trace.WriteLine(" "+message);
|
||||
_messages.Add(message);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user