StrictConcurrency/tests: use a single and Sendable test TextOutputStream

This commit is contained in:
Gwendal Roué committed 2024-07-27 16:37:33 +02:00
1 parent 5f8b39b7e6
commit bbb1a73672
8 files changed
+34 -95

No files matched your search

-16
View File
@@ -10,18 +10,6 @@ import SQLite3
import XCTest
import GRDB
private final class TestStream: TextOutputStream {
var output: String
init() {
output = ""
}
func write(_ string: String) {
output.append(string)
}
}
private struct Player: Codable, MutablePersistableRecord {
static let team = belongsTo(Team.self)
var id: Int64?
@@ -1305,7 +1293,6 @@ final class DatabaseDumpTests: GRDBTestCase {
let stream = TestStream()
try db.dumpSchema(to: stream)
print(stream.output)
XCTAssertEqual(stream.output, """
sqlite_master
CREATE TABLE "document" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "body");
@@ -1340,7 +1327,6 @@ final class DatabaseDumpTests: GRDBTestCase {
try dbQueue.read { db in
let stream = TestStream()
try db.dumpSchema(to: stream)
print(stream.output)
XCTAssertEqual(stream.output, """
sqlite_master
CREATE TABLE "player" ("id" INTEGER PRIMARY KEY AUTOINCREMENT);
@@ -1509,7 +1495,6 @@ final class DatabaseDumpTests: GRDBTestCase {
let stream = TestStream()
try db.dumpContent(to: stream)
print(stream.output)
XCTAssertEqual(stream.output, """
sqlite_master
CREATE TABLE "document" ("id" INTEGER PRIMARY KEY AUTOINCREMENT, "body");
@@ -1550,7 +1535,6 @@ final class DatabaseDumpTests: GRDBTestCase {
try dbQueue.read { db in
let stream = TestStream()
try db.dumpContent(to: stream)
print(stream.output)
XCTAssertEqual(stream.output, """
sqlite_master
CREATE TABLE "player" ("id" INTEGER PRIMARY KEY AUTOINCREMENT);
@@ -1,18 +1,6 @@
import XCTest
import GRDB
private final class TestStream: TextOutputStream {
var output: String
init() {
output = ""
}
func write(_ string: String) {
output.append(string)
}
}
final class DatabaseQueueInMemoryCopyTests: GRDBTestCase {
private func makeSourceDatabase() throws -> DatabaseQueue {
let dbQueue = try makeDatabaseQueue()
@@ -1,18 +1,6 @@
import XCTest
import GRDB
private final class TestStream: TextOutputStream {
var output: String
init() {
output = ""
}
func write(_ string: String) {
output.append(string)
}
}
final class DatabaseQueueTemporaryCopyTests: GRDBTestCase {
private func makeSourceDatabase() throws -> DatabaseQueue {
let dbQueue = try makeDatabaseQueue()
@@ -1,18 +1,6 @@
import XCTest
import GRDB
private final class TestStream: TextOutputStream {
var output: String
init() {
output = ""
}
func write(_ string: String) {
output.append(string)
}
}
private struct Player: Codable, MutablePersistableRecord {
var id: Int64?
var name: String
+25
View File
@@ -278,3 +278,28 @@ struct AnyValueReducerFetcher<Fetched>: _ValueReducerFetcher {
// Assume this is correct :-/
extension XCTestExpectation: @unchecked Sendable { }
final class TestStream: TextOutputStream, Sendable {
private let stringsMutex: Mutex<[String]> = Mutex([])
func write(_ string: String) {
stringsMutex.withLock { $0.append(string) }
}
var strings: [String] {
stringsMutex.load()
}
var output: String {
strings.joined()
}
@discardableResult
func flush() -> [String] {
stringsMutex.withLock { strings in
let result = strings
strings = []
return result
}
}
}
@@ -26,7 +26,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
var sharedObservation: SharedValueObservation<Int>? = ValueObservation
.tracking(Table("player").fetchCount)
.print(to: log)
@@ -78,7 +78,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
var sharedObservation: SharedValueObservation<Int>? = ValueObservation
.tracking(Table("player").fetchCount)
.print(to: log)
@@ -162,7 +162,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
var sharedObservation: SharedValueObservation<Int>? = ValueObservation
.tracking(Table("player").fetchCount)
.print(to: log)
@@ -214,7 +214,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
var sharedObservation: SharedValueObservation<Int>? = ValueObservation
.tracking(Table("player").fetchCount)
.print(to: log)
@@ -260,7 +260,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
var sharedObservation: SharedValueObservation<Int>? = ValueObservation
.tracking(Table("player").fetchCount)
.print(to: log)
@@ -354,7 +354,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
let sharedObservationMutex: Mutex<SharedValueObservation<Int>?> = Mutex(nil)
sharedObservationMutex.store(ValueObservation
.tracking(Table("player").fetchCount)
@@ -440,7 +440,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
var sharedObservation: SharedValueObservation<Int>? = ValueObservation
.tracking(Table("player").fetchCount)
.print(to: log)
@@ -539,7 +539,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
let fetchErrorMutex: Mutex<Error?> = Mutex(nil)
let publisher = ValueObservation
.tracking { db -> Int in
@@ -595,7 +595,7 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
let log = Log()
let log = TestStream()
let fetchErrorMutex: Mutex<Error?> = Mutex(nil)
let publisher = ValueObservation
.tracking { db -> Int in
@@ -659,24 +659,4 @@ class SharedValueObservationTests: GRDBTestCase {
}
}
private class Log: TextOutputStream {
var strings: [String] = []
let lock = NSLock()
func write(_ string: String) {
lock.lock()
strings.append(string)
lock.unlock()
}
@discardableResult
func flush() -> [String] {
lock.lock()
let result = strings
strings = []
lock.unlock()
return result
}
}
private struct TestError: Error { }
@@ -3,13 +3,6 @@ import Dispatch
@testable import GRDB
class ValueObservationPrintTests: GRDBTestCase {
class TestStream: TextOutputStream {
var strings: [String] = []
func write(_ string: String) {
strings.append(string)
}
}
/// Helps dealing with various SQLite versions
private func region(sql: String, in dbReader: some DatabaseReader) throws -> String {
try dbReader.read { db in
@@ -176,13 +176,6 @@ class ValueObservationTests: GRDBTestCase {
// MARK: - Constant Explicit Region
func testTrackingExplicitRegion() throws {
class TestStream: TextOutputStream {
var strings: [String] = []
func write(_ string: String) {
strings.append(string)
}
}
// Test behavior with DatabaseQueue, DatabasePool, etc
do {
try assertValueObservation(