Update to latest releases

src/Akka.Persistence.MongoDb.Tests/Akka.Persistence.MongoDb.Tests.csproj

@@ -7,7 +7,10 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(TestSdkVersion)" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="$(XunitVersion)">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
     <PackageReference Include="xunit" Version="$(XunitVersion)" />
     <PackageReference Include="Akka.Persistence.TCK" Version="$(AkkaVersion)" />
     <PackageReference Include="FluentAssertions" Version="5.10.3" />

src/Akka.Persistence.MongoDb.Tests/MongoDbAllEventsSpec.cs

@@ -0,0 +1,53 @@
+//-----------------------------------------------------------------------
+// <copyright file="MongoDbAllEventsSpec.cs" company="Akka.NET Project">
+//     Copyright (C) 2017 Akka.NET Contrib <https://github.com/AkkaNetContrib/Akka.Persistence.MongoDB>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
+using Akka.Persistence.MongoDb.Query;
+using Akka.Persistence.Query;
+using Akka.Persistence.TCK.Query;
+using Akka.Util.Internal;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Akka.Persistence.MongoDb.Tests
+{
+    [Collection("MongoDbSpec")]
+    public class MongoDbAllEventsSpec: AllEventsSpec, IClassFixture<DatabaseFixture>
+    {
+        private static Config CreateSpecConfig(DatabaseFixture databaseFixture, int id)
+        {
+            // akka.test.single-expect-default = 10s
+            var specString = @"
+                akka.test.single-expect-default = 10s
+                akka.persistence {
+                    publish-plugin-commands = on
+                    journal {
+                        plugin = ""akka.persistence.journal.mongodb""
+                        mongodb {
+                            class = ""Akka.Persistence.MongoDb.Journal.MongoDbJournal, Akka.Persistence.MongoDb""
+                            connection-string = """ + databaseFixture.ConnectionString + id + @"""
+                            auto-initialize = on
+                            collection = ""EventJournal""
+                        }
+                    }
+                    query {
+                        mongodb {
+                            class = ""Akka.Persistence.MongoDb.Query.MongoDbReadJournalProvider, Akka.Persistence.MongoDb""
+                            refresh-interval = 1s
+                        }
+                    }
+                }";
+
+            return ConfigurationFactory.ParseString(specString);
+        }
+        public static readonly AtomicCounter Counter = new AtomicCounter(0);
+
+        public MongoDbAllEventsSpec(ITestOutputHelper output, DatabaseFixture databaseFixture) : base(CreateSpecConfig(databaseFixture, Counter.GetAndIncrement()), "MongoDbAllEventsSpec", output)
+        {
+            ReadJournal = Sys.ReadJournalFor<MongoDbReadJournal>(MongoDbReadJournal.Identifier);
+        }
+    }
+}

src/Akka.Persistence.MongoDb.Tests/MongoDbCurrentAllEventsSpec.cs

@@ -0,0 +1,53 @@
+//-----------------------------------------------------------------------
+// <copyright file="MongoDbCurrentAllEventsSpec.cs" company="Akka.NET Project">
+//     Copyright (C) 2017 Akka.NET Contrib <https://github.com/AkkaNetContrib/Akka.Persistence.MongoDB>
+// </copyright>
+//-----------------------------------------------------------------------
+
+using Akka.Configuration;
+using Akka.Persistence.MongoDb.Query;
+using Akka.Persistence.Query;
+using Akka.Persistence.TCK.Query;
+using Akka.Util.Internal;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Akka.Persistence.MongoDb.Tests
+{
+    [Collection("MongoDbSpec")]
+    public class MongoDbCurrentAllEventsSpec : CurrentAllEventsSpec, IClassFixture<DatabaseFixture>
+    {
+        private static Config CreateSpecConfig(DatabaseFixture databaseFixture, int id)
+        {
+            // akka.test.single-expect-default = 10s
+            var specString = @"
+                akka.test.single-expect-default = 10s
+                akka.persistence {
+                    publish-plugin-commands = on
+                    journal {
+                        plugin = ""akka.persistence.journal.mongodb""
+                        mongodb {
+                            class = ""Akka.Persistence.MongoDb.Journal.MongoDbJournal, Akka.Persistence.MongoDb""
+                            connection-string = """ + databaseFixture.ConnectionString + id + @"""
+                            auto-initialize = on
+                            collection = ""EventJournal""
+                        }
+                    }
+                    query {
+                        mongodb {
+                            class = ""Akka.Persistence.MongoDb.Query.MongoDbReadJournalProvider, Akka.Persistence.MongoDb""
+                            refresh-interval = 1s
+                        }
+                    }
+                }";
+
+            return ConfigurationFactory.ParseString(specString);
+        }
+        public static readonly AtomicCounter Counter = new AtomicCounter(0);
+
+        public MongoDbCurrentAllEventsSpec(ITestOutputHelper output, DatabaseFixture databaseFixture) : base(CreateSpecConfig(databaseFixture, Counter.GetAndIncrement()), "MongoDbCurrentAllEventsSpec", output)
+        {
+            ReadJournal = Sys.ReadJournalFor<MongoDbReadJournal>(MongoDbReadJournal.Identifier);
+        }
+    }
+}

src/Akka.Persistence.MongoDb.Tests/MongoDbJournalPerfSpec.cs

@@ -0,0 +1,41 @@
+using Akka.Configuration;
+using Akka.Persistence.TestKit.Performance;
+using Akka.Util.Internal;
+using System;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Akka.Persistence.MongoDb.Tests
+{
+    [Collection("MongoDbSpec")]
+    public class MongoDbJournalPerfSpec: JournalPerfSpec, IClassFixture<DatabaseFixture>
+    {
+        private static Config CreateSpecConfig(DatabaseFixture databaseFixture, int id)
+        {
+            // akka.test.single-expect-default = 10s
+            var specString = @"
+                akka.persistence {
+                    publish-plugin-commands = on
+                    journal {
+                        plugin = ""akka.persistence.journal.mongodb""
+                        mongodb {
+                            class = ""Akka.Persistence.MongoDb.Journal.MongoDbJournal, Akka.Persistence.MongoDb""
+                            connection-string = """ + databaseFixture.ConnectionString + id + @"""
+                            auto-initialize = on
+                            collection = ""EventJournal""
+                        }
+                    }
+                }";
+
+            return ConfigurationFactory.ParseString(specString);
+        }
+        public static readonly AtomicCounter Counter = new AtomicCounter(0);
+
+        public MongoDbJournalPerfSpec(ITestOutputHelper output, DatabaseFixture databaseFixture) : base(CreateSpecConfig(databaseFixture, Counter.GetAndIncrement()), "MongoDbJournalPerfSpec", output)
+        {
+            EventsCount = 1000;
+            ExpectDuration = TimeSpan.FromMinutes(10);
+            MeasurementIterations = 1;
+        }
+    }
+}

src/Akka.Persistence.MongoDb.Tests/MongoDbPersistenceIdsSpec.cs

@@ -17,6 +17,9 @@
 using Akka.Streams.TestKit;
 using System.Linq;
 using System.Diagnostics;
+using System.Threading.Tasks;
+using System.Reflection;
+using Reactive.Streams;
 
 namespace Akka.Persistence.MongoDb.Tests
 {
@@ -59,7 +62,6 @@ class = ""Akka.Persistence.MongoDb.Query.MongoDbReadJournalProvider, Akka.Persis
 
             return ConfigurationFactory.ParseString(specString);
         }
-
         [Fact]
         public void ReadJournal_ConcurrentMessaging_should_work()
         {

src/Akka.Persistence.MongoDb/Akka.Persistence.MongoDb.csproj

@@ -10,6 +10,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Akka.Persistence.Query" Version="$(AkkaVersion)" />
+    <PackageReference Include="akka.streams" Version="$(AkkaVersion)" />
     <PackageReference Include="MongoDB.Driver" Version="2.11.4" />
   </ItemGroup>
 </Project>

src/Akka.Persistence.MongoDb/Journal/JournalEntry.cs

@@ -35,6 +35,7 @@ public class JournalEntry
         [BsonElement("Manifest")]
         public string Manifest { get; set; }
 
+
         [BsonElement("Ordering")]
         public BsonTimestamp Ordering { get; set; }