Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

External ActorSystem for Testkit event filters. #1753

Merged
merged 1 commit into from
Mar 17, 2016
Merged

External ActorSystem for Testkit event filters. #1753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 19 additions & 15 deletions src/core/Akka.TestKit.Tests/Xunit2/TestEventListenerTests/AllTestForEventFilterBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,18 @@ namespace Akka.TestKit.Tests.Xunit2.TestEventListenerTests
public abstract class AllTestForEventFilterBase<TLogEvent> : EventFilterTestBase where TLogEvent : LogEvent
{
// ReSharper disable ConvertToLambdaExpression
private readonly EventFilterFactory _testingEventFilter;

protected AllTestForEventFilterBase(string config)
: base(config)
{
LogLevel = Logging.LogLevelFor<TLogEvent>();
// ReSharper disable once VirtualMemberCallInContructor
_testingEventFilter = CreateTestingEventFilter();
}

protected LogLevel LogLevel { get; private set; }
protected abstract EventFilterFactory CreateTestingEventFilter();

protected void LogMessage(string message)
{
Expand All @@ -40,22 +44,22 @@ protected override void SendRawLogEventMessage(object message)
[Fact]
public void Single_message_is_intercepted()
{
EventFilter.ForLogLevel(LogLevel).ExpectOne(() => LogMessage("whatever"));
_testingEventFilter.ForLogLevel(LogLevel).ExpectOne(() => LogMessage("whatever"));
TestSuccessful = true;
}


[Fact]
public void Can_intercept_messages_when_start_is_specified()
{
EventFilter.ForLogLevel(LogLevel, start: "what").ExpectOne(() => LogMessage("whatever"));
_testingEventFilter.ForLogLevel(LogLevel, start: "what").ExpectOne(() => LogMessage("whatever"));
TestSuccessful = true;
}

[Fact]
public void Do_not_intercept_messages_when_start_does_not_match()
{
EventFilter.ForLogLevel(LogLevel, start: "what").ExpectOne(() =>
_testingEventFilter.ForLogLevel(LogLevel, start: "what").ExpectOne(() =>
{
LogMessage("let-me-thru");
LogMessage("whatever");
Expand All @@ -67,7 +71,7 @@ public void Do_not_intercept_messages_when_start_does_not_match()
[Fact]
public void Can_intercept_messages_when_message_is_specified()
{
EventFilter.ForLogLevel(LogLevel, message: "whatever").ExpectOne(() => LogMessage("whatever"));
_testingEventFilter.ForLogLevel(LogLevel, message: "whatever").ExpectOne(() => LogMessage("whatever"));
TestSuccessful = true;
}

Expand All @@ -86,14 +90,14 @@ public void Do_not_intercept_messages_when_message_does_not_match()
[Fact]
public void Can_intercept_messages_when_contains_is_specified()
{
EventFilter.ForLogLevel(LogLevel, contains: "ate").ExpectOne(() => LogMessage("whatever"));
_testingEventFilter.ForLogLevel(LogLevel, contains: "ate").ExpectOne(() => LogMessage("whatever"));
TestSuccessful = true;
}

[Fact]
public void Do_not_intercept_messages_when_contains_does_not_match()
{
EventFilter.ForLogLevel(LogLevel, contains: "eve").ExpectOne(() =>
_testingEventFilter.ForLogLevel(LogLevel, contains: "eve").ExpectOne(() =>
{
LogMessage("let-me-thru");
LogMessage("whatever");
Expand All @@ -106,14 +110,14 @@ public void Do_not_intercept_messages_when_contains_does_not_match()
[Fact]
public void Can_intercept_messages_when_source_is_specified()
{
EventFilter.ForLogLevel(LogLevel, source: GetType().FullName).ExpectOne(() => LogMessage("whatever"));
_testingEventFilter.ForLogLevel(LogLevel, source: GetType().FullName).ExpectOne(() => LogMessage("whatever"));
TestSuccessful = true;
}

[Fact]
public void Do_not_intercept_messages_when_source_does_not_match()
{
EventFilter.ForLogLevel(LogLevel, source: "expected-source").ExpectOne(() =>
_testingEventFilter.ForLogLevel(LogLevel, source: "expected-source").ExpectOne(() =>
{
PublishMessage("message", source: "expected-source");
PublishMessage("message", source: "let-me-thru");
Expand All @@ -127,7 +131,7 @@ public void Do_not_intercept_messages_when_source_does_not_match()
[Fact]
public void Specified_numbers_of_messagesan_be_intercepted()
{
EventFilter.ForLogLevel(LogLevel).Expect(2, () =>
_testingEventFilter.ForLogLevel(LogLevel).Expect(2, () =>
{
LogMessage("whatever");
LogMessage("whatever");
Expand All @@ -139,7 +143,7 @@ public void Specified_numbers_of_messagesan_be_intercepted()
[Fact]
public void Messages_can_be_muted()
{
EventFilter.ForLogLevel(LogLevel).Mute(() =>
_testingEventFilter.ForLogLevel(LogLevel).Mute(() =>
{
LogMessage("whatever");
LogMessage("whatever");
Expand All @@ -151,7 +155,7 @@ public void Messages_can_be_muted()
[Fact]
public void Messages_can_be_muted_from_now_on()
{
var unmutableFilter = EventFilter.ForLogLevel(LogLevel).Mute();
var unmutableFilter = _testingEventFilter.ForLogLevel(LogLevel).Mute();
LogMessage("whatever");
LogMessage("whatever");
unmutableFilter.Unmute();
Expand All @@ -161,7 +165,7 @@ public void Messages_can_be_muted_from_now_on()
[Fact]
public void Messages_can_be_muted_from_now_on_with_using()
{
using(EventFilter.ForLogLevel(LogLevel).Mute())
using(_testingEventFilter.ForLogLevel(LogLevel).Mute())
{
LogMessage("whatever");
LogMessage("whatever");
Expand All @@ -173,7 +177,7 @@ public void Messages_can_be_muted_from_now_on_with_using()
[Fact]
public void Make_sure_async_works()
{
EventFilter.ForLogLevel(LogLevel).Expect(1, TimeSpan.FromMilliseconds(100), () =>
_testingEventFilter.ForLogLevel(LogLevel).Expect(1, TimeSpan.FromMilliseconds(100), () =>
{
Task.Delay(TimeSpan.FromMilliseconds(10)).ContinueWith(t => { LogMessage("whatever"); });
});
Expand All @@ -182,7 +186,7 @@ public void Make_sure_async_works()
[Fact]
public void Chain_many_filters()
{
EventFilter
_testingEventFilter
.ForLogLevel(LogLevel,message:"Message 1").And
.ForLogLevel(LogLevel,message:"Message 3")
.Expect(2,() =>
Expand All @@ -201,7 +205,7 @@ public void Should_timeout_if_too_few_messages()
{
var exception = XAssert.Throws<TrueException>(() =>
{
EventFilter.ForLogLevel(LogLevel).Expect(2, TimeSpan.FromMilliseconds(50), () =>
_testingEventFilter.ForLogLevel(LogLevel).Expect(2, TimeSpan.FromMilliseconds(50), () =>
{
LogMessage("whatever");
});
Expand Down
81 changes: 81 additions & 0 deletions ...e/Akka.TestKit.Tests/Xunit2/TestEventListenerTests/AllTestForEventFilterBase_Instances.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,87 @@ public class EventFilterDebugTests : AllTestForEventFilterBase<Debug>
{
public EventFilterDebugTests() : base("akka.loglevel=DEBUG"){}

protected override EventFilterFactory CreateTestingEventFilter()
{
return EventFilter;
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Debug(source,GetType(),message));
}
}

public class CustomEventFilterDebugTests : AllTestForEventFilterBase<Debug>
{
public CustomEventFilterDebugTests() : base("akka.loglevel=DEBUG") { }

protected override EventFilterFactory CreateTestingEventFilter()
{
return CreateEventFilter(Sys);
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Debug(source, GetType(), message));
}
}

public class EventFilterInfoTests : AllTestForEventFilterBase<Info>
{
public EventFilterInfoTests() : base("akka.loglevel=INFO") { }

protected override EventFilterFactory CreateTestingEventFilter()
{
return EventFilter;
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Info(source, GetType(), message));
}
}

public class CustomEventFilterInfoTests : AllTestForEventFilterBase<Info>
{
public CustomEventFilterInfoTests() : base("akka.loglevel=INFO") { }

protected override EventFilterFactory CreateTestingEventFilter()
{
return CreateEventFilter(Sys);
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Info(source, GetType(), message));
}
}


public class EventFilterWarningTests : AllTestForEventFilterBase<Warning>
{
public EventFilterWarningTests() : base("akka.loglevel=WARNING") { }

protected override EventFilterFactory CreateTestingEventFilter()
{
return EventFilter;
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Warning(source, GetType(), message));
}
}

public class CustomEventFilterWarningTests : AllTestForEventFilterBase<Warning>
{
public CustomEventFilterWarningTests() : base("akka.loglevel=WARNING") { }

protected override EventFilterFactory CreateTestingEventFilter()
{
return CreateEventFilter(Sys);
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Warning(source, GetType(), message));
Expand All @@ -43,6 +104,26 @@ public class EventFilterErrorTests : AllTestForEventFilterBase<Error>
{
public EventFilterErrorTests() : base("akka.loglevel=ERROR") { }

protected override EventFilterFactory CreateTestingEventFilter()
{
return EventFilter;
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Error(null, source, GetType(), message));
}
}

public class CustomEventFilterErrorTests : AllTestForEventFilterBase<Error>
{
public CustomEventFilterErrorTests() : base("akka.loglevel=ERROR") { }

protected override EventFilterFactory CreateTestingEventFilter()
{
return CreateEventFilter(Sys);
}

protected override void PublishMessage(object message, string source)
{
Sys.EventStream.Publish(new Error(null, source, GetType(), message));
Expand Down
28 changes: 24 additions & 4 deletions src/core/Akka.TestKit.Tests/Xunit2/TestEventListenerTests/CustomEventFilterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,23 @@

namespace Akka.TestKit.Tests.Xunit2.TestEventListenerTests
{
public class CustomEventFilterTests : EventFilterTestBase
public abstract class CustomEventFilterTestsBase : EventFilterTestBase
{
// ReSharper disable ConvertToLambdaExpression
public CustomEventFilterTests() : base("akka.loglevel=ERROR") { }
public CustomEventFilterTestsBase() : base("akka.loglevel=ERROR") { }

protected override void SendRawLogEventMessage(object message)
{
Sys.EventStream.Publish(new Error(null, "CustomEventFilterTests", GetType(), message));
}

protected abstract EventFilterFactory CreateTestingEventFilter();

[Fact]
public void Custom_filter_should_match()
{
EventFilter.Custom(logEvent => logEvent is Error && (string) logEvent.Message == "whatever").ExpectOne(() =>
var eventFilter = CreateTestingEventFilter();
eventFilter.Custom(logEvent => logEvent is Error && (string) logEvent.Message == "whatever").ExpectOne(() =>
{
Log.Error("whatever");
});
Expand All @@ -32,12 +35,29 @@ public void Custom_filter_should_match()
[Fact]
public void Custom_filter_should_match2()
{
EventFilter.Custom<Error>(logEvent => (string)logEvent.Message == "whatever").ExpectOne(() =>
var eventFilter = CreateTestingEventFilter();
eventFilter.Custom<Error>(logEvent => (string)logEvent.Message == "whatever").ExpectOne(() =>
{
Log.Error("whatever");
});
}
// ReSharper restore ConvertToLambdaExpression
}

public class CustomEventFilterTests : CustomEventFilterTestsBase
{
protected override EventFilterFactory CreateTestingEventFilter()
{
return EventFilter;
}
}

public class CustomEventFilterCustomFilterTests : CustomEventFilterTestsBase
{
protected override EventFilterFactory CreateTestingEventFilter()
{
return CreateEventFilter(Sys);
}
}
}

26 changes: 23 additions & 3 deletions src/core/Akka.TestKit.Tests/Xunit2/TestEventListenerTests/DeadLettersEventFilterTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@

namespace Akka.TestKit.Tests.Xunit2.TestEventListenerTests
{
public class DeadLettersEventFilterTests : EventFilterTestBase
public abstract class DeadLettersEventFilterTestsBase : EventFilterTestBase
{
private readonly IActorRef _deadActor;

// ReSharper disable ConvertToLambdaExpression
public DeadLettersEventFilterTests() : base("akka.loglevel=ERROR")
protected DeadLettersEventFilterTestsBase() : base("akka.loglevel=ERROR")
{
_deadActor = Sys.ActorOf(BlackHoleActor.Props, "dead-actor");
Watch(_deadActor);
Expand All @@ -29,10 +30,13 @@ protected override void SendRawLogEventMessage(object message)
Sys.EventStream.Publish(new Error(null, "DeadLettersEventFilterTests", GetType(), message));
}

protected abstract EventFilterFactory CreateTestingEventFilter();

[Fact]
public void Should_be_able_to_filter_dead_letters()
{
EventFilter.DeadLetter().ExpectOne(() =>
var eventFilter = CreateTestingEventFilter();
eventFilter.DeadLetter().ExpectOne(() =>
{
_deadActor.Tell("whatever");
});
Expand All @@ -41,5 +45,21 @@ public void Should_be_able_to_filter_dead_letters()

// ReSharper restore ConvertToLambdaExpression
}

public class DeadLettersEventFilterTests : DeadLettersEventFilterTestsBase
{
protected override EventFilterFactory CreateTestingEventFilter()
{
return EventFilter;
}
}

public class DeadLettersCustomEventFilterTests : DeadLettersEventFilterTestsBase
{
protected override EventFilterFactory CreateTestingEventFilter()
{
return CreateEventFilter(Sys);
}
}
}