Skip to content

Commit

Permalink
Revert "Fix unit tests related to the Persistence DateTime bug (akkad…
Browse files Browse the repository at this point in the history 
…otnet#7352)"

This reverts commit f5c4e63.
  • Loading branch information
@Arkatufus
Arkatufus committed Oct 3, 2024
1 parent f5c4e63 commit 6e860b5
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 23 deletions.
2 changes: 1 addition & 1 deletion src/core/Akka.Persistence.TCK.Tests/LocalSnapshotStoreSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ protected override void AfterAll()
public void LocalSnapshotStore_can_snapshot_actors_with_PersistenceId_containing_invalid_path_characters()
{
var pid = @"p\/:*?-1";
SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(pid, 1, Sys.Scheduler.DateTimeNow), "sample data"), TestActor);
SnapshotStore.Tell(new SaveSnapshot(new SnapshotMetadata(pid, 1, Sys.Scheduler.Now.DateTime), "sample data"), TestActor);
ExpectMsg<SaveSnapshotSuccess>();

SnapshotStore.Tell(new LoadSnapshot(pid, SnapshotSelectionCriteria.Latest, long.MaxValue), TestActor);
Expand Down
3 changes: 1 addition & 2 deletions src/core/Akka.Persistence.TCK/Query/PersistenceIdsSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,7 @@ protected IActorRef WriteSnapshot(string persistenceId, int n)
ExpectMsg($"{persistenceId}-{i}-done");
}

var metadata = new SnapshotMetadata(persistenceId, n + 10, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(persistenceId, n + 10, Sys.Scheduler.Now.DateTime);
SnapshotStore.Tell(new SaveSnapshot(metadata, $"s-{n}"), _senderProbe.Ref);
_senderProbe.ExpectMsg<SaveSnapshotSuccess>();

Expand Down
15 changes: 5 additions & 10 deletions src/core/Akka.Persistence.TCK/Serialization/SnapshotStoreSerializationSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,7 @@ public virtual void SnapshotStore_should_serialize_Payload()

var snapshot = new Test.MySnapshot("a");

var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.Now.DateTime);
SnapshotStore.Tell(new SaveSnapshot(metadata, snapshot), probe.Ref);
probe.ExpectMsg<SaveSnapshotSuccess>();

Expand All @@ -86,8 +85,7 @@ public virtual void SnapshotStore_should_serialize_Payload_with_string_manifest(

var snapshot = new Test.MySnapshot2("a");

var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, 1, Sys.Scheduler.Now.DateTime);
SnapshotStore.Tell(new SaveSnapshot(metadata, snapshot), probe.Ref);
probe.ExpectMsg<SaveSnapshotSuccess>();

Expand All @@ -109,8 +107,7 @@ public virtual void SnapshotStore_should_serialize_AtLeastOnceDeliverySnapshot()
};
var atLeastOnceDeliverySnapshot = new AtLeastOnceDeliverySnapshot(17, unconfirmed);

var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
SnapshotStore.Tell(new SaveSnapshot(metadata, atLeastOnceDeliverySnapshot), probe.Ref);
probe.ExpectMsg<SaveSnapshotSuccess>();

Expand All @@ -126,8 +123,7 @@ public virtual void SnapshotStore_should_serialize_AtLeastOnceDeliverySnapshot_w
var unconfirmed = Array.Empty<UnconfirmedDelivery>();
var atLeastOnceDeliverySnapshot = new AtLeastOnceDeliverySnapshot(13, unconfirmed);

var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
SnapshotStore.Tell(new SaveSnapshot(metadata, atLeastOnceDeliverySnapshot), probe.Ref);
probe.ExpectMsg<SaveSnapshotSuccess>();

Expand All @@ -142,8 +138,7 @@ public virtual void SnapshotStore_should_serialize_PersistentFSMSnapshot()

var persistentFSMSnapshot = new PersistentFSM.PersistentFSMSnapshot<string>("mystate", "mydata", TimeSpan.FromDays(4));

var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, 2, Sys.Scheduler.Now.DateTime);
SnapshotStore.Tell(new SaveSnapshot(metadata, persistentFSMSnapshot), probe.Ref);
probe.ExpectMsg<SaveSnapshotSuccess>();

Expand Down
6 changes: 2 additions & 4 deletions src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSaveSnapshotSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,14 @@ public async Task MultipleSnapshotsWithSameSeqNo()
var snapshotStore = persistence.SnapshotStoreFor(null);
var snap = new TestPayload(SenderProbe.Ref);

var metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.UtcNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.Now);
snapshotStore.Tell(new SaveSnapshot(metadata, snap), SenderProbe);
var success = await SenderProbe.ExpectMsgAsync<SaveSnapshotSuccess>(10.Minutes());
success.Metadata.PersistenceId.Should().Be(metadata.PersistenceId);
success.Metadata.Timestamp.Should().Be(metadata.Timestamp);
success.Metadata.SequenceNr.Should().Be(metadata.SequenceNr);

metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.UtcNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
metadata = new SnapshotMetadata(PersistenceId, 3, DateTime.Now);
snapshotStore.Tell(new SaveSnapshot(metadata, 3), SenderProbe);
success = await SenderProbe.ExpectMsgAsync<SaveSnapshotSuccess>();
success.Metadata.PersistenceId.Should().Be(metadata.PersistenceId);
Expand Down
9 changes: 3 additions & 6 deletions src/core/Akka.Persistence.TCK/Snapshot/SnapshotStoreSpec.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,7 @@ private IEnumerable<SnapshotMetadata> WriteSnapshots()
{
for (int i = 1; i <= 5; i++)
{
var metadata = new SnapshotMetadata(Pid, i + 10, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, i + 10, Sys.Scheduler.Now.DateTime);
SnapshotStore.Tell(new SaveSnapshot(metadata, $"s-{i}"), _senderProbe.Ref);
yield return _senderProbe.ExpectMsg<SaveSnapshotSuccess>().Metadata;
}
Expand Down Expand Up @@ -313,8 +312,7 @@ public virtual void SnapshotStore_should_save_and_overwrite_snapshot_with_same_s
[Fact]
public virtual void SnapshotStore_should_save_bigger_size_snapshot()
{
var metadata = new SnapshotMetadata(Pid, 100, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, 100, Sys.Scheduler.Now.DateTime);
var bigSnapshot = new byte[SnapshotByteSizeLimit];
new Random().NextBytes(bigSnapshot);
SnapshotStore.Tell(new SaveSnapshot(metadata, bigSnapshot), _senderProbe.Ref);
Expand All @@ -328,8 +326,7 @@ public virtual void ShouldSerializeSnapshots()
if (!SupportsSerialization) return;

var probe = CreateTestProbe();
var metadata = new SnapshotMetadata(Pid, 100L, Sys.Scheduler.DateTimeNow);
metadata.Timestamp.Kind.Should().Be(DateTimeKind.Utc);
var metadata = new SnapshotMetadata(Pid, 100L, Sys.Scheduler.Now.DateTime);
var snap = new TestPayload(probe.Ref);

SnapshotStore.Tell(new SaveSnapshot(metadata, snap), _senderProbe.Ref);
Expand Down

0 comments on commit 6e860b5

Please sign in to comment.