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.

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

Akka.NET v0.6.3 - Release Notes #268

Merged
merged 18 commits into from
Aug 16, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#### 0.6.3 Aug 13 2014
* Made it so HOCON config sections chain properly
* Optimized actor memory footprint
* Fixed a Helios bug that caused Akka.NET to drop messages larger than 32kb

#### 0.6.2 Aug 05 2014
* Upgraded Helios dependency
* Bug fixes
Expand Down
1 change: 0 additions & 1 deletion VERSION

This file was deleted.

4 changes: 2 additions & 2 deletions src/SharedAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[assembly: AssemblyCompanyAttribute("Akka")]
[assembly: AssemblyCopyrightAttribute("Copyright © Roger Alsing 2013-2014")]
[assembly: AssemblyTrademarkAttribute("")]
[assembly: AssemblyVersionAttribute("0.6.2.0")]
[assembly: AssemblyFileVersionAttribute("0.6.2.0")]
[assembly: AssemblyVersionAttribute("0.6.3.0")]
[assembly: AssemblyFileVersionAttribute("0.6.3.0")]
namespace System {
}
6 changes: 3 additions & 3 deletions src/core/Akka.FSharp/Properties/AssemblyInfo.fs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ open System.Runtime.InteropServices
[<assembly: AssemblyCompanyAttribute("Akka.net")>]
[<assembly: ComVisibleAttribute(false)>]
[<assembly: CLSCompliantAttribute(true)>]
[<assembly: AssemblyVersionAttribute("0.6.2.0")>]
[<assembly: AssemblyFileVersionAttribute("0.6.2.0")>]
[<assembly: AssemblyVersionAttribute("0.6.3.0")>]
[<assembly: AssemblyFileVersionAttribute("0.6.3.0")>]
do ()

module internal AssemblyVersionInformation =
let [<Literal>] Version = "0.6.2.0"
let [<Literal>] Version = "0.6.3.0"
2 changes: 1 addition & 1 deletion src/core/Akka.Remote/Akka.Remote.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
</Reference>
<Reference Include="Helios, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\packages\Helios.1.3.0.0\lib\net45\Helios.dll</HintPath>
<HintPath>..\..\packages\Helios.1.3.4.0\lib\net45\Helios.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
2 changes: 1 addition & 1 deletion src/core/Akka.Remote/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Google.ProtocolBuffers" version="2.4.1.521" targetFramework="net45" />
<package id="Helios" version="1.3.0.0" targetFramework="net45" />
<package id="Helios" version="1.3.4.0" targetFramework="net45" />
</packages>
1 change: 1 addition & 0 deletions src/core/Akka.TestKit/Akka.TestKit.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Supervisor.cs" />
<Compile Include="TestActorRef.cs" />
<Compile Include="TestEvents.cs" />
<Compile Include="TestKitExtension.cs" />
<Compile Include="TestKitSettings.cs" />
<Compile Include="TestLatch.cs" />
Expand Down
34 changes: 33 additions & 1 deletion src/core/Akka.TestKit/AkkaSpec.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Xunit.Sdk;

namespace Akka.Tests
{
Expand Down Expand Up @@ -124,6 +125,7 @@ public class AkkaSpec : TestKitBase, IDisposable

public AkkaSpec()
{

var config = ConfigurationFactory.ParseString(GetConfig());
queue = new BlockingCollection<object>();
messages = new List<object>();
Expand All @@ -134,7 +136,7 @@ public AkkaSpec()

protected virtual string GetConfig()
{
return "";
return ""+"";
}

public virtual void Dispose()
Expand Down Expand Up @@ -239,6 +241,12 @@ protected TMessage expectMsgType<TMessage>(TimeSpan timeout)
return default(TMessage);
}

protected T AwaitResult<T>(Task<object> ask, TimeSpan timeout)
{
ask.Wait(timeout);
return (T)ask.Result;
}

/// <summary>
/// Uses an epsilon value to compare between floating point numbers.
/// Uses a default epsilon value of 0.001d
Expand Down Expand Up @@ -502,6 +510,30 @@ protected void intercept<T>(Action intercept) where T : Exception
Xunit.Assert.True(false, "Expected exception of type " + typeof(T).Name);
}

protected void FilterEvents(ActorSystem system, EventFilter[] eventFilters, Action action)
{
sys.EventStream.Publish(new Mute(eventFilters));
try
{
action();

var leeway = TestKitSettings.TestEventFilterLeeway;
var failed = eventFilters
.Where(x => !x.AwaitDone(leeway))
.Select(x => string.Format("Timeout {0} waiting for {1}", leeway, x))
.ToArray();

if (failed.Any())
{
throw new AssertException("Filter completion error: " + string.Join("\n", failed));
}
}
finally
{
sys.EventStream.Publish(new Unmute(eventFilters));
}
}

protected void EventFilter<T>(string message, int occurances, Action intercept) where T : Exception
{
sys.EventStream.Subscribe(testActor, typeof(Error));
Expand Down
Loading