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

fix: CoreData tracking entity name retrieval #2329

Merged
merged 2 commits into from
Nov 2, 2022
Merged

fix: CoreData tracking entity name retrieval #2329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
809bb1c
fix: CoreData tracking entity name retrieval
armcknight Oct 25, 2022
6473241
update changelog
armcknight Oct 25, 2022
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

- Enable bitcode (#2307)
- Fix moving app state to previous app state (#2321)
- Use CoreData entity names instead of "NSManagedObject" (#2329)

## 7.28.0

Expand Down
12 changes: 6 additions & 6 deletions Sources/Sentry/SentryCoreDataTracker.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ - (NSString *)descriptionForOperations:
__block NSMutableArray *resultParts = [NSMutableArray new];

void (^operationInfo)(NSUInteger, NSString *) = ^void(NSUInteger total, NSString *op) {
NSDictionary *itens = operations[op];
if (itens && itens.count > 0) {
if (itens.count == 1) {
NSDictionary *items = operations[op];
if (items && items.count > 0) {
if (items.count == 1) {
[resultParts addObject:[NSString stringWithFormat:@"%@ %@ '%@'", op,
itens.allValues[0], itens.allKeys[0]]];
items.allValues[0], items.allKeys[0]]];
} else {
[resultParts addObject:[NSString stringWithFormat:@"%@ %lu items", op,
(unsigned long)total]];
Expand Down Expand Up @@ -147,8 +147,8 @@ - (NSString *)descriptionForOperations:
{
NSMutableDictionary<NSString *, NSNumber *> *result = [NSMutableDictionary new];

for (id item in entities) {
NSString *cl = NSStringFromClass([item class]);
for (NSManagedObject *item in entities) {
NSString *cl = item.entity.name;
Comment on lines -150 to +151
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an actual functional change that I think was a bug.

NSNumber *count = result[cl];
result[cl] = [NSNumber numberWithInt:count.intValue + 1];
}
Expand Down
44 changes: 25 additions & 19 deletions Tests/SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackerTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ class SentryCoreDataTrackerTests: XCTestCase {
func getSut() -> SentryCoreDataTracker {
return SentryCoreDataTracker()
}

func testEntity() -> TestEntity {
let entityDescription = NSEntityDescription()
entityDescription.name = "TestEntity"
return TestEntity(entity: entityDescription, insertInto: context)
}

func secondTestEntity() -> SecondTestEntity {
let entityDescription = NSEntityDescription()
entityDescription.name = "SecondTestEntity"
return SecondTestEntity(entity: entityDescription, insertInto: context)
}
}

private var fixture: Fixture!
Expand Down Expand Up @@ -72,68 +78,68 @@ class SentryCoreDataTrackerTests: XCTestCase {
}

func test_Save_1Insert_1Entity() {
fixture.context.inserted = [TestEntity()]
fixture.context.inserted = [fixture.testEntity()]
assertSave("INSERTED 1 'TestEntity'")
}

func test_Save_2Insert_1Entity() {
fixture.context.inserted = [TestEntity(), TestEntity()]
fixture.context.inserted = [fixture.testEntity(), fixture.testEntity()]
assertSave("INSERTED 2 'TestEntity'")
}

func test_Save_2Insert_2Entity() {
fixture.context.inserted = [TestEntity(), SecondTestEntity()]
fixture.context.inserted = [fixture.testEntity(), fixture.secondTestEntity()]
assertSave("INSERTED 2 items")
}

func test_Save_1Update_1Entity() {
fixture.context.updated = [TestEntity()]
fixture.context.updated = [fixture.testEntity()]
assertSave("UPDATED 1 'TestEntity'")
}

func test_Save_2Update_1Entity() {
fixture.context.updated = [TestEntity(), TestEntity()]
fixture.context.updated = [fixture.testEntity(), fixture.testEntity()]
assertSave("UPDATED 2 'TestEntity'")
}

func test_Save_2Update_2Entity() {
fixture.context.updated = [TestEntity(), SecondTestEntity()]
fixture.context.updated = [fixture.testEntity(), fixture.secondTestEntity()]
assertSave("UPDATED 2 items")
}

func test_Save_1Delete_1Entity() {
fixture.context.deleted = [TestEntity()]
fixture.context.deleted = [fixture.testEntity()]
assertSave("DELETED 1 'TestEntity'")
}

func test_Save_2Delete_1Entity() {
fixture.context.deleted = [TestEntity(), TestEntity()]
fixture.context.deleted = [fixture.testEntity(), fixture.testEntity()]
assertSave("DELETED 2 'TestEntity'")
}

func test_Save_2Delete_2Entity() {
fixture.context.deleted = [TestEntity(), SecondTestEntity()]
fixture.context.deleted = [fixture.testEntity(), fixture.secondTestEntity()]
assertSave("DELETED 2 items")
}

func test_Save_Insert_Update_Delete_1Entity() {
fixture.context.inserted = [TestEntity()]
fixture.context.updated = [TestEntity()]
fixture.context.deleted = [TestEntity()]
fixture.context.inserted = [fixture.testEntity()]
fixture.context.updated = [fixture.testEntity()]
fixture.context.deleted = [fixture.testEntity()]
assertSave("INSERTED 1 'TestEntity', UPDATED 1 'TestEntity', DELETED 1 'TestEntity'")
}

func test_Save_Insert_Update_Delete_2Entity() {
fixture.context.inserted = [TestEntity(), SecondTestEntity()]
fixture.context.updated = [TestEntity(), SecondTestEntity()]
fixture.context.deleted = [TestEntity(), SecondTestEntity()]
fixture.context.inserted = [fixture.testEntity(), fixture.secondTestEntity()]
fixture.context.updated = [fixture.testEntity(), fixture.secondTestEntity()]
fixture.context.deleted = [fixture.testEntity(), fixture.secondTestEntity()]
assertSave("INSERTED 2 items, UPDATED 2 items, DELETED 2 items")
}

func test_Operation_InData() {
fixture.context.inserted = [TestEntity(), TestEntity(), SecondTestEntity()]
fixture.context.updated = [TestEntity(), SecondTestEntity(), SecondTestEntity()]
fixture.context.deleted = [TestEntity(), TestEntity(), SecondTestEntity(), SecondTestEntity(), SecondTestEntity()]
fixture.context.inserted = [fixture.testEntity(), fixture.testEntity(), fixture.secondTestEntity()]
fixture.context.updated = [fixture.testEntity(), fixture.secondTestEntity(), fixture.secondTestEntity()]
fixture.context.deleted = [fixture.testEntity(), fixture.testEntity(), fixture.secondTestEntity(), fixture.secondTestEntity(), fixture.secondTestEntity()]

let sut = fixture.getSut()

Expand Down
6 changes: 0 additions & 6 deletions ...SentryTests/Integrations/Performance/CoreData/SentryCoreDataTrackingIntegrationTest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@ class SentryCoreDataTrackingIntegrationTests: XCTestCase {
func getSut() -> SentryCoreDataTrackingIntegration {
return SentryCoreDataTrackingIntegration()
}

func testEntity() -> TestEntity {
let entityDescription = NSEntityDescription()
entityDescription.name = "TestEntity"
return TestEntity(entity: entityDescription, insertInto: nil)
}
}

private var fixture: Fixture!
Expand Down
8 changes: 8 additions & 0 deletions Tests/SentryTests/Integrations/Performance/CoreData/TestCoreDataStack.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,20 @@ import Foundation
public class TestEntity: NSManagedObject {
var field1: String?
var field2: Int?

public override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?) {
super.init(entity: entity, insertInto: context)
}
}

@objc(SecondTestEntity)
public class SecondTestEntity: NSManagedObject {
var field1: String?
var field2: Int?

public override init(entity: NSEntityDescription, insertInto context: NSManagedObjectContext?) {
super.init(entity: entity, insertInto: context)
}
}

class TestCoreDataStack {
Expand Down