Fix Tests

Tests/DemoState.swift

@@ -10,12 +10,6 @@ import Foundation
 import Verge
 import XCTest
 
-extension XCTestCase {
-  func vergeMeasure(perform: () -> Void) {
-    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()], block: perform)
-  }
-}
-
 struct NonEquatable: Sendable {
   let id = UUID()
 }

Tests/VergeClassicTests/VergeTests.swift

@@ -121,7 +121,7 @@ class VergeTests: XCTestCase {
 
   func testPerformanceExample() {
     // This is an example of a performance test case.
-    self.vergeMeasure {
+    self.measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       // Put the code you want to measure the time of here.
     }
   }
@@ -130,7 +130,7 @@ class VergeTests: XCTestCase {
 
     let vm = ViewModel()
 
-    self.vergeMeasure {
+    self.measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       vm.increment()
     }
   }

Tests/VergeORMTests/CollectionPerformance.swift

@@ -13,19 +13,19 @@ import XCTest
 class CollectionPerformance: XCTestCase {  
 
   func testMakeCollection() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = AnyCollection((0..<100000).map { $0 })
     }
   }
 
   func testMakeLazySequence() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = (0..<100000).lazy.map { $0 }
     }
   }
 
   func testMakeLazyCollection() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = AnyCollection((0..<100000).lazy.map { $0 })
     }
   }
@@ -34,7 +34,7 @@ class CollectionPerformance: XCTestCase {
 
     let a = (0..<10000).map { Int($0) }
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = a as [Any]
     }
 
@@ -46,7 +46,7 @@ class CollectionPerformance: XCTestCase {
       d[n] = n
     }
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = a as [Int : Any]
     }
 
@@ -58,7 +58,7 @@ class CollectionPerformance: XCTestCase {
       d[n] = n
     }
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = a as! [Int : Int]
     }
 

Tests/VergeORMTests/EntityDerivedTests.swift

@@ -253,7 +253,7 @@ final class DerivedTests: XCTestCase {
 
     let storage = Store<RootState, Never>.init(initialState: .init(), logger: nil)
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       let _ = storage.databases.db.derived(from: Author.EntityID("Hoo"), queue: .passthrough)
     }
 
@@ -265,7 +265,7 @@ final class DerivedTests: XCTestCase {
 
     let _ = storage.databases.db.derived(from: Author.EntityID("Hoo"), queue: .passthrough)
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       let _ = storage.databases.db.derived(from: Author.EntityID("Hoo"), queue: .passthrough)
     }
 

Tests/VergeORMTests/MultithreadingTests.swift

@@ -57,7 +57,7 @@ class MultithreadingTests: XCTestCase {
 
     let store = Storage(RootState())
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       DispatchQueue.concurrentPerform(iterations: 1000) { (i) in
         store.update { state in
           state.other.count += 1

Tests/VergeORMTests/PerformanceTests.swift

@@ -16,13 +16,13 @@ final class PerformanceTests: XCTestCase {
   var state = RootState()
 
   func testReflectionObjectIdentifier() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = ObjectIdentifier(Author.self)
     }
   }
 
   func testReflectionString() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = String(reflecting: Author.self)
     }
   }
@@ -37,7 +37,7 @@ final class PerformanceTests: XCTestCase {
       context.entities.author.insert(authors)
     }
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { context in
         var author = context.entities.author.current.find(by: .init("author.100"))!
         author.name = "mmm"
@@ -57,7 +57,7 @@ final class PerformanceTests: XCTestCase {
       context.entities.author.insert(authors)
     }
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { context -> Void in
         context.entities.author.updateIfExists(id: .init("author.100")) { (author) in
           author.name = "mmm"
@@ -69,7 +69,7 @@ final class PerformanceTests: XCTestCase {
 
   func testInsertMany() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { (context) in
 
         let authors = (0..<10000).map { i in Author(rawID: "author.\(i)") }
@@ -82,7 +82,7 @@ final class PerformanceTests: XCTestCase {
 
   func testInsert3000() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { (context) in
 
         for i in 0..<3000 {
@@ -97,7 +97,7 @@ final class PerformanceTests: XCTestCase {
 
   func testInsert3000UseCollection() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { (context) in
 
         let authors = (0..<3000).map { i in
@@ -113,7 +113,7 @@ final class PerformanceTests: XCTestCase {
 
   func testInsert10000UseCollection() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { (context) in
 
         let authors = (0..<10000).map { i in
@@ -129,7 +129,7 @@ final class PerformanceTests: XCTestCase {
 
   func testInsert100000UseCollection() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { (context) in
 
         let authors = (0..<100000).map { i in
@@ -153,7 +153,7 @@ final class PerformanceTests: XCTestCase {
       context.entities.author.insert(authors)
     }
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       state.db.performBatchUpdates { (context) in
 
         let authors = (0..<1000).map { i in
@@ -169,7 +169,7 @@ final class PerformanceTests: XCTestCase {
 
   func testInsertSoManySeparatedTransaction() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       for l in 0..<10 {
         state.db.performBatchUpdates { (context) in
 
@@ -185,7 +185,7 @@ final class PerformanceTests: XCTestCase {
   }
 
   func testInsertManyEachTransaction() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       /// O(n^2)
       for i in 0..<10 {
         state.db.performBatchUpdates { (context) in
@@ -217,7 +217,7 @@ final class FindPerformanceTests: XCTestCase {
 
   func testFindOne() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = state.db.entities.author.find(by: .init("author.199"))
     }
 
@@ -231,7 +231,7 @@ final class FindPerformanceTests: XCTestCase {
       .init("author.399"),
     ])
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = state.db.entities.author.find(in: ids)
     }
 

Tests/VergeORMTests/ReflectingTests.swift

@@ -20,7 +20,7 @@ class ReflectingTests: XCTestCase {
 
   func testGettingTypeName_typeof() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       for _ in 0..<10000 {
         _ = type(of: A.B.A.self)
       }
@@ -29,7 +29,7 @@ class ReflectingTests: XCTestCase {
 
   func testGettingTypeName_typeName_metatype() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       for _ in 0..<10000 {
         _ = _typeName(type(of: A.B.A.self))
       }
@@ -38,7 +38,7 @@ class ReflectingTests: XCTestCase {
 
   func testGettingTypeName_string_reflecting_metatype() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       for _ in 0..<10000 {
         _ = String(reflecting: type(of: A.B.A.self))
       }
@@ -47,7 +47,7 @@ class ReflectingTests: XCTestCase {
 
   func testGettingTypeName_string_reflecting() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       for _ in 0..<10000 {
         _ = String(reflecting: A.B.A.self)
       }
@@ -56,7 +56,7 @@ class ReflectingTests: XCTestCase {
 
   func testObjectIdentifier_string_reflecting() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       for _ in 0..<10000 {
         _ = ObjectIdentifier(A.B.A.self)
       }

Tests/VergeORMTests/SetIndexTests.swift

@@ -41,19 +41,19 @@ class SetIndexTests: XCTestCase {
   }()
 
   func testSample() {            
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = db.indexes.allBooks.map { $0.raw }
     }
   }
 
   func testCompactMap() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = db.indexes.allBooks.compactMap { $0.raw }
     }
   }
 
   func testFilter() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = db.indexes.allBooks.sorted { $0.raw > $1.raw }
     }
   }

Tests/VergeTests/ComputedTests.swift

@@ -132,7 +132,7 @@ class Computed2Tests: XCTestCase {
 
     let changes = store.state
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = changes.computed.filteredArray
     }
 
@@ -142,7 +142,7 @@ class Computed2Tests: XCTestCase {
 
     let store = MyStore()
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       store.commit {
         // no affects to array
         $0.num_1 += 1
@@ -293,7 +293,7 @@ class Computed2Tests: XCTestCase {
 
     let changes = store.state
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       DispatchQueue.concurrentPerform(iterations: 500) { (i) in
         XCTAssertEqual(changes.hasChanges(\.computed.num_0), false)
       }

Tests/VergeTests/CopyPerformance.swift

@@ -16,28 +16,28 @@ final class CopyPerformance: XCTestCase {
 
   func testCopy() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       run(with: source)
     }
   }
 
   func testCopyWithShared() {
 
     let huge = Shared(source)
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       run(with: huge)
     }
   }
 
   func testAny() {
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       run(any: source)
     }
   }
 
   func testAnyWithShared() {
     let huge = Shared(source)
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       run(anyObject: huge)
     }
   }

Tests/VergeTests/CounterTests.swift

@@ -39,14 +39,14 @@ final class CounterTests: XCTestCase {
 
   func testGenDatePerformance() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = Date()
     }
   }
 
   func testGenCFDatePerformance() {
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       _ = CFAbsoluteTimeGetCurrent()
     }
   }

Tests/VergeTests/EventEmitterTests.swift

@@ -87,7 +87,7 @@ class EventEmitterTests: XCTestCase {
   func testRegistrationPerformance() {
 
     let emitter = EventEmitter<Void>()
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       for _ in 0..<1000 {
         emitter.add { _ in
 

Tests/VergeTests/PerformanceTests.swift

@@ -18,7 +18,7 @@ class PerformanceTests: XCTestCase {
 
     let store = DemoStore()
 
-    vergeMeasure {
+    measure(metrics: [XCTMemoryMetric(), XCTCPUMetric(), XCTClockMetric()]) {
       store.increment()
     }