tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Add more unit test cases.

pull/19559/head
maliming 2 years ago
parent
2604c817d5
commit
195a9bec2f
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
2 changed files with 55 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 21
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
  2. 50
      framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/DomainEvents_Tests.cs

21
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ChangeTrackers/AbpEfCoreNavigationHelper.cs
View File

@ -36,7 +36,7 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
return;
}
var entryId = GetEntityId(entityEntry);
var entryId = GetEntityEntryIdentity(entityEntry);
if (entryId == null)
{
return;
@ -81,7 +81,7 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
continue;
}
var entryId = GetEntityId(principal.ToEntityEntry());
var entryId = GetEntityEntryIdentity(principal.ToEntityEntry());
if (entryId == null || !EntityEntries.TryGetValue(entryId, out var abpEntityEntry))
{
continue;
@ -120,7 +120,7 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
continue;
}
var entryId = GetEntityId(principal.ToEntityEntry());
var entryId = GetEntityEntryIdentity(principal.ToEntityEntry());
if (entryId == null || !EntityEntries.TryGetValue(entryId, out var abpEntityEntry))
{
continue;
@ -158,7 +158,7 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
return true;
}
var entryId = GetEntityId(entityEntry);
var entryId = GetEntityEntryIdentity(entityEntry);
if (entryId == null)
{
return false;
@ -169,7 +169,7 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
public virtual bool IsNavigationEntryModified(EntityEntry entityEntry, int navigationEntryIndex)
{
var entryId = GetEntityId(entityEntry);
var entryId = GetEntityEntryIdentity(entityEntry);
if (entryId == null)
{
return false;
@ -184,11 +184,14 @@ public class AbpEfCoreNavigationHelper : ITransientDependency
return navigationEntryProperty != null && navigationEntryProperty.IsModified;
}
protected virtual string? GetEntityId(EntityEntry entityEntry)
protected virtual string? GetEntityEntryIdentity(EntityEntry entityEntry)
{
return entityEntry.Entity is IEntity entryEntity && entryEntity.GetKeys().Length == 1
? entryEntity.GetKeys().FirstOrDefault()?.ToString()
: null;
if (entityEntry.Entity is IEntity entryEntity && entryEntity.GetKeys().Length == 1)
{
return $"{entityEntry.Metadata.ClrType.FullName}:{entryEntity.GetKeys().FirstOrDefault()}";
}
return null;
}
public void Clear()

50
framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Testing/DomainEvents_Tests.cs
View File

@ -187,15 +187,15 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
var personCreatedEventCount = 0;
var entityUpdatedEventTriggerCount = 0;
LocalEventBus.Subscribe<EntityCreatedEventData<Person>>(data =>
LocalEventBus.Subscribe<EntityCreatedEventData<Person>>(_ =>
{
personCreatedEventCount++;
return Task.CompletedTask;
});
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigations>>(async data =>
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigations>>(async _ =>
{
entityUpdatedEventTriggered = !entityUpdatedEventTriggered;
entityUpdatedEventTriggered = true;
await PersonRepository.InsertAsync(new Person(Guid.NewGuid(), Guid.NewGuid().ToString(), new Random().Next(1, 100)));
});
@ -230,7 +230,7 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
entityUpdatedEventTriggered.ShouldBeTrue();
personCreatedEventCount.ShouldBe(++entityUpdatedEventTriggerCount);
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithValueObjectAddress>>(data =>
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithValueObjectAddress>>(_ =>
{
throw new Exception("Should not trigger this event");
});
@ -263,6 +263,18 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
entityUpdatedEventTriggered.ShouldBeTrue();
personCreatedEventCount.ShouldBe(++entityUpdatedEventTriggerCount);
var oneToOneEntityUpdatedEventTriggered = false;
var oneToOneAndOneToOneEntityUpdatedEventTriggered = false;
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToOne>>(async _ =>
{
oneToOneEntityUpdatedEventTriggered = true;
});
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToOneAndOneToOne>>(async _ =>
{
oneToOneAndOneToOneEntityUpdatedEventTriggered = true;
});
entityUpdatedEventTriggered = false;
await WithUnitOfWorkAsync(async () =>
{
@ -271,9 +283,13 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
await AppEntityWithNavigationsRepository.UpdateAsync(entity);
});
entityUpdatedEventTriggered.ShouldBeTrue();
oneToOneEntityUpdatedEventTriggered.ShouldBeTrue();
oneToOneAndOneToOneEntityUpdatedEventTriggered.ShouldBeFalse();
personCreatedEventCount.ShouldBe(++entityUpdatedEventTriggerCount);
entityUpdatedEventTriggered = false;
oneToOneEntityUpdatedEventTriggered = false;
oneToOneAndOneToOneEntityUpdatedEventTriggered = false;
await WithUnitOfWorkAsync(async () =>
{
var entity = await AppEntityWithNavigationsRepository.GetAsync(entityId);
@ -281,9 +297,11 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
await AppEntityWithNavigationsRepository.UpdateAsync(entity);
});
entityUpdatedEventTriggered.ShouldBeTrue();
oneToOneEntityUpdatedEventTriggered.ShouldBeTrue();
oneToOneAndOneToOneEntityUpdatedEventTriggered.ShouldBeTrue();
personCreatedEventCount.ShouldBe(++entityUpdatedEventTriggerCount);
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToOne>>(data =>
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToOne>>(_ =>
{
throw new Exception("Should not trigger this event");
});
@ -323,6 +341,18 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
entityUpdatedEventTriggered.ShouldBeTrue();
personCreatedEventCount.ShouldBe(++entityUpdatedEventTriggerCount);
var oneToManyEntityUpdatedEventTriggered = false;
var oneToManyAndOneToManyEntityUpdatedEventTriggered = false;
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToMany>>(async _ =>
{
oneToManyEntityUpdatedEventTriggered = true;
});
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToManyAndOneToMany>>(async _ =>
{
oneToManyAndOneToManyEntityUpdatedEventTriggered = true;
});
entityUpdatedEventTriggered = false;
await WithUnitOfWorkAsync(async () =>
{
@ -331,9 +361,13 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
await AppEntityWithNavigationsRepository.UpdateAsync(entity);
});
entityUpdatedEventTriggered.ShouldBeTrue();
oneToManyEntityUpdatedEventTriggered.ShouldBeTrue();
oneToManyAndOneToManyEntityUpdatedEventTriggered.ShouldBeFalse();
personCreatedEventCount.ShouldBe(++entityUpdatedEventTriggerCount);
entityUpdatedEventTriggered = false;
oneToManyEntityUpdatedEventTriggered = false;
oneToManyAndOneToManyEntityUpdatedEventTriggered = false;
await WithUnitOfWorkAsync(async () =>
{
var entity = await AppEntityWithNavigationsRepository.GetAsync(entityId);
@ -341,9 +375,11 @@ public abstract class DomainEvents_Tests<TStartupModule> : TestAppTestBase<TStar
await AppEntityWithNavigationsRepository.UpdateAsync(entity);
});
entityUpdatedEventTriggered.ShouldBeTrue();
oneToManyEntityUpdatedEventTriggered.ShouldBeTrue();
oneToManyAndOneToManyEntityUpdatedEventTriggered.ShouldBeTrue();
personCreatedEventCount.ShouldBe(++entityUpdatedEventTriggerCount);
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToMany>>(data =>
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigationChildOneToMany>>(_ =>
{
throw new Exception("Should not trigger this event");
});
@ -439,7 +475,7 @@ public abstract class AbpEntityChangeOptions_DomainEvents_Tests<TStartupModule>
LocalEventBus.Subscribe<EntityUpdatedEventData<AppEntityWithNavigations>>(data =>
{
entityUpdatedEventTriggered = !entityUpdatedEventTriggered;
entityUpdatedEventTriggered = true;
return Task.CompletedTask;
});

Write Preview
Loading…
Cancel
Save