diff --git a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme index 2f5fe3c..0f36fe6 100644 --- a/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme +++ b/PHP Monitor.xcodeproj/xcshareddata/xcschemes/PHP Monitor DEV.xcscheme @@ -80,7 +80,7 @@ + isEnabled = "YES"> String in @@ -39,7 +39,7 @@ class PhpExtensionTest: XCTestCase { XCTAssertFalse(extensionNames.contains("nice")) } - func testExtensionStatusIsCorrect() throws { + func test_extension_status_is_correct() throws { let extensions = PhpExtension.from(filePath: Self.phpIniFileUrl.path) // xdebug should be enabled @@ -49,7 +49,7 @@ class PhpExtensionTest: XCTestCase { XCTAssertEqual(extensions[1].enabled, false) } - func testToggleWorksAsExpected() async throws { + func test_toggle_works_as_expected() async throws { let destination = Utility.copyToTemporaryFile(resourceName: "php", fileExtension: "ini")! let extensions = PhpExtension.from(filePath: destination.path) XCTAssertEqual(extensions.count, 6) diff --git a/tests/unit/Parsers/ValetConfigurationTest.swift b/tests/unit/Parsers/ValetConfigurationTest.swift index fab1e15..e640177 100644 --- a/tests/unit/Parsers/ValetConfigurationTest.swift +++ b/tests/unit/Parsers/ValetConfigurationTest.swift @@ -17,7 +17,7 @@ class ValetConfigurationTest: XCTestCase { )! } - func testCanLoadConfigFile() throws { + func test_can_load_config_file() throws { let json = try? String( contentsOf: Self.jsonConfigFileUrl, encoding: .utf8 diff --git a/tests/unit/Testables/TestableConfigurationTest.swift b/tests/unit/Testables/TestableConfigurationTest.swift index b51cee7..e31e54f 100644 --- a/tests/unit/Testables/TestableConfigurationTest.swift +++ b/tests/unit/Testables/TestableConfigurationTest.swift @@ -12,8 +12,9 @@ class TestableConfigurationTest: XCTestCase { func test_configuration_can_be_saved_as_json() async { var configuration = TestableConfigurations.working configuration.filesystem["/opt/homebrew/bin/php"] = nil - print(configuration.filesystem.keys) + let json = configuration.toJson() + try! json.write(toFile: "/tmp/pmc_working.json", atomically: true, encoding: .utf8) try! json.write(toFile: "/tmp/pmc_broken.json", atomically: true, encoding: .utf8) } diff --git a/tests/unit/Versions/AppUpdaterCheckTest.swift b/tests/unit/Versions/AppUpdaterCheckTest.swift index 04faaae..11215fd 100644 --- a/tests/unit/Versions/AppUpdaterCheckTest.swift +++ b/tests/unit/Versions/AppUpdaterCheckTest.swift @@ -10,7 +10,7 @@ import XCTest class AppUpdaterCheckTest: XCTestCase { - func testCanRetrieveVersionFromCask() async { + func test_can_retrieve_version_from_cask() async { let caskVersion = await AppUpdateChecker.retrieveVersionFromCask() let version = VersionExtractor.from(caskVersion) @@ -18,21 +18,21 @@ class AppUpdaterCheckTest: XCTestCase { XCTAssertNotNil(version) } - func testTaggedReleaseOmitsZeroPatch() { + func test_tagged_release_omits_zero_patch() { let version = AppVersion.from("3.5.0_333")! XCTAssertEqual(version.tagged, "3.5") XCTAssertEqual(version.version, "3.5.0") } - func testTaggedReleaseDoesntOmitNonZeroPatch() { + func test_tagged_release_doesnt_omit_non_zero_patch() { let version = AppVersion.from("3.5.1_333")! XCTAssertEqual(version.tagged, "3.5.1") XCTAssertEqual(version.version, "3.5.1") } - func testTagTruncationDoesntAffectMajorVersions() { + func test_tag_truncation_does_not_affect_major_versions() { var version = AppVersion.from("5.0_333")! XCTAssertEqual(version.tagged, "5.0") diff --git a/tests/unit/Versions/AppVersionTest.swift b/tests/unit/Versions/AppVersionTest.swift index e96846e..040f819 100644 --- a/tests/unit/Versions/AppVersionTest.swift +++ b/tests/unit/Versions/AppVersionTest.swift @@ -10,11 +10,11 @@ import XCTest class AppVersionTest: XCTestCase { - func testCanRetrieveInternalAppVersion() { + func test_can_retrieve_internal_app_version() { XCTAssertNotNil(AppVersion.fromCurrentVersion()) } - func testCanParseNormalVersionString() { + func test_can_parse_normal_version_string() { let version = AppVersion.from("1.0.0") XCTAssertNotNil(version) @@ -23,7 +23,7 @@ class AppVersionTest: XCTestCase { XCTAssertEqual(nil, version?.suffix) } - func testCanParseCaskVersionString() { + func test_can_parse_cask_version_string() { let version = AppVersion.from("1.0.0_600") XCTAssertNotNil(version) @@ -32,7 +32,7 @@ class AppVersionTest: XCTestCase { XCTAssertEqual(nil, version?.suffix) } - func testCanParseDevVersionStringWithoutBuildNumber() { + func test_can_parse_dev_version_string_without_build_number() { let version = AppVersion.from("1.0.0-dev") XCTAssertNotNil(version) @@ -41,7 +41,7 @@ class AppVersionTest: XCTestCase { XCTAssertEqual("dev", version?.suffix) } - func testCanParseDevVersionStringWithBuildNumber() { + func test_can_parse_dev_version_string_with_build_number() { let version = AppVersion.from("1.0.0-dev,870") XCTAssertNotNil(version) @@ -50,7 +50,7 @@ class AppVersionTest: XCTestCase { XCTAssertEqual("dev", version?.suffix) } - func testCanParseUnderscoresAsBuildSeparatorToo() { + func test_can_parse_underscores_as_build_separator() { let version = AppVersion.from("1.0.0-dev_870") XCTAssertNotNil(version) diff --git a/tests/unit/Versions/PhpVersionDetectionTest.swift b/tests/unit/Versions/PhpVersionDetectionTest.swift index e25b2b5..64541b0 100644 --- a/tests/unit/Versions/PhpVersionDetectionTest.swift +++ b/tests/unit/Versions/PhpVersionDetectionTest.swift @@ -10,7 +10,7 @@ import XCTest class PhpVersionDetectionTest: XCTestCase { - func testCanDetectValidPhpVersions() async throws { + func test_can_detect_valid_php_versions() async throws { let outcome = await PhpEnv.shared.extractPhpVersions(from: [ "", // empty lines should be omitted "php@8.0", diff --git a/tests/unit/Versions/PhpVersionNumberTest.swift b/tests/unit/Versions/PhpVersionNumberTest.swift index f8b904a..17fbbae 100644 --- a/tests/unit/Versions/PhpVersionNumberTest.swift +++ b/tests/unit/Versions/PhpVersionNumberTest.swift @@ -11,7 +11,7 @@ import XCTest // swiftlint:disable type_body_length class PhpVersionNumberTest: XCTestCase { - func testCanDeconstructPhpVersion() throws { + func test_can_deconstruct_php_version() throws { XCTAssertEqual( try! PhpVersionNumber.parse("PHP 8.2.0-dev"), PhpVersionNumber(major: 8, minor: 2, patch: 0) @@ -38,13 +38,13 @@ class PhpVersionNumberTest: XCTestCase { ) } - func testPhpVersionNumberParse() throws { + func test_php_version_number_parse() throws { XCTAssertThrowsError(try PhpVersionNumber.parse("OOF")) { error in XCTAssertTrue(error is VersionParseError) } } - func testCanCheckFixedConstraints() throws { + func test_can_check_fixed_constraints() throws { XCTAssertEqual( PhpVersionNumberCollection .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]) @@ -78,7 +78,7 @@ class PhpVersionNumberTest: XCTestCase { ) } - func testCanCheckCaretConstraints() throws { + func test_can_check_caret_constraints() throws { // 1. Imprecise checks XCTAssertEqual( PhpVersionNumberCollection @@ -138,7 +138,7 @@ class PhpVersionNumberTest: XCTestCase { ) } - func testCanCheckTildeConstraints() throws { + func test_can_check_tilde_constraints() throws { // 1. Imprecise checks XCTAssertEqual( PhpVersionNumberCollection @@ -207,7 +207,7 @@ class PhpVersionNumberTest: XCTestCase { ) } - func testCanCheckGreaterThanOrEqualConstraints() throws { + func test_can_check_greater_than_or_equal_constraints() throws { XCTAssertEqual( PhpVersionNumberCollection .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]) @@ -243,7 +243,7 @@ class PhpVersionNumberTest: XCTestCase { ) } - func testCanCheckGreaterThanConstraints() throws { + func test_can_check_greater_than_constraints() throws { XCTAssertEqual( PhpVersionNumberCollection .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]) @@ -289,7 +289,7 @@ class PhpVersionNumberTest: XCTestCase { ) } - func testCanCheckLessThanOrEqualConstraints() throws { + func test_can_check_less_than_or_equal_constraints() throws { XCTAssertEqual( PhpVersionNumberCollection .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]) @@ -325,7 +325,7 @@ class PhpVersionNumberTest: XCTestCase { ) } - func testCanCheckLessThanConstraints() throws { + func test_can_check_less_than_constraints() throws { XCTAssertEqual( PhpVersionNumberCollection .make(from: ["7.4", "7.3", "7.2", "7.1", "7.0"]) diff --git a/tests/unit/Versions/ValetVersionExtractorTest.swift b/tests/unit/Versions/ValetVersionExtractorTest.swift index 89c6a63..e1499f3 100644 --- a/tests/unit/Versions/ValetVersionExtractorTest.swift +++ b/tests/unit/Versions/ValetVersionExtractorTest.swift @@ -10,7 +10,7 @@ import XCTest class ValetVersionExtractorTest: XCTestCase { - func testDetermineValetVersion() async { + func test_can_determine_valet_version() async { let version = await valet("--version", sudo: false) XCTAssert(version.contains("Laravel Valet 2") || version.contains("Laravel Valet 3")) } diff --git a/tests/unit/Versions/VersionExtractorTest.swift b/tests/unit/Versions/VersionExtractorTest.swift index 5a32ba0..3501af1 100644 --- a/tests/unit/Versions/VersionExtractorTest.swift +++ b/tests/unit/Versions/VersionExtractorTest.swift @@ -10,12 +10,12 @@ import XCTest class VersionExtractorTest: XCTestCase { - func testExtractVersion() { + func test_extract_version() { XCTAssertEqual(VersionExtractor.from("Laravel Valet 2.17.1"), "2.17.1") XCTAssertEqual(VersionExtractor.from("Laravel Valet 2.0"), "2.0") } - func testVersionComparison() { + func test_version_comparison() { XCTAssertEqual("2.0".versionCompare("2.1"), .orderedAscending) XCTAssertEqual("2.1".versionCompare("2.0"), .orderedDescending) XCTAssertEqual("2.0".versionCompare("2.0"), .orderedSame)