From ba6f3d6f140afed25673a5fd84835db31dc06e6f Mon Sep 17 00:00:00 2001 From: Toshiya Kobayashi Date: Mon, 27 Jan 2025 16:31:20 +0900 Subject: [PATCH] Include apache-package and mit-package inside the SourcePackagesLICENCE directory --- .../checkouts/apache-package/LICENCE.txt | 0 .../checkouts/mit-package/LICENCE | 0 Tests/LicenseCheckerModuleTests/PackageParserTests.swift | 8 ++++---- 3 files changed, 4 insertions(+), 4 deletions(-) rename Sources/TestResources/Resources/{SourcePackagesApache_LICENCE => SourcePackagesLICENCE}/checkouts/apache-package/LICENCE.txt (100%) rename Sources/TestResources/Resources/{SourcePackagesMIT_LICENCE => SourcePackagesLICENCE}/checkouts/mit-package/LICENCE (100%) diff --git a/Sources/TestResources/Resources/SourcePackagesApache_LICENCE/checkouts/apache-package/LICENCE.txt b/Sources/TestResources/Resources/SourcePackagesLICENCE/checkouts/apache-package/LICENCE.txt similarity index 100% rename from Sources/TestResources/Resources/SourcePackagesApache_LICENCE/checkouts/apache-package/LICENCE.txt rename to Sources/TestResources/Resources/SourcePackagesLICENCE/checkouts/apache-package/LICENCE.txt diff --git a/Sources/TestResources/Resources/SourcePackagesMIT_LICENCE/checkouts/mit-package/LICENCE b/Sources/TestResources/Resources/SourcePackagesLICENCE/checkouts/mit-package/LICENCE similarity index 100% rename from Sources/TestResources/Resources/SourcePackagesMIT_LICENCE/checkouts/mit-package/LICENCE rename to Sources/TestResources/Resources/SourcePackagesLICENCE/checkouts/mit-package/LICENCE diff --git a/Tests/LicenseCheckerModuleTests/PackageParserTests.swift b/Tests/LicenseCheckerModuleTests/PackageParserTests.swift index 87483cc..957459c 100644 --- a/Tests/LicenseCheckerModuleTests/PackageParserTests.swift +++ b/Tests/LicenseCheckerModuleTests/PackageParserTests.swift @@ -52,12 +52,12 @@ final class PackageParserTests: XCTestCase { XCTAssertEqual(sut, [expect]) } - func test_extractLicense_apache_licence() throws { + func test_extractLicence_apache() throws { let jsonPath = "SourcePackagesUnknown/workspace-state" let jsonURL = try XCTUnwrap(testResources.getJsonUrl(jsonPath)) let packageParser = try XCTUnwrap(PackageParser(url: jsonURL)) let resourceURL = try XCTUnwrap(testResources.resourceURL) - let directoryURL = resourceURL.appendingPathComponent("SourcePackagesApache_LICENCE") + let directoryURL = resourceURL.appendingPathComponent("SourcePackagesLICENCE") .appendingPathComponent("checkouts") .appendingPathComponent("apache-package") let sut = packageParser.extractLicense(directoryURL: directoryURL) @@ -96,13 +96,13 @@ final class PackageParserTests: XCTestCase { XCTAssertEqual(sut, [expect]) } - func test_extractLicense_mit_licence() throws { + func test_extractLicence_mit() throws { let jsonPath = "SourcePackagesUnknown/workspace-state" let jsonURL = try XCTUnwrap(testResources.getJsonUrl(jsonPath)) let packageParser = try XCTUnwrap(PackageParser(url: jsonURL)) let resourceURL = try XCTUnwrap(testResources.resourceURL) - let directoryURL = resourceURL.appendingPathComponent("SourcePackagesMIT_LICENCE") + let directoryURL = resourceURL.appendingPathComponent("SourcePackagesLICENCE") .appendingPathComponent("checkouts") .appendingPathComponent("mit-package")