Skip to content
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

Use swift-testing and remove tests from production #377

Draft
wants to merge 18 commits into
base: develop
Choose a base branch
from
Draft

Use swift-testing and remove tests from production #377

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
5867005
Setup swift-testing
uhooi Oct 1, 2023
b7e200d
Update MonsterListPresenterTests
uhooi Oct 1, 2023
d7c31ff
Update MonsterListInteractorTests
uhooi Oct 1, 2023
398089e
Update MonsterDetailPresenterTests
uhooi Oct 1, 2023
774031a
Update MonsterDetailInteractorTests
uhooi Oct 1, 2023
e0cc800
Update UserDefaultsClientTests
uhooi Oct 1, 2023
7801044
Add comments
uhooi Oct 1, 2023
c7de993
Remove tests from production
uhooi Oct 1, 2023
e1bf41f
Update UhooiPicBookTests
uhooi Oct 1, 2023
791eec6
Fix comment
uhooi Oct 1, 2023
1129155
Remove swift-testing from develop xcodeproj
uhooi Oct 1, 2023
f2078bb
Fix xcodeproj test build error
uhooi Oct 1, 2023
2fe2477
Fix deprecated API
uhooi Oct 1, 2023
998f6d5
Refactor UhooiPicBookUITests
uhooi Oct 1, 2023
ec71c58
Add skipPackagePluginValidation flag to test-debug
uhooi Oct 1, 2023
22f8dd2
Merge remote-tracking branch 'origin/develop' into feature/use_swift_…
uhooi Feb 5, 2024
26af036
Use swift-testing 0.7.0
uhooi Apr 21, 2024
922d4a6
Format UserDefaultsClientTests
uhooi Apr 21, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ jobs:
strategy:
fail-fast: false
matrix:
name: ["develop", "production", "app-module"]
name: ["develop", "app-module"]

steps:
# チェックアウト
Expand Down
72 changes: 66 additions & 6 deletions App/Develop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@
3784E43C6F9862BB2E871B15 /* UhooiPicBookWidgetsConfigurableIntent.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D3A28FF132F9DB6448EAC23F /* UhooiPicBookWidgetsConfigurableIntent.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
3ED6158022DE90CA4AA73905 /* ImagePopupPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C5239C3163F47164ECE33E8 /* ImagePopupPage.swift */; };
478286982E492B33E65E682B /* ActivityPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = D1BC591FA4C18A058784472F /* ActivityPage.swift */; };
4B0CB3952AC9C2DC0025FA52 /* Testing in Frameworks */ = {isa = PBXBuildFile; productRef = 4B0CB3942AC9C2DC0025FA52 /* Testing */; };
4B0CB3972AC9C30E0025FA52 /* Scaffolding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B0CB3962AC9C30E0025FA52 /* Scaffolding.swift */; };
4BBA93DC2AC9440300C022FD /* Scaffolding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4BBA93DB2AC9440300C022FD /* Scaffolding.swift */; };
4BBB00272AC9A1BA002C12E2 /* Testing in Frameworks */ = {isa = PBXBuildFile; productRef = 4BBB00262AC9A1BA002C12E2 /* Testing */; };
5022F0F1F72B5341C9486B7A /* SwiftUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 33B49E10FB3AFB3745B0AEF4 /* SwiftUI.framework */; };
522896F9FC51ED2221060387 /* MonsterListPage.swift in Sources */ = {isa = PBXBuildFile; fileRef = B21F0F147EB90FE7EAF86DB2 /* MonsterListPage.swift */; };
745EB4E9574D57EB307F2AB9 /* UhooiPicBookStickers.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = D97430DE3B018D83FA30BA3F /* UhooiPicBookStickers.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
Expand Down Expand Up @@ -112,6 +116,8 @@
33B49E10FB3AFB3745B0AEF4 /* SwiftUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SwiftUI.framework; path = System/Library/Frameworks/SwiftUI.framework; sourceTree = SDKROOT; };
3678749154206AA2C7DE69F6 /* WidgetKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WidgetKit.framework; path = System/Library/Frameworks/WidgetKit.framework; sourceTree = SDKROOT; };
39F4CD1686D945CFB87141CE /* GoogleUtilities.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = GoogleUtilities.xcframework; path = Frameworks/Firebase/FirebaseAnalytics/GoogleUtilities.xcframework; sourceTree = "<group>"; };
4B0CB3962AC9C30E0025FA52 /* Scaffolding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Scaffolding.swift; sourceTree = "<group>"; };
4BBA93DB2AC9440300C022FD /* Scaffolding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Scaffolding.swift; sourceTree = "<group>"; };
541427EC2F900D49CD247CB2 /* XCUIElement+Ex.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "XCUIElement+Ex.swift"; sourceTree = "<group>"; };
5FC40872E7A32ADB0B8AE3D7 /* FirebaseFirestore.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FirebaseFirestore.xcframework; path = Frameworks/Firebase/FirebaseFirestore/FirebaseFirestore.xcframework; sourceTree = "<group>"; };
64FA23DFA00E386CF2DBCE63 /* FirebaseCoreDiagnostics.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = FirebaseCoreDiagnostics.xcframework; path = Frameworks/Firebase/FirebaseAnalytics/FirebaseCoreDiagnostics.xcframework; sourceTree = "<group>"; };
Expand Down Expand Up @@ -169,6 +175,22 @@
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
4B0CB3932AC9C2D50025FA52 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4B0CB3952AC9C2DC0025FA52 /* Testing in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
4BBB00242AC9A172002C12E2 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
4BBB00272AC9A1BA002C12E2 /* Testing in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
6986B5ACA2E569F81163AE24 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -369,6 +391,7 @@
children = (
988A97043A06E226C6868588 /* Info.plist */,
9E07DDF4AF7D2B2926033FDC /* Extensions */,
4BBA93DB2AC9440300C022FD /* Scaffolding.swift */,
);
path = UhooiPicBookTests;
sourceTree = "<group>";
Expand All @@ -389,6 +412,7 @@
541427EC2F900D49CD247CB2 /* XCUIElement+Ex.swift */,
EB9FF08BDED117C228729B0B /* Pages */,
9D14FEE7DAB67CCFD61B333D /* TestCases */,
4B0CB3962AC9C30E0025FA52 /* Scaffolding.swift */,
);
path = UhooiPicBookUITests;
sourceTree = "<group>";
Expand Down Expand Up @@ -450,13 +474,17 @@
buildConfigurationList = 1FF40AA4CFE5087652123EAD /* Build configuration list for PBXNativeTarget "UhooiPicBookTests" */;
buildPhases = (
4FE41A7B35B5E5FAA407F3FA /* Sources */,
4BBB00242AC9A172002C12E2 /* Frameworks */,
);
buildRules = (
);
dependencies = (
4DAF6BC74EE9AEF3E06A50D2 /* PBXTargetDependency */,
);
name = UhooiPicBookTests;
packageProductDependencies = (
4BBB00262AC9A1BA002C12E2 /* Testing */,
);
productName = UhooiPicBookTests;
productReference = BA21C3023C46CC6151A43886 /* UhooiPicBookTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
Expand All @@ -466,13 +494,17 @@
buildConfigurationList = 5336812240FABFFCD289F94B /* Build configuration list for PBXNativeTarget "UhooiPicBookUITests" */;
buildPhases = (
22070DEEFB8F99971EC40231 /* Sources */,
4B0CB3932AC9C2D50025FA52 /* Frameworks */,
);
buildRules = (
);
dependencies = (
BB72275143FEBC036B69BC5C /* PBXTargetDependency */,
);
name = UhooiPicBookUITests;
packageProductDependencies = (
4B0CB3942AC9C2DC0025FA52 /* Testing */,
);
productName = UhooiPicBookUITests;
productReference = 83C280827AC1AC8CDC771EC4 /* UhooiPicBookUITests.xctest */;
productType = "com.apple.product-type.bundle.ui-testing";
Expand Down Expand Up @@ -572,6 +604,7 @@
);
mainGroup = 47C552D3546C641AB89783C1;
packageReferences = (
4BBB00252AC9A1A3002C12E2 /* XCRemoteSwiftPackageReference "swift-testing" */,
);
projectDirPath = "";
projectRoot = "";
Expand Down Expand Up @@ -745,6 +778,7 @@
3ED6158022DE90CA4AA73905 /* ImagePopupPage.swift in Sources */,
7B7002A645C43EBB624D82D8 /* MonsterDetailPage.swift in Sources */,
522896F9FC51ED2221060387 /* MonsterListPage.swift in Sources */,
4B0CB3972AC9C30E0025FA52 /* Scaffolding.swift in Sources */,
ED23EF346F55E2E02F461F16 /* PageProtocol.swift in Sources */,
2AB9187FB6C6F195BDFA0AEA /* UhooiPicBookUITests.swift in Sources */,
A1713DA74A4AE73B34351622 /* XCUIElement+Ex.swift in Sources */,
Expand All @@ -765,6 +799,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
4BBA93DC2AC9440300C022FD /* Scaffolding.swift in Sources */,
A6BE80E8825B6DA6ACE56D06 /* BundleStringTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -864,6 +899,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
INFOPLIST_FILE = UhooiPicBookTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -889,7 +925,7 @@
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/UhooiPicBookWidgets/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -919,7 +955,7 @@
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/UhooiPicBookWidgetsConfigurableIntent/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -975,7 +1011,7 @@
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/UhooiPicBookWidgets/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1059,7 +1095,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MARKETING_VERSION = 1.6.0;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -1154,7 +1190,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
MARKETING_VERSION = 1.6.0;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
Expand Down Expand Up @@ -1182,6 +1218,7 @@
DEVELOPMENT_LANGUAGE = jp;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/UhooiPicBook/Resources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1201,6 +1238,7 @@
DEVELOPMENT_LANGUAGE = jp;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
INFOPLIST_FILE = "$(SRCROOT)/UhooiPicBook/Resources/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1216,6 +1254,7 @@
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
INFOPLIST_FILE = UhooiPicBookTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand All @@ -1239,7 +1278,7 @@
"$(inherited)",
);
INFOPLIST_FILE = "$(SRCROOT)/UhooiPicBookWidgetsConfigurableIntent/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 15.0;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
Expand Down Expand Up @@ -1326,7 +1365,28 @@
};
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
4BBB00252AC9A1A3002C12E2 /* XCRemoteSwiftPackageReference "swift-testing" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/apple/swift-testing";
requirement = {
branch = main;
kind = branch;
};
};
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
4B0CB3942AC9C2DC0025FA52 /* Testing */ = {
isa = XCSwiftPackageProductDependency;
package = 4BBB00252AC9A1A3002C12E2 /* XCRemoteSwiftPackageReference "swift-testing" */;
productName = Testing;
};
4BBB00262AC9A1BA002C12E2 /* Testing */ = {
isa = XCSwiftPackageProductDependency;
package = 4BBB00252AC9A1A3002C12E2 /* XCRemoteSwiftPackageReference "swift-testing" */;
productName = Testing;
};
791904C92793F9CB00416F7D /* ImageLoader */ = {
isa = XCSwiftPackageProductDependency;
productName = ImageLoader;
Expand Down
Loading
Loading