Skip to content

Activate Disabled Tests #3870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 16, 2021
Merged

Activate Disabled Tests #3870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions Sources/SPMTestSupport/PIFTester.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,15 @@ public final class PIFBuildSettingsTester {
}
}

public subscript(_ key: PIF.BuildSettings.SingleValueSetting, for platform: PIF.BuildSettings.Platform) -> String? {
if let value = buildSettings[key, for: platform] {
buildSettings[key, for: platform] = nil
return value
} else {
return nil
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure about this mutating subscript. why does it need to mutate?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The subscript simply follows the pattern of the others around it, filling the hole for this particular signature:

  • Existing: subscript(_ key: SingleValueSetting) -> String?
  • Added because missing: subscript(_ key: SingleValueSetting, for platform: Platform) -> String?
  • Existing: subscript(_ key: MultipleValueSetting) -> [String]?
  • Existing: subscript(_ key: MultipleValueSetting, for platform: Platform) -> [String]?

The tests that call these subscripts appear to expect each call to clear the respective entry. After all expected settings have been checked (removing them as a side effect), the tests then check that the remainder is indeed empty. Left over entries (due to the list having gone stale) were why the test had been failing. Some of the entries I needed to add had this signature, which was not yet supported by the existing subscripts.


public subscript(_ key: PIF.BuildSettings.MultipleValueSetting) -> [String]? {
if let value = buildSettings[key] {
buildSettings[key] = nil
Expand Down
2 changes: 0 additions & 2 deletions Tests/PackageModelTests/ManifestTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,12 @@ class ManifestTests: XCTestCase {
targets: targets
)

#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
XCTAssertEqual(manifest.targetsRequired(for: .specific(["Foo", "Bar"])).map({ $0.name }).sorted(), [
"Bar",
"Baz",
"Foo",
"MyPlugin",
])
#endif
}
}

Expand Down
43 changes: 29 additions & 14 deletions Tests/XCBuildSupportTests/PIFBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,19 +89,14 @@ class PIFBuilderTests: XCTestCase {
XCTAssertEqual(targetAExeDependencies.map{ $0.targetGUID }, ["PACKAGE-PRODUCT:blib", "PACKAGE-TARGET:A2", "PACKAGE-TARGET:A3"])
let projectBTargetNames = pif.workspace.projects[1].targets.map({ $0.name })
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
XCTAssertEqual(projectBTargetNames, ["blib", "B2"])
XCTAssertEqual(projectBTargetNames, ["blib_7AE74026D_PackageProduct", "B2"])
#else
XCTAssertEqual(projectBTargetNames, ["bexe_7ADFD1428_PackageProduct", "blib_7AE74026D_PackageProduct", "B2"])
#endif
}
}

func testProject() throws {
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
#else
try XCTSkipIf(true)
#endif

let fs = InMemoryFileSystem(emptyFiles:
"/Foo/Sources/foo/main.swift",
"/Foo/Tests/FooTests/tests.swift",
Expand Down Expand Up @@ -177,6 +172,7 @@ class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "NO")
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf")
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
XCTAssertEqual(settings[.ENABLE_NS_ASSERTIONS], "YES")
XCTAssertEqual(settings[.ENABLE_TESTABILITY], "YES")
Expand All @@ -185,6 +181,7 @@ class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "0")
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE", "DEBUG=1"])
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "9.0")
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.10")
XCTAssertEqual(settings[.ONLY_ACTIVE_ARCH], "YES")
Expand Down Expand Up @@ -223,12 +220,14 @@ class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "YES")
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf-with-dsym")
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
XCTAssertEqual(settings[.ENABLE_TESTING_SEARCH_PATHS], "YES")
XCTAssertEqual(settings[.ENTITLEMENTS_REQUIRED], "NO")
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "s")
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE"])
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "9.0")
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.10")
XCTAssertEqual(settings[.OTHER_LDRFLAGS], [])
Expand Down Expand Up @@ -275,6 +274,7 @@ class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "NO")
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf")
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
XCTAssertEqual(settings[.ENABLE_NS_ASSERTIONS], "YES")
XCTAssertEqual(settings[.ENABLE_TESTABILITY], "YES")
Expand All @@ -283,6 +283,7 @@ class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "0")
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE", "DEBUG=1"])
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "12.0")
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.14")
XCTAssertEqual(settings[.ONLY_ACTIVE_ARCH], "YES")
Expand Down Expand Up @@ -321,12 +322,14 @@ class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CODE_SIGNING_REQUIRED], "NO")
XCTAssertEqual(settings[.COPY_PHASE_STRIP], "YES")
XCTAssertEqual(settings[.DEBUG_INFORMATION_FORMAT], "dwarf-with-dsym")
XCTAssertEqual(settings[.DRIVERKIT_DEPLOYMENT_TARGET], "19.0")
XCTAssertEqual(settings[.DYLIB_INSTALL_NAME_BASE], "@rpath")
XCTAssertEqual(settings[.ENABLE_TESTING_SEARCH_PATHS], "YES")
XCTAssertEqual(settings[.ENTITLEMENTS_REQUIRED], "NO")
XCTAssertEqual(settings[.GCC_OPTIMIZATION_LEVEL], "s")
XCTAssertEqual(settings[.GCC_PREPROCESSOR_DEFINITIONS], ["$(inherited)", "SWIFT_PACKAGE"])
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET], "12.0")
XCTAssertEqual(settings[.IPHONEOS_DEPLOYMENT_TARGET, for: .macCatalyst], "13.0")
XCTAssertEqual(settings[.KEEP_PRIVATE_EXTERNS], "NO")
XCTAssertEqual(settings[.MACOSX_DEPLOYMENT_TARGET], "10.14")
XCTAssertEqual(settings[.OTHER_LDRFLAGS], [])
Expand Down Expand Up @@ -698,11 +701,6 @@ class PIFBuilderTests: XCTestCase {
}

func testTestProducts() throws {
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
#else
try XCTSkipIf(true)
#endif

let fs = InMemoryFileSystem(emptyFiles:
"/Foo/Sources/FooTests/FooTests.swift",
"/Foo/Sources/CFooTests/CFooTests.m",
Expand All @@ -712,7 +710,8 @@ class PIFBuilderTests: XCTestCase {
"/Bar/Sources/bar/main.swift",
"/Bar/Sources/BarTests/BarTests.swift",
"/Bar/Sources/CBarTests/CBarTests.m",
"/Bar/Sources/BarLib/lib.swift"
"/Bar/Sources/BarLib/lib.swift",
inputsDir.appending(component: "Foo.pc").pathString
)

let observability = ObservabilitySystem.makeForTesting()
Expand Down Expand Up @@ -779,7 +778,7 @@ class PIFBuilderTests: XCTestCase {
PIFTester(pif) { workspace in
workspace.checkProject("PACKAGE:/Foo") { project in
project.checkTarget("PACKAGE-PRODUCT:FooTests") { target in
XCTAssertEqual(target.name, "FooTests")
XCTAssertEqual(target.name, "FooTests_-5E24708DC81AF5C1_PackageProduct")
XCTAssertEqual(target.productType, .unitTest)
XCTAssertEqual(target.productName, "FooTests")
XCTAssertEqual(target.dependencies, [
Expand Down Expand Up @@ -809,6 +808,10 @@ class PIFBuilderTests: XCTestCase {
"@loader_path/Frameworks",
"@loader_path/../Frameworks"
])
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
"$(inherited)",
"/toolchain/lib/swift/macosx"
])
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
Expand Down Expand Up @@ -837,6 +840,10 @@ class PIFBuilderTests: XCTestCase {
"@loader_path/Frameworks",
"@loader_path/../Frameworks"
])
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
"$(inherited)",
"/toolchain/lib/swift/macosx"
])
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "FooTests")
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "FooTests")
Expand All @@ -856,7 +863,7 @@ class PIFBuilderTests: XCTestCase {
}

project.checkTarget("PACKAGE-PRODUCT:CFooTests") { target in
XCTAssertEqual(target.name, "CFooTests")
XCTAssertEqual(target.name, "CFooTests_A328606A9BCFA83_PackageProduct")
XCTAssertEqual(target.productType, .unitTest)
XCTAssertEqual(target.productName, "CFooTests")
XCTAssertEqual(target.dependencies, [])
Expand All @@ -880,6 +887,10 @@ class PIFBuilderTests: XCTestCase {
"@loader_path/Frameworks",
"@loader_path/../Frameworks"
])
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
"$(inherited)",
"/toolchain/lib/swift/macosx"
])
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")
Expand Down Expand Up @@ -911,6 +922,10 @@ class PIFBuilderTests: XCTestCase {
"@loader_path/Frameworks",
"@loader_path/../Frameworks"
])
XCTAssertEqual(settings[.LIBRARY_SEARCH_PATHS], [
"$(inherited)",
"/toolchain/lib/swift/macosx"
])
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "CFooTests")
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "CFooTests")
Expand Down