diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/DotNetOpenId.Test/Hosting/AspNetHost.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenId.Test/Hosting/HttpHost.cs | 4 | ||||
| -rw-r--r-- | src/DotNetOpenId.Test/Logging.config | 16 | ||||
| -rw-r--r-- | src/DotNetOpenId.Test/Mocks/MockHttpRequest.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenId.Test/TestSupport.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenId.Test/UI/IdentityEndpointTest.cs | 2 | ||||
| -rw-r--r-- | src/DotNetOpenId.Test/UI/WebControlTesting.cs | 4 | ||||
| -rw-r--r-- | src/DotNetOpenId/UntrustedWebResponse.cs | 2 |
8 files changed, 22 insertions, 12 deletions
diff --git a/src/DotNetOpenId.Test/Hosting/AspNetHost.cs b/src/DotNetOpenId.Test/Hosting/AspNetHost.cs index 0b0acd8..47480f2 100644 --- a/src/DotNetOpenId.Test/Hosting/AspNetHost.cs +++ b/src/DotNetOpenId.Test/Hosting/AspNetHost.cs @@ -49,7 +49,7 @@ namespace DotNetOpenId.Test.Hosting { HttpRuntime.ProcessRequest(new TestingWorkerRequest(context, tw));
}
} catch (Exception ex) {
- Console.WriteLine(ex);
+ TestSupport.Logger.Error("Exception in AspNetHost", ex);
throw;
}
}
diff --git a/src/DotNetOpenId.Test/Hosting/HttpHost.cs b/src/DotNetOpenId.Test/Hosting/HttpHost.cs index d6e73ab..dc69848 100644 --- a/src/DotNetOpenId.Test/Hosting/HttpHost.cs +++ b/src/DotNetOpenId.Test/Hosting/HttpHost.cs @@ -73,10 +73,10 @@ namespace DotNetOpenId.Test.Hosting { return sr.ReadToEnd();
}
} catch (WebException ex) {
- Console.Error.WriteLine(ex);
+ TestSupport.Logger.Error("Exception in HttpHost", ex);
using (StreamReader sr = new StreamReader(ex.Response.GetResponseStream())) {
string streamContent = sr.ReadToEnd();
- Console.Error.WriteLine(streamContent);
+ TestSupport.Logger.ErrorFormat("Error content stream follows: {0}", streamContent);
}
throw;
}
diff --git a/src/DotNetOpenId.Test/Logging.config b/src/DotNetOpenId.Test/Logging.config index e1c1d5b..184568b 100644 --- a/src/DotNetOpenId.Test/Logging.config +++ b/src/DotNetOpenId.Test/Logging.config @@ -11,13 +11,23 @@ <conversionPattern value="%date [%thread] %-5level %logger - %message%newline" />
</layout>
</appender>
+ <appender name="TraceAppender" type="log4net.Appender.TraceAppender">
+ <immediateFlush value="true" />
+ <layout type="log4net.Layout.PatternLayout">
+ <conversionPattern value="%-5level - %message%newline" />
+ </layout>
+ </appender>
<!-- Setup the root category, add the appenders and set the default level -->
<root>
- <level value="INFO" />
- <appender-ref ref="RollingFileAppender" />
+ <level value="Warn" />
+ <!--<appender-ref ref="RollingFileAppender" />-->
+ <appender-ref ref="TraceAppender" />
</root>
<!-- Specify the level for some specific categories -->
<logger name="DotNetOpenId">
- <level value="ALL" />
+ <level value="Off" />
+ </logger>
+ <logger name="DotNetOpenId.Test">
+ <level value="Info" />
</logger>
</log4net>
diff --git a/src/DotNetOpenId.Test/Mocks/MockHttpRequest.cs b/src/DotNetOpenId.Test/Mocks/MockHttpRequest.cs index 5f12694..2122317 100644 --- a/src/DotNetOpenId.Test/Mocks/MockHttpRequest.cs +++ b/src/DotNetOpenId.Test/Mocks/MockHttpRequest.cs @@ -38,7 +38,7 @@ namespace DotNetOpenId.Test.Mocks { if (response == null) throw new ArgumentNullException("response");
UntrustedWebRequest.MockRequests = MockRequestResponse;
if (registeredMockResponses.ContainsKey(response.RequestUri)) {
- Trace.TraceWarning("Mock HTTP response already registered for {0}.", response.RequestUri);
+ TestSupport.Logger.WarnFormat("Mock HTTP response already registered for {0}.", response.RequestUri);
} else {
registeredMockResponses.Add(response.RequestUri, response);
}
diff --git a/src/DotNetOpenId.Test/TestSupport.cs b/src/DotNetOpenId.Test/TestSupport.cs index 45134b5..33c8b39 100644 --- a/src/DotNetOpenId.Test/TestSupport.cs +++ b/src/DotNetOpenId.Test/TestSupport.cs @@ -14,6 +14,7 @@ using NUnit.Framework; using IProviderAssociationStore = DotNetOpenId.IAssociationStore<DotNetOpenId.AssociationRelyingPartyType>;
using ProviderMemoryStore = DotNetOpenId.AssociationMemoryStore<DotNetOpenId.AssociationRelyingPartyType>;
using DotNetOpenId.Test.UI;
+using log4net;
[SetUpFixture]
public class TestSupport {
@@ -28,6 +29,7 @@ public class TestSupport { public const string OPDefaultPage = "OPDefault.aspx";
public static Uri ReturnTo { get { return TestSupport.GetFullUrl(TestSupport.ConsumerPage); } }
public static Realm Realm { get { return new Realm(TestSupport.GetFullUrl(TestSupport.ConsumerPage).AbsoluteUri); } }
+ public readonly static ILog Logger = LogManager.GetLogger("DotNetOpenId.Test");
public enum Scenarios {
// Authentication test scenarios
diff --git a/src/DotNetOpenId.Test/UI/IdentityEndpointTest.cs b/src/DotNetOpenId.Test/UI/IdentityEndpointTest.cs index 2ad2960..89ec02a 100644 --- a/src/DotNetOpenId.Test/UI/IdentityEndpointTest.cs +++ b/src/DotNetOpenId.Test/UI/IdentityEndpointTest.cs @@ -17,7 +17,7 @@ namespace DotNetOpenId.Test.UI { TestSupport.Scenarios scenario = TestSupport.Scenarios.AutoApproval;
Identifier identityUrl = TestSupport.GetIdentityUrl(scenario, version);
string html = UITestSupport.Host.ProcessRequest(identityUrl);
- Trace.TraceInformation("{0} response:{1}{2}", identityUrl, Environment.NewLine, html);
+ TestSupport.Logger.InfoFormat("{0} response:{1}{2}", identityUrl, Environment.NewLine, html);
Assert.IsTrue(Regex.IsMatch(html, string.Format(CultureInfo.InvariantCulture,
@"\<link rel=""{1}"" href=""http://[^/]+/{0}""\>\</link\>",
Regex.Escape(TestSupport.ProviderPage),
diff --git a/src/DotNetOpenId.Test/UI/WebControlTesting.cs b/src/DotNetOpenId.Test/UI/WebControlTesting.cs index 08afecf..2ec010f 100644 --- a/src/DotNetOpenId.Test/UI/WebControlTesting.cs +++ b/src/DotNetOpenId.Test/UI/WebControlTesting.cs @@ -58,10 +58,10 @@ namespace DotNetOpenId.Test.UI { redirectUrl = new Uri(providerResponse.Headers[HttpResponseHeader.Location]);
}
} catch (WebException ex) {
- Trace.WriteLine(ex);
+ TestSupport.Logger.Error("WebException", ex);
if (ex.Response != null) {
using (StreamReader sr = new StreamReader(ex.Response.GetResponseStream())) {
- Trace.WriteLine(sr.ReadToEnd());
+ TestSupport.Logger.ErrorFormat("Response stream follows: {0}", sr.ReadToEnd());
}
}
throw;
diff --git a/src/DotNetOpenId/UntrustedWebResponse.cs b/src/DotNetOpenId/UntrustedWebResponse.cs index edc0b6f..5214114 100644 --- a/src/DotNetOpenId/UntrustedWebResponse.cs +++ b/src/DotNetOpenId/UntrustedWebResponse.cs @@ -33,8 +33,6 @@ namespace DotNetOpenId { ContentEncoding = string.IsNullOrEmpty(response.ContentEncoding) ? DefaultContentEncoding : response.ContentEncoding;
Headers = response.Headers;
FinalUri = response.ResponseUri;
-
- Trace.TraceWarning("Unmocked HTTP response: {0}", this);
}
/// <summary>
|