Write stdout/stderr directly, replace Xcode reporter

PXCTestKit/Command/RunTests/RunTestsReporters.swift

@@ -26,14 +26,12 @@ final class RunTestsReporters {
     func addReporter(for simulator: FBSimulator, name: String, testTargetName: String) throws -> FBTestManagerTestReporter {
         // `name` might be equal to `testTargetName`, unless tests are partitioned, then `name` is something like "testTargetName/partition-n"
         let consoleReporter = reporterType.init(simulatorIdentifier: simulator.identifier, testTargetName: name, consoleOutput: consoleOutput)
-        let xcodeReportURL = fileManager.urlFor(simulatorConfiguration: simulator.configuration!, target: name).appendingPathComponent("test.log")
-        let xcodeReporter = try XcodeReporter(simulatorIdentifier: simulator.identifier, testTargetName: name, fileURL: xcodeReportURL)
         let testReporter = TestReporter(simulatorIdentifier: simulator.identifier, testTargetName: name)
 
         consoleReporters.append(consoleReporter)
         testReporters.append(testReporter)
 
-        return TestReporterAdapter(reporters: [consoleReporter, testReporter, xcodeReporter])
+        return TestReporterAdapter(reporters: [consoleReporter, testReporter])
     }
 
     func finishReporting(consoleOutput: ConsoleOutput) throws {

PXCTestKit/Command/RunTests/RunTestsWorker.swift

@@ -37,13 +37,23 @@ final class RunTestsWorker {
         }
     }
 
-    func extractDiagnostics(fileManager: RunTestsFileManager) throws {
-        let launchedProcessLogs = simulator.simulatorDiagnostics.launchedProcessLogs()
-        for application in applications {
-            guard let diagnostics = launchedProcessLogs.first(where: { $0.0.processName == application.name })?.value else { continue }
-            let destinationPath = fileManager.urlFor(worker: self).path
-            try diagnostics.writeOut(toDirectory: destinationPath)
+    func cleanUpLogFiles(fileManager: RunTestsFileManager) throws {
+        let logFilesPath = fileManager.urlFor(worker: self).path
+        for logFilePath in FBFileFinder.contentsOfDirectory(withBasePath: logFilesPath) {
+            let temporaryFilePath = URL(fileURLWithPath: NSTemporaryDirectory()).appendingPathComponent(UUID().uuidString).path
+            guard
+                let reader = FileReader(path: logFilePath),
+                let writer = FileWriter(path: temporaryFilePath)
+            else { continue }
+            for line in reader {
+                writer.write(string: line.replacingOccurrences(of: "XCTestOutputBarrier", with: ""))
+            }
+            try FileManager.default.removeItem(atPath: logFilePath)
+            try FileManager.default.moveItem(atPath: temporaryFilePath, toPath: logFilePath)
         }
+    }
+
+    func extractDiagnostics(fileManager: RunTestsFileManager) throws {
         for error in errors {
             for crash in error.crashes {
                 let destinationPath = fileManager.urlFor(worker: self).path
@@ -53,16 +63,25 @@ final class RunTestsWorker {
     }
 
     func startTests(context: RunTestsContext, reporters: RunTestsReporters) throws {
+        let workingDirectoryURL = context.fileManager.urlFor(worker: self)
         let testsToRun = context.testsToRun[name] ?? Set<String>()
         let testEnvironment = Environment.injectPrefixedVariables(
             from: context.environment,
             into: testLaunchConfiguration.testEnvironment,
-            workingDirectoryURL: context.fileManager.urlFor(worker: self)
+            workingDirectoryURL: workingDirectoryURL
         )
 
+        let bundleName = self.testLaunchConfiguration.applicationLaunchConfiguration!.bundleName!
+        let outputPath = workingDirectoryURL.appendingPathComponent("\(bundleName).log").path
+
+        let applicationLaunchConfiguration = self.testLaunchConfiguration
+            .applicationLaunchConfiguration!
+            .withOutput(try FBProcessOutputConfiguration(stdOut: outputPath, stdErr: outputPath))
+
         let testLaunchConfigurartion = self.testLaunchConfiguration
             .withTestsToRun(self.testLaunchConfiguration.testsToRun.union(testsToRun))
             .withTestEnvironment(testEnvironment)
+            .withApplicationLaunchConfiguration(applicationLaunchConfiguration)
 
         let reporter = try reporters.addReporter(for: simulator, name: name, testTargetName: targetName)
 
@@ -135,6 +154,10 @@ extension Sequence where Iterator.Element == RunTestsWorker {
             try worker.extractDiagnostics(fileManager: context.fileManager)
         }
 
+        for worker in self {
+            try worker.cleanUpLogFiles(fileManager: context.fileManager)
+        }
+
         return flatMap { $0.errors }
     }
 

PXCTestKit/FileReader.swift

@@ -0,0 +1,75 @@
+//
+//  FileReader.swift
+//  pxctest
+//
+//  Created by Johannes Plunien on 20/02/2017.
+//  Copyright © 2017 Johannes Plunien. All rights reserved.
+//
+
+import Foundation
+
+final class FileReader {
+
+    private var buffer: Data
+    private let chunkSize: Int
+    private let encoding: String.Encoding
+    private var eof: Bool
+    private var fileHandle: FileHandle?
+    private let delimiter: Data
+
+    init?(path: String, delimiter: String = "\n", encoding: String.Encoding = .utf8, chunkSize: Int = 4096) {
+        guard
+            let fileHandle = FileHandle(forReadingAtPath: path),
+            let delimiter = delimiter.data(using: encoding)
+        else { return nil }
+
+        self.buffer = Data(capacity: chunkSize)
+        self.chunkSize = chunkSize
+        self.delimiter = delimiter
+        self.encoding = encoding
+        self.eof = false
+        self.fileHandle = fileHandle
+    }
+
+    deinit {
+        fileHandle?.closeFile()
+        fileHandle = nil
+    }
+
+    func nextLine() -> String? {
+        guard let fileHandle = fileHandle else {
+            return nil
+        }
+
+        while !eof {
+            if let range = buffer.range(of: delimiter) {
+                let line = String(data: buffer.subdata(in: 0..<range.upperBound), encoding: encoding)
+                buffer.removeSubrange(0..<range.upperBound)
+                return line
+            }
+            let tmpData = fileHandle.readData(ofLength: chunkSize)
+            if tmpData.count > 0 {
+                buffer.append(tmpData)
+            } else {
+                eof = true
+                if buffer.count > 0 {
+                    let line = String(data: buffer as Data, encoding: encoding)
+                    buffer.count = 0
+                    return line
+                }
+            }
+        }
+        return nil
+    }
+
+}
+
+extension FileReader: Sequence {
+
+    func makeIterator() -> AnyIterator<String> {
+        return AnyIterator {
+            return self.nextLine()
+        }
+    }
+
+}

PXCTestKit/FileWriter.swift

@@ -0,0 +1,35 @@
+//
+//  FileWriter.swift
+//  pxctest
+//
+//  Created by Johannes Plunien on 20/02/2017.
+//  Copyright © 2017 Johannes Plunien. All rights reserved.
+//
+
+import Foundation
+
+final class FileWriter {
+
+    private let encoding: String.Encoding
+    private var fileHandle: FileHandle?
+
+    init?(path: String, encoding: String.Encoding = .utf8) {
+        FileManager.default.createFile(atPath: path, contents: nil, attributes: nil)
+
+        guard let fileHandle = FileHandle(forWritingAtPath: path) else { return nil }
+
+        self.encoding = encoding
+        self.fileHandle = fileHandle
+    }
+
+    deinit {
+        fileHandle?.closeFile()
+        fileHandle = nil
+    }
+
+    func write(string: String) {
+        guard let data = string.data(using: encoding) else { return }
+        fileHandle?.write(data)
+    }
+
+}

PXCTestKitTests/Command/RunTests/RunTestsCommandTests.swift

@@ -51,8 +51,7 @@ class RunTestsCommandTests: XCTestCase {
         ["SampleTests", "SampleUITests"].forEach { (target) in
             result.context.simulatorConfigurations.forEach { (simulatorConfiguration) in
                 let url = result.context.fileManager.urlFor(simulatorConfiguration: simulatorConfiguration, target: target)
-                XCTAssertFileSizeGreaterThan(url.appendingPathComponent("Sample.log").path, 0)
-                XCTAssertFileSizeGreaterThan(url.appendingPathComponent("test.log").path, 0)
+                XCTAssertFileSizeGreaterThan(url.appendingPathComponent(logFileName(for: target)).path, 0)
             }
         }
     }
@@ -78,8 +77,7 @@ class RunTestsCommandTests: XCTestCase {
         ["SampleTests", "SampleUITests"].forEach { (target) in
             result.context.simulatorConfigurations.forEach { (simulatorConfiguration) in
                 let url = result.context.fileManager.urlFor(simulatorConfiguration: simulatorConfiguration, target: target)
-                XCTAssertFileSizeGreaterThan(url.appendingPathComponent("Sample.log").path, 0)
-                XCTAssertFileSizeGreaterThan(url.appendingPathComponent("test.log").path, 0)
+                XCTAssertFileSizeGreaterThan(url.appendingPathComponent(logFileName(for: target)).path, 0)
             }
         }
     }
@@ -104,7 +102,6 @@ class RunTestsCommandTests: XCTestCase {
         result.context.simulatorConfigurations.forEach { (simulatorConfiguration) in
             let url = result.context.fileManager.urlFor(simulatorConfiguration: simulatorConfiguration, target: "SuccessfulTests")
             XCTAssertFileSizeGreaterThan(url.appendingPathComponent("Sample.log").path, 0)
-            XCTAssertFileSizeGreaterThan(url.appendingPathComponent("test.log").path, 0)
         }
     }
 
@@ -126,8 +123,7 @@ class RunTestsCommandTests: XCTestCase {
         ["SampleTests", "SampleUITests", "SuccessfulTests"].forEach { (target) in
             result.context.simulatorConfigurations.forEach { (simulatorConfiguration) in
                 let url = result.context.fileManager.urlFor(simulatorConfiguration: simulatorConfiguration, target: target)
-                XCTAssertFileSizeGreaterThan(url.appendingPathComponent("Sample.log").path, 0)
-                XCTAssertFileSizeGreaterThan(url.appendingPathComponent("test.log").path, 0)
+                XCTAssertFileSizeGreaterThan(url.appendingPathComponent(logFileName(for: target)).path, 0)
             }
         }
     }
@@ -149,11 +145,22 @@ class RunTestsCommandTests: XCTestCase {
         result.context.simulatorConfigurations.forEach { (simulatorConfiguration) in
             let url = result.context.fileManager.urlFor(simulatorConfiguration: simulatorConfiguration, target: "CrashTests")
             XCTAssertFileSizeGreaterThan(url.appendingPathComponent("Crash.log").path, 0)
-            XCTAssertFileSizeGreaterThan(url.appendingPathComponent("test.log").path, 0)
             XCTAssertDirectoryContainsFileThatHasSuffix(url.path, ".crash")
         }
     }
 
+    // MARK: -
+
+    func logFileName(for target: String) -> String {
+        switch target {
+        case "SampleTests": return "Sample.log"
+        case "SuccessfulTests": return "Sample.log"
+        case "SampleUITests": return "SampleUITests-Runner.log"
+        default:
+            preconditionFailure("Unsupported target: \(target)")
+        }
+    }
+
 }
 
 extension RunTestsCommandTests {

PXCTestKitTests/FileReaderTests.swift

@@ -0,0 +1,28 @@
+//
+//  FileReaderTests.swift
+//  pxctest
+//
+//  Created by Johannes Plunien on 20/02/2017.
+//  Copyright © 2017 Johannes Plunien. All rights reserved.
+//
+
+import XCTest
+@testable import PXCTestKit
+
+class FileReaderTests: XCTestCase {
+
+    func testNextLine() {
+        var expectedLines = Array([
+            "this\n",
+            "is\n",
+            "some\n",
+            "text\n",
+            "lastline\n",
+        ].reversed())
+        let reader = FileReader(path: fixtures.textFilePath)!
+        for line in reader {
+            XCTAssertEqual(line, expectedLines.popLast())
+        }
+    }
+
+}

PXCTestKitTests/Fixtures/something.txt

@@ -0,0 +1,5 @@
+this
+is
+some
+text
+lastline

PXCTestKitTests/Helper/Fixtures.swift

@@ -22,6 +22,10 @@ final class Fixtures {
         return bundle.url(forResource: "runtime", withExtension: "json")!
     }
 
+    var textFilePath: String {
+        return bundle.path(forResource: "something", ofType: "txt")!
+    }
+
     // MARK: - Sample.app
 
     var sampleAppTestRun: URL {