From f2d5b94831f879cf3423c19e6f92d60373c5b9cd Mon Sep 17 00:00:00 2001 From: Nico Verbruggen Date: Wed, 2 Nov 2022 19:44:36 +0100 Subject: [PATCH] =?UTF-8?q?=E2=9C=85=20Fix=20tests?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PHP Monitor.xcodeproj/project.pbxproj | 12 +++++++---- .../Filesystem/RealFileSystemTest.swift | 21 +++++++++++++++++++ .../Filesystem/TestableFileSystemTest.swift | 2 +- ...temShellTest.swift => RealShellTest.swift} | 6 +++--- 4 files changed, 33 insertions(+), 8 deletions(-) create mode 100644 tests/unit/Testables/Filesystem/RealFileSystemTest.swift rename tests/unit/Testables/Shell/{SystemShellTest.swift => RealShellTest.swift} (95%) diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 961c03f..517f643 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -75,7 +75,7 @@ C413E43528DA3EB100AE33C7 /* TestableShellTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C413E43428DA3EB100AE33C7 /* TestableShellTest.swift */; }; C415937F27A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; }; C415938027A1B54F00D2E1B7 /* PhpFrameworks.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */; }; - C4159AF728E4D40400545349 /* SystemShellTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4159AF628E4D40400545349 /* SystemShellTest.swift */; }; + C4159AF728E4D40400545349 /* RealShellTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4159AF628E4D40400545349 /* RealShellTest.swift */; }; C415D3B72770F294005EF286 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3B62770F294005EF286 /* Actions.swift */; }; C415D3B82770F294005EF286 /* Actions.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3B62770F294005EF286 /* Actions.swift */; }; C415D3E82770F692005EF286 /* AppDelegate+InterApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */; }; @@ -131,6 +131,7 @@ C449B4F427EE7FC800C47E8A /* DomainListKindCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = C4AC51FB27E27F47008528CA /* DomainListKindCell.swift */; }; C44A874828905BB000498BC4 /* ProgressVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44A874728905BB000498BC4 /* ProgressVC.swift */; }; C44A874928905BB000498BC4 /* ProgressVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44A874728905BB000498BC4 /* ProgressVC.swift */; }; + C44AD3F72912EF7100997FF4 /* RealFileSystemTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44AD3F62912EF7100997FF4 /* RealFileSystemTest.swift */; }; C44B3A4628E5C70100718CB1 /* TimeIntervalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44B3A4528E5C70100718CB1 /* TimeIntervalExtension.swift */; }; C44B3A4728E5C70100718CB1 /* TimeIntervalExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44B3A4528E5C70100718CB1 /* TimeIntervalExtension.swift */; }; C44C198D276E3A1C0072762D /* TerminalProgressWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C44C198C276E3A1C0072762D /* TerminalProgressWindowController.swift */; }; @@ -740,7 +741,7 @@ C412E5FB25700D5300A1FB67 /* HomebrewPackage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HomebrewPackage.swift; sourceTree = ""; }; C413E43428DA3EB100AE33C7 /* TestableShellTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestableShellTest.swift; sourceTree = ""; }; C415937E27A1B54F00D2E1B7 /* PhpFrameworks.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhpFrameworks.swift; sourceTree = ""; }; - C4159AF628E4D40400545349 /* SystemShellTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SystemShellTest.swift; sourceTree = ""; }; + C4159AF628E4D40400545349 /* RealShellTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealShellTest.swift; sourceTree = ""; }; C415D3B62770F294005EF286 /* Actions.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Actions.swift; sourceTree = ""; }; C415D3E72770F692005EF286 /* AppDelegate+InterApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "AppDelegate+InterApp.swift"; sourceTree = ""; }; C4168F4427ADB4A3003B6C39 /* DEVELOPER.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = DEVELOPER.md; sourceTree = ""; }; @@ -784,6 +785,7 @@ C44264BD2850B86C007400F1 /* SwiftUIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SwiftUIHelper.swift; sourceTree = ""; }; C44264BF2850BD2A007400F1 /* VersionPopoverView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VersionPopoverView.swift; sourceTree = ""; }; C44A874728905BB000498BC4 /* ProgressVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProgressVC.swift; sourceTree = ""; }; + C44AD3F62912EF7100997FF4 /* RealFileSystemTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RealFileSystemTest.swift; sourceTree = ""; }; C44B3A4528E5C70100718CB1 /* TimeIntervalExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TimeIntervalExtension.swift; sourceTree = ""; }; C44C198C276E3A1C0072762D /* TerminalProgressWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TerminalProgressWindowController.swift; sourceTree = ""; }; C44C1990276E44CB0072762D /* ProgressWindow.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ProgressWindow.storyboard; sourceTree = ""; }; @@ -1087,7 +1089,7 @@ isa = PBXGroup; children = ( C413E43428DA3EB100AE33C7 /* TestableShellTest.swift */, - C4159AF628E4D40400545349 /* SystemShellTest.swift */, + C4159AF628E4D40400545349 /* RealShellTest.swift */, ); path = Shell; sourceTree = ""; @@ -1309,6 +1311,7 @@ isa = PBXGroup; children = ( C4D3660F291140BE006BD146 /* TestableFileSystemTest.swift */, + C44AD3F62912EF7100997FF4 /* RealFileSystemTest.swift */, ); path = Filesystem; sourceTree = ""; @@ -2489,7 +2492,7 @@ C4FC21B128391F8E00D368BB /* MainMenu+Actions.swift in Sources */, 54D9E0B927E4F51E003B9AD9 /* KeyCombo.swift in Sources */, C4EED88A27A48778006D7272 /* InterAppHandler.swift in Sources */, - C4159AF728E4D40400545349 /* SystemShellTest.swift in Sources */, + C4159AF728E4D40400545349 /* RealShellTest.swift in Sources */, C450C8C728C919EC002A2B4B /* PreferenceName.swift in Sources */, C48D6C75279CD3E400F26D7E /* PhpVersionNumberTest.swift in Sources */, C485707B28BF458900539B36 /* VersionPopoverView.swift in Sources */, @@ -2560,6 +2563,7 @@ C485707C28BF459500539B36 /* NoWarningsView.swift in Sources */, C4F5FBCD28218CB8001065C5 /* Xdebug.swift in Sources */, C40B24F227A310770018C7D2 /* Events.swift in Sources */, + C44AD3F72912EF7100997FF4 /* RealFileSystemTest.swift in Sources */, C4F30B0A278E1A1A00755FCE /* ComposerJson.swift in Sources */, C4C0E8E027F88AEB002D32A9 /* FakeSiteScanner.swift in Sources */, C4AF9F7D275454A900D44ED0 /* ValetVersionExtractorTest.swift in Sources */, diff --git a/tests/unit/Testables/Filesystem/RealFileSystemTest.swift b/tests/unit/Testables/Filesystem/RealFileSystemTest.swift new file mode 100644 index 0000000..349b1c0 --- /dev/null +++ b/tests/unit/Testables/Filesystem/RealFileSystemTest.swift @@ -0,0 +1,21 @@ +// +// RealFileSystemTest.swift +// Unit Tests +// +// Created by Nico Verbruggen on 02/11/2022. +// Copyright © 2022 Nico Verbruggen. All rights reserved. +// + +import XCTest + +class RealFileSystemTest: XCTestCase { + + override class func setUp() { + ActiveFileSystem.useSystem() + } + + func test_testable_fs_is_in_use() { + XCTAssertTrue(FileSystem is RealFileSystem) + } + +} diff --git a/tests/unit/Testables/Filesystem/TestableFileSystemTest.swift b/tests/unit/Testables/Filesystem/TestableFileSystemTest.swift index e465e7d..698e9ba 100644 --- a/tests/unit/Testables/Filesystem/TestableFileSystemTest.swift +++ b/tests/unit/Testables/Filesystem/TestableFileSystemTest.swift @@ -10,7 +10,7 @@ import XCTest class TestableFileSystemTest: XCTestCase { - override class func setUp() { + override func setUp() async throws { ActiveFileSystem.useTestable([ "/home/user/bin/foo": .fake(.binary), "/home/user/docs": .fake(.symlink, "/home/user/documents"), diff --git a/tests/unit/Testables/Shell/SystemShellTest.swift b/tests/unit/Testables/Shell/RealShellTest.swift similarity index 95% rename from tests/unit/Testables/Shell/SystemShellTest.swift rename to tests/unit/Testables/Shell/RealShellTest.swift index 467fc9a..8c57917 100644 --- a/tests/unit/Testables/Shell/SystemShellTest.swift +++ b/tests/unit/Testables/Shell/RealShellTest.swift @@ -1,5 +1,5 @@ // -// SystemShellTest.swift +// RealShellTest.swift // PHP Monitor // // Created by Nico Verbruggen on 28/09/2022. @@ -8,9 +8,9 @@ import XCTest -class SystemShellTest: XCTestCase { +class RealShellTest: XCTestCase { - override class func setUp() { + override func setUp() async throws { // Reset to the default shell ActiveShell.useSystem() }