Skip to content
New issue

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

#

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

Already on GitHub? # to your account

fix: #842 support for test targets flag in multiple testbundles xctest #1219

Merged
merged 19 commits into from
Oct 26, 2020
Merged

fix: #842 support for test targets flag in multiple testbundles xctest #1219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
83da53e
XCTestRun.rewrite methods supports now multiple test-targets
zuziaka Oct 1, 2020
8475584
Usage of new `Xctestrun.rewrite` in IosRunCommand
zuziaka Oct 2, 2020
b3d191b
Code formatting + Removed old implementations of IosArgs.filterTests …
zuziaka Oct 2, 2020
7b9cb10
Rebase from master
zuziaka Oct 13, 2020
71f32bc
Code cleaning
zuziaka Oct 13, 2020
4c8e96c
Updated XCtestrun tests
zuziaka Oct 13, 2020
7866caf
Reverted test changes in Debug.kt
zuziaka Oct 14, 2020
aba2a7e
New test artifacts for iOS
zuziaka Oct 15, 2020
3e6ff93
Undo changes in build.gradle.kts
zuziaka Oct 15, 2020
35878a5
Update test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt
zuziaka Oct 16, 2020
b406ba2
Apply suggestions from code review
zuziaka Oct 16, 2020
69c4a0e
Fixed code formatting to pass :detekt
zuziaka Oct 19, 2020
d8075f2
Update test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt
jan-goral Oct 19, 2020
f669dea
Update test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt
jan-goral Oct 19, 2020
990864b
Update test_runner/src/main/kotlin/ftl/args/IosArgs.kt
zuziaka Oct 19, 2020
7a2d75b
Fixed incorrect test artifacts path in ParseTest.kt
zuziaka Oct 19, 2020
a52cc3d
Update test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt
jan-goral Oct 23, 2020
d211a21
Update test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt
jan-goral Oct 23, 2020
0f4021a
Update test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt
jan-goral Oct 23, 2020
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ test_runner/flank/
local.properties
/report.json
results
xcuserdata/
Copy link
Contributor Author

Choose a reason for hiding this comment

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

User generated data for iOS projects (breakpoints, interface state etc.)

22 changes: 11 additions & 11 deletions test_projects/ios/EarlGreyExample/EarlGreyExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@
DEVELOPMENT_TEAM = AD2V26JBWL;
ENABLE_TESTABILITY = YES;
INFOPLIST_FILE = EarlGreyExampleSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.gogoapps.earlgrey.samples.EarlGreySwiftTests;
PRODUCT_MODULE_NAME = EarlGreyExampleTestsSwift;
Expand All @@ -509,9 +509,9 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = NO;
DEVELOPMENT_TEAM = AD2V26JBWL;
DEVELOPMENT_TEAM = L2UF9MLSM6;
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Using GogoApps code signing

INFOPLIST_FILE = EarlGreyExampleSwiftTests/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 9.2;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.gogoapps.earlgrey.samples.EarlGreySwiftTests;
PRODUCT_MODULE_NAME = EarlGreyExampleTestsSwift;
Expand Down Expand Up @@ -559,7 +559,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRODUCT_MODULE_NAME = EarlGreyExample;
Expand Down Expand Up @@ -600,7 +600,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
PRODUCT_MODULE_NAME = EarlGreyExample;
PRODUCT_NAME = EarlGreyExample;
Expand All @@ -622,7 +622,7 @@
DEVELOPMENT_TEAM = AD2V26JBWL;
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = "$(SRCROOT)/EarlGreyExample/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.gogoapps.earlgrey.samples.EarlGrey;
PRODUCT_MODULE_NAME = EarlGreyExampleSwift;
Expand All @@ -642,10 +642,10 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = AD2V26JBWL;
DEVELOPMENT_TEAM = L2UF9MLSM6;
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
INFOPLIST_FILE = "$(SRCROOT)/EarlGreyExample/Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.gogoapps.earlgrey.samples.EarlGrey;
PRODUCT_MODULE_NAME = EarlGreyExampleSwift;
Expand Down Expand Up @@ -680,7 +680,7 @@
$CONFIGURATION_TEMP_DIR/EarlGreyExampleSwift.build/DerivedSources,
);
INFOPLIST_FILE = EarlGreyExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.gogoapps.earlgrey.samples.EarlGreyTests;
PRODUCT_MODULE_NAME = EarlGreyExampleTests;
Expand All @@ -704,7 +704,7 @@
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEFINES_MODULE = NO;
DEVELOPMENT_TEAM = AD2V26JBWL;
DEVELOPMENT_TEAM = L2UF9MLSM6;
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
FRAMEWORK_SEARCH_PATHS = "$(inherited)";
HEADER_SEARCH_PATHS = (
Expand All @@ -714,7 +714,7 @@
$CONFIGURATION_TEMP_DIR/EarlGreyExampleSwift.build/DerivedSources,
);
INFOPLIST_FILE = EarlGreyExample/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
PRODUCT_BUNDLE_IDENTIFIER = io.gogoapps.earlgrey.samples.EarlGreyTests;
PRODUCT_MODULE_NAME = EarlGreyExampleTests;
Expand Down
2 changes: 1 addition & 1 deletion test_projects/ios/EarlGreyExample/EarlGreyExampleSwiftTests/EarlGrey.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import EarlGrey
import Foundation

public func GREYAssert(_ expression: @autoclosure () -> Bool, reason: String) {
GREYAssert(expression, reason, details: "Expected expression to be true")
GREYAssert(expression(), reason, details: "Expected expression to be true")
}

public func GREYAssertTrue(_ expression: @autoclosure () -> Bool, reason: String) {
Expand Down
17 changes: 12 additions & 5 deletions test_projects/ios/EarlGreyExample/ops.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,20 +52,27 @@ function earl_grey_example() {

local productsDir="$dir/build/Build/Products"

cp -Rf "$productsDir"/*-iphoneos "$FLANK_FIXTURES_TMP/"
# xcodebuild generates .xctestrun files names in format: PROJECTNAME_platform_version_architecture.xctestrun, code below removes "_platform_version_architecture" part
mv -f "$productsDir/EarlGreyExampleSwiftTests"*.xctestrun "$productsDir/EarlGreyExampleSwiftTests.xctestrun"
mv -f "$productsDir/EarlGreyExampleTests"*.xctestrun "$productsDir/EarlGreyExampleTests.xctestrun"

cp "$productsDir"/*.xctestrun "$FLANK_FIXTURES_TMP/"
mkdir -p "$FLANK_FIXTURES_TMP/ios/earl_grey_example/objc/"
mkdir -p "$FLANK_FIXTURES_TMP/ios/earl_grey_example/swift/"

cp -Rf "$productsDir"/*-iphoneos "$FLANK_FIXTURES_TMP/ios/earl_grey_example/"

cp "$productsDir"/*.xctestrun "$FLANK_FIXTURES_TMP/ios/earl_grey_example/"

cp \
"$productsDir/Debug-iphoneos/EarlGreyExampleSwift.app/PlugIns/EarlGreyExampleTests.xctest/EarlGreyExampleTests" \
"$FLANK_FIXTURES_TMP/objc/"
"$FLANK_FIXTURES_TMP/ios/earl_grey_example/objc/"

cp \
"$productsDir/Debug-iphoneos/EarlGreyExampleSwift.app/PlugIns/EarlGreyExampleSwiftTests.xctest/EarlGreyExampleSwiftTests" \
"$FLANK_FIXTURES_TMP/swift/"
"$FLANK_FIXTURES_TMP/ios/earl_grey_example/swift/"
;;

esac done
}

echo "iOS test projects ops loaded"
echo "iOS EarlGreyExample test projects ops loaded"
Loading