Merge pull request #71 from bmironer/fix-issue-66

Fixes issue 66
FlineDev · Sep 26, 2017 · d5c7666 · d5c7666
2 parents e9d821c + ace1802
commit d5c7666
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/Sources/Code/Commander.swift b/Sources/Code/Commander.swift
@@ -32,7 +32,15 @@ class Commander {
         task.standardError = errpipe
 
         task.launch()
-
+
+        var errors: [String] = []
+        let errdata = errpipe.fileHandleForReading.readDataToEndOfFile()
+
+        if var string = String(data: errdata, encoding: .utf8) {
+            string = string.trimmingCharacters(in: .newlines)
+            errors = string.components(separatedBy: "\n")
+        }
+
         var outputs: [String] = []
         let outdata = outpipe.fileHandleForReading.readDataToEndOfFile()
 
@@ -41,14 +49,6 @@ class Commander {
             outputs = string.components(separatedBy: "\n")
         }
 
-        var errors: [String] = []
-        let errdata = errpipe.fileHandleForReading.readDataToEndOfFile()
-
-        if var string = String(data: errdata, encoding: .utf8) {
-            string = string.trimmingCharacters(in: .newlines)
-            errors = string.components(separatedBy: "\n")
-        }
-
         task.waitUntilExit()
         let status = task.terminationStatus
 

diff --git a/Tests/Code/StringsFilesSearchTests.swift b/Tests/Code/StringsFilesSearchTests.swift
@@ -21,7 +21,7 @@ class StringsFilesSearchTests: XCTestCase {
         let results = StringsFilesSearch.shared.findAllIBFiles(within: basePath, withLocale: "Base")
 
         XCTAssertEqual(results.count, expectedIBFilePaths.count)
-        XCTAssertEqual(results, expectedIBFilePaths)
+        XCTAssertEqual(results.sorted(), expectedIBFilePaths.sorted())
     }
 
     func testFindAllStringsFiles() {
@@ -33,7 +33,7 @@ class StringsFilesSearchTests: XCTestCase {
         let results = StringsFilesSearch.shared.findAllStringsFiles(within: basePath, withLocale: "de")
 
         XCTAssertEqual(results.count, expectedStringsFilePaths.count)
-        XCTAssertEqual(results, expectedStringsFilePaths)
+        XCTAssertEqual(results.sorted(), expectedStringsFilePaths.sorted())
     }
 
     func testiOSFindAllLocalesForStringsFile() {
@@ -43,7 +43,7 @@ class StringsFilesSearchTests: XCTestCase {
         let results = StringsFilesSearch.shared.findAllLocalesForStringsFile(sourceFilePath: baseStoryboardPath)
 
         XCTAssertEqual(results.count, expectedStringsPaths.count)
-        XCTAssertEqual(results, expectedStringsPaths)
+        XCTAssertEqual(results.sorted(), expectedStringsPaths.sorted())
     }