From ff24862dd0e8988cf398194988834f0a569c8edf Mon Sep 17 00:00:00 2001 From: bootstraponline Date: Mon, 27 Aug 2018 20:59:50 -0400 Subject: [PATCH] WIP | Project structure (#266) Project structure --- .gitignore | 36 +---- README.md | 135 +----------------- cloud_testing/apis/start_mock_server.sh | 3 - cloud_testing/apis/testing/build.gradle | 15 -- cloud_testing/apis/testing/gradle | 1 - cloud_testing/apis/testing/gradle.properties | 1 - cloud_testing/apis/testing/gradlew | 1 - cloud_testing/apis/testing/gradlew.bat | 1 - cloud_testing/apis/testing/pom.xml | 84 ----------- cloud_testing/apis/testing/settings.gradle | 2 - cloud_testing/kotlin_poc/gradle | 1 - cloud_testing/kotlin_poc/gradle.properties | 1 - cloud_testing/kotlin_poc/gradlew | 1 - cloud_testing/kotlin_poc/gradlew.bat | 1 - cloud_testing/kotlin_poc/settings.gradle.kts | 4 - cloud_testing/mock_server_readme.md | 13 -- contributing.md | 12 -- {cloud_testing => docs}/client_generation.md | 0 {cloud_testing => docs}/mock_server.md | 0 {cloud_testing => docs}/readme.md | 0 .../kotlin_poc/readme.md => docs/readme2.md | 0 release_process.md => docs/release_process.md | 0 gradle/README.md => docs/update_gradle.md | 0 .../generate_java_client.sh | 0 .../json}/testing_v1.json | 0 .../json}/toolresults_v1beta3.json | 0 .../json}/update_api_json.sh | 0 firebase_apis/test_api/build.gradle.kts | 17 +++ .../google/api/services/testing/Testing.java | 0 .../api/services/testing/TestingRequest.java | 0 .../testing/TestingRequestInitializer.java | 0 .../api/services/testing/TestingScopes.java | 0 .../api/services/testing/model/Account.java | 0 .../services/testing/model/AndroidDevice.java | 0 .../testing/model/AndroidDeviceCatalog.java | 0 .../testing/model/AndroidDeviceList.java | 0 .../model/AndroidInstrumentationTest.java | 0 .../services/testing/model/AndroidMatrix.java | 0 .../services/testing/model/AndroidModel.java | 0 .../testing/model/AndroidRoboTest.java | 0 .../model/AndroidRuntimeConfiguration.java | 0 .../testing/model/AndroidTestLoop.java | 0 .../testing/model/AndroidVersion.java | 0 .../api/services/testing/model/Apk.java | 0 .../api/services/testing/model/ApkDetail.java | 0 .../services/testing/model/ApkManifest.java | 0 .../model/CancelTestMatrixResponse.java | 0 .../services/testing/model/ClientInfo.java | 0 .../testing/model/ClientInfoDetail.java | 0 .../api/services/testing/model/Date.java | 0 .../services/testing/model/DeviceFile.java | 0 .../services/testing/model/Distribution.java | 0 .../services/testing/model/Environment.java | 0 .../testing/model/EnvironmentMatrix.java | 0 .../testing/model/EnvironmentVariable.java | 0 .../services/testing/model/FileReference.java | 0 .../testing/model/GetApkDetailsResponse.java | 0 .../services/testing/model/GoogleAuto.java | 0 .../testing/model/GoogleCloudStorage.java | 0 .../services/testing/model/IntentFilter.java | 0 .../api/services/testing/model/IosDevice.java | 0 .../testing/model/IosDeviceCatalog.java | 0 .../services/testing/model/IosDeviceList.java | 0 .../api/services/testing/model/IosModel.java | 0 .../services/testing/model/IosTestSetup.java | 0 .../services/testing/model/IosVersion.java | 0 .../api/services/testing/model/IosXcTest.java | 0 .../testing/model/LauncherActivityIntent.java | 0 .../api/services/testing/model/Locale.java | 0 .../testing/model/NetworkConfiguration.java | 0 .../model/NetworkConfigurationCatalog.java | 0 .../api/services/testing/model/ObbFile.java | 0 .../services/testing/model/Orientation.java | 0 .../services/testing/model/RegularFile.java | 0 .../services/testing/model/ResultStorage.java | 0 .../services/testing/model/RoboDirective.java | 0 .../testing/model/RoboStartingIntent.java | 0 .../testing/model/StartActivityIntent.java | 0 .../services/testing/model/TestDetails.java | 0 .../testing/model/TestEnvironmentCatalog.java | 0 .../services/testing/model/TestExecution.java | 0 .../services/testing/model/TestMatrix.java | 0 .../api/services/testing/model/TestSetup.java | 0 .../testing/model/TestSpecification.java | 0 .../testing/model/ToolResultsExecution.java | 0 .../testing/model/ToolResultsHistory.java | 0 .../testing/model/ToolResultsStep.java | 0 .../services/testing/model/TrafficRule.java | 0 gradle/gradle/spotless.gradle | 7 - jitpack.yml | 6 +- .../.gitignore | 0 .../README.md | 0 .../inline.js | 0 .../kotlin_integration.md | 0 .../package.json | 0 .../package-deps.json | 0 .../package.json | 0 .../office-ui-fabric-react-tslint/tslint.json | 0 .../public/favicon.ico | Bin .../public/index.html | 0 .../public/manifest.json | 0 .../src/App.css | 0 .../src/App.test.tsx | 0 .../src/App.tsx | 0 .../src/data.tsx | 0 .../src/index.css | 0 .../src/index.tsx | 0 .../src/logo.svg | 0 .../src/registerServiceWorker.ts | 0 .../tsconfig.json | 0 .../tsconfig.test.json | 0 .../tslint.json | 0 .../update_report.sh | 0 .../yarn.lock | 0 release_notes.md | 16 --- test_app/app/build.gradle | 57 -------- test_app/app/build.gradle.kts | 44 ++++++ test_app/app/proguard-rules.pro | 25 ---- test_app/{build.gradle => build.gradle.kts} | 9 +- test_app/gradle | 1 - test_app/gradle.properties | 2 +- test_app/gradlew | 1 - test_app/gradlew.bat | 1 - test_app/settings.gradle | 1 - test_app/settings.gradle.kts | 1 + .../kotlin_poc => test_runner}/.gitignore | 3 +- .../kotlin_poc => test_runner}/bash/flank | 0 .../bash/update_flank.sh | 0 .../build.gradle.kts | 41 ++---- .../buildSrc/src/main/java/Deps.java | 0 .../build_earlgrey_example.sh | 0 .../kotlin_poc => test_runner}/flank.ios.yml | 0 .../kotlin_poc => test_runner}/flank.yml | 0 {gradle => test_runner}/gradle.properties | 0 .../gradle/wrapper/gradle-wrapper.jar | Bin .../gradle/wrapper/gradle-wrapper.properties | 0 {gradle => test_runner}/gradlew | 0 {gradle => test_runner}/gradlew.bat | 0 test_runner/settings.gradle.kts | 2 + .../src/main/kotlin/ftl/Main.kt | 0 .../main/kotlin/ftl/android/AndroidCatalog.kt | 0 .../src/main/kotlin/ftl/args/AndroidArgs.kt | 0 .../src/main/kotlin/ftl/args/ArgsHelper.kt | 0 .../src/main/kotlin/ftl/args/IArgs.kt | 0 .../main/kotlin/ftl/args/IArgsCompanion.kt | 0 .../src/main/kotlin/ftl/args/IosArgs.kt | 0 .../kotlin/ftl/args/yml/AndroidGcloudYml.kt | 0 .../src/main/kotlin/ftl/args/yml/FlankYml.kt | 0 .../src/main/kotlin/ftl/args/yml/GcloudYml.kt | 0 .../src/main/kotlin/ftl/args/yml/IYmlKeys.kt | 0 .../src/main/kotlin/ftl/args/yml/IYmlMap.kt | 0 .../main/kotlin/ftl/args/yml/IosFlankYml.kt | 0 .../main/kotlin/ftl/args/yml/IosGcloudYml.kt | 0 .../main/kotlin/ftl/cli/FirebaseCommand.kt | 0 .../kotlin/ftl/cli/firebase/TestCommand.kt | 0 .../ftl/cli/firebase/test/AndroidCommand.kt | 0 .../ftl/cli/firebase/test/IosCommand.kt | 0 .../test/android/AndroidDoctorCommand.kt | 0 .../test/android/AndroidRefreshCommand.kt | 0 .../test/android/AndroidRunCommand.kt | 0 .../cli/firebase/test/ios/IosDoctorCommand.kt | 0 .../firebase/test/ios/IosRefreshCommand.kt | 0 .../cli/firebase/test/ios/IosRunCommand.kt | 0 .../src/main/kotlin/ftl/config/Device.kt | 0 .../main/kotlin/ftl/config/FtlConstants.kt | 0 .../src/main/kotlin/ftl/doctor/Doctor.kt | 0 .../src/main/kotlin/ftl/gc/GcAndroidMatrix.kt | 0 .../main/kotlin/ftl/gc/GcAndroidTestMatrix.kt | 0 .../src/main/kotlin/ftl/gc/GcIosMatrix.kt | 0 .../src/main/kotlin/ftl/gc/GcIosTestMatrix.kt | 0 .../src/main/kotlin/ftl/gc/GcStorage.kt | 3 +- .../src/main/kotlin/ftl/gc/GcTestMatrix.kt | 0 .../src/main/kotlin/ftl/gc/GcTesting.kt | 0 .../src/main/kotlin/ftl/gc/GcToolResults.kt | 0 .../src/main/kotlin/ftl/ios/IosCatalog.kt | 0 .../src/main/kotlin/ftl/ios/Parse.kt | 0 .../src/main/kotlin/ftl/ios/Xctestrun.kt | 0 .../src/main/kotlin/ftl/json/MatrixMap.kt | 0 .../src/main/kotlin/ftl/json/SavedMatrix.kt | 0 .../src/main/kotlin/ftl/reports/CostReport.kt | 0 .../kotlin/ftl/reports/HtmlErrorReport.kt | 0 .../kotlin/ftl/reports/MatrixErrorReport.kt | 0 .../kotlin/ftl/reports/MatrixResultsReport.kt | 0 .../ftl/reports/TestErrorCountReport.kt | 0 .../main/kotlin/ftl/reports/util/IReport.kt | 0 .../kotlin/ftl/reports/util/ReportManager.kt | 0 .../main/kotlin/ftl/reports/util/TestData.kt | 0 .../main/kotlin/ftl/run/AndroidTestRunner.kt | 0 .../main/kotlin/ftl/run/GenericTestRunner.kt | 0 .../src/main/kotlin/ftl/run/IosTestRunner.kt | 0 .../src/main/kotlin/ftl/run/TestRunner.kt | 0 .../src/main/kotlin/ftl/util/ArtifactRegex.kt | 0 .../src/main/kotlin/ftl/util/Bash.kt | 0 .../src/main/kotlin/ftl/util/Billing.kt | 0 .../src/main/kotlin/ftl/util/MatrixState.kt | 0 .../src/main/kotlin/ftl/util/MatrixUtil.kt | 0 .../src/main/kotlin/ftl/util/Outcome.kt | 0 .../main/kotlin/ftl/util/ProcessExtension.kt | 0 .../src/main/kotlin/ftl/util/StopWatch.kt | 0 .../src/main/kotlin/ftl/util/StreamReader.kt | 0 .../kotlin/ftl/util/TestMatrixExtension.kt | 0 .../src/main/kotlin/ftl/util/Utils.kt | 0 .../src/main/resources/inline.html | 0 .../src/test/kotlin/ftl/MainTest.kt | 0 .../kotlin/ftl/android/AndroidCatalogTest.kt | 0 .../kotlin/ftl/args/AndroidArgsFileTest.kt | 4 +- .../test/kotlin/ftl/args/AndroidArgsTest.kt | 8 +- .../test/kotlin/ftl/args/IosArgsFileTest.kt | 0 .../src/test/kotlin/ftl/args/IosArgsTest.kt | 0 .../src/test/kotlin/ftl/doctor/DoctorTest.kt | 0 .../test/kotlin/ftl/fixtures/flank.gcs.yml | 0 .../test/kotlin/ftl/fixtures/flank.ios.yml | 0 .../test/kotlin/ftl/fixtures/flank.local.yml | 4 +- .../test/kotlin/ftl/fixtures/flank2.ios.yml | 0 .../src/test/kotlin/ftl/ios/IosCatalogTest.kt | 0 .../src/test/kotlin/ftl/ios/ParseTest.kt | 0 .../src/test/kotlin/ftl/ios/XctestrunTest.kt | 0 .../kotlin/ftl/test/util/FlankTestRunner.kt | 0 .../src/test/kotlin/ftl/test/util/LocalGcs.kt | 4 +- .../test/kotlin/ftl/test/util/MockServer.kt | 0 .../test/kotlin/ftl/test/util/TestArtifact.kt | 0 .../test/kotlin/ftl/test/util/TestHelper.kt | 0 .../src/test/kotlin/ftl/util/BashTest.kt | 0 .../src/test/kotlin/ftl/util/BillingTest.kt | 0 224 files changed, 105 insertions(+), 464 deletions(-) delete mode 100755 cloud_testing/apis/start_mock_server.sh delete mode 100644 cloud_testing/apis/testing/build.gradle delete mode 120000 cloud_testing/apis/testing/gradle delete mode 120000 cloud_testing/apis/testing/gradle.properties delete mode 120000 cloud_testing/apis/testing/gradlew delete mode 120000 cloud_testing/apis/testing/gradlew.bat delete mode 100644 cloud_testing/apis/testing/pom.xml delete mode 100644 cloud_testing/apis/testing/settings.gradle delete mode 120000 cloud_testing/kotlin_poc/gradle delete mode 120000 cloud_testing/kotlin_poc/gradle.properties delete mode 120000 cloud_testing/kotlin_poc/gradlew delete mode 120000 cloud_testing/kotlin_poc/gradlew.bat delete mode 100644 cloud_testing/kotlin_poc/settings.gradle.kts delete mode 100644 cloud_testing/mock_server_readme.md rename {cloud_testing => docs}/client_generation.md (100%) rename {cloud_testing => docs}/mock_server.md (100%) rename {cloud_testing => docs}/readme.md (100%) rename cloud_testing/kotlin_poc/readme.md => docs/readme2.md (100%) rename release_process.md => docs/release_process.md (100%) rename gradle/README.md => docs/update_gradle.md (100%) rename cloud_testing/generate.sh => firebase_apis/generate_java_client.sh (100%) rename {cloud_testing/apis => firebase_apis/json}/testing_v1.json (100%) rename {cloud_testing/apis => firebase_apis/json}/toolresults_v1beta3.json (100%) rename {cloud_testing/apis => firebase_apis/json}/update_api_json.sh (100%) create mode 100644 firebase_apis/test_api/build.gradle.kts rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/Testing.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/TestingRequest.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/TestingRequestInitializer.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/TestingScopes.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/Account.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidDevice.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidDeviceCatalog.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidDeviceList.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidInstrumentationTest.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidMatrix.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidModel.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidRoboTest.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidRuntimeConfiguration.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidTestLoop.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/AndroidVersion.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/Apk.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ApkDetail.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ApkManifest.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/CancelTestMatrixResponse.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ClientInfo.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ClientInfoDetail.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/Date.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/DeviceFile.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/Distribution.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/Environment.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/EnvironmentMatrix.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/EnvironmentVariable.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/FileReference.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/GetApkDetailsResponse.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/GoogleAuto.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/GoogleCloudStorage.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IntentFilter.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IosDevice.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IosDeviceCatalog.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IosDeviceList.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IosModel.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IosTestSetup.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IosVersion.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/IosXcTest.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/LauncherActivityIntent.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/Locale.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/NetworkConfiguration.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/NetworkConfigurationCatalog.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ObbFile.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/Orientation.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/RegularFile.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ResultStorage.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/RoboDirective.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/RoboStartingIntent.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/StartActivityIntent.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/TestDetails.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/TestEnvironmentCatalog.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/TestExecution.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/TestMatrix.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/TestSetup.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/TestSpecification.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ToolResultsExecution.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ToolResultsHistory.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/ToolResultsStep.java (100%) rename {cloud_testing/apis/testing => firebase_apis/test_api}/src/main/java/com/google/api/services/testing/model/TrafficRule.java (100%) delete mode 100644 gradle/gradle/spotless.gradle rename {cloud_testing/junit_html_report => junit_html_report}/.gitignore (100%) rename {cloud_testing/junit_html_report => junit_html_report}/README.md (100%) rename {cloud_testing/junit_html_report => junit_html_report}/inline.js (100%) rename {cloud_testing/junit_html_report => junit_html_report}/kotlin_integration.md (100%) rename {cloud_testing/junit_html_report => junit_html_report}/package.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/packages/office-ui-fabric-react-tslint/package-deps.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/packages/office-ui-fabric-react-tslint/package.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/packages/office-ui-fabric-react-tslint/tslint.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/public/favicon.ico (100%) rename {cloud_testing/junit_html_report => junit_html_report}/public/index.html (100%) rename {cloud_testing/junit_html_report => junit_html_report}/public/manifest.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/App.css (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/App.test.tsx (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/App.tsx (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/data.tsx (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/index.css (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/index.tsx (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/logo.svg (100%) rename {cloud_testing/junit_html_report => junit_html_report}/src/registerServiceWorker.ts (100%) rename {cloud_testing/junit_html_report => junit_html_report}/tsconfig.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/tsconfig.test.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/tslint.json (100%) rename {cloud_testing/junit_html_report => junit_html_report}/update_report.sh (100%) rename {cloud_testing/junit_html_report => junit_html_report}/yarn.lock (100%) delete mode 100644 release_notes.md delete mode 100644 test_app/app/build.gradle create mode 100644 test_app/app/build.gradle.kts delete mode 100644 test_app/app/proguard-rules.pro rename test_app/{build.gradle => build.gradle.kts} (57%) delete mode 120000 test_app/gradle mode change 120000 => 100644 test_app/gradle.properties delete mode 120000 test_app/gradlew delete mode 120000 test_app/gradlew.bat delete mode 100644 test_app/settings.gradle create mode 100644 test_app/settings.gradle.kts rename {cloud_testing/kotlin_poc => test_runner}/.gitignore (73%) rename {cloud_testing/kotlin_poc => test_runner}/bash/flank (100%) rename {cloud_testing/kotlin_poc => test_runner}/bash/update_flank.sh (100%) rename {cloud_testing/kotlin_poc => test_runner}/build.gradle.kts (86%) rename {cloud_testing/kotlin_poc => test_runner}/buildSrc/src/main/java/Deps.java (100%) rename {cloud_testing/kotlin_poc => test_runner}/build_earlgrey_example.sh (100%) rename {cloud_testing/kotlin_poc => test_runner}/flank.ios.yml (100%) rename {cloud_testing/kotlin_poc => test_runner}/flank.yml (100%) rename {gradle => test_runner}/gradle.properties (100%) rename {gradle => test_runner}/gradle/wrapper/gradle-wrapper.jar (100%) rename {gradle => test_runner}/gradle/wrapper/gradle-wrapper.properties (100%) rename {gradle => test_runner}/gradlew (100%) rename {gradle => test_runner}/gradlew.bat (100%) create mode 100644 test_runner/settings.gradle.kts rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/Main.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/android/AndroidCatalog.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/AndroidArgs.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/ArgsHelper.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/IArgs.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/IArgsCompanion.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/IosArgs.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/yml/AndroidGcloudYml.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/yml/FlankYml.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/yml/GcloudYml.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/yml/IYmlKeys.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/yml/IYmlMap.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/yml/IosFlankYml.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/args/yml/IosGcloudYml.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/FirebaseCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/TestCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRefreshCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/ios/IosRefreshCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/config/Device.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/config/FtlConstants.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/doctor/Doctor.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcAndroidMatrix.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcIosMatrix.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcStorage.kt (97%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcTestMatrix.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcTesting.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/gc/GcToolResults.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/ios/IosCatalog.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/ios/Parse.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/ios/Xctestrun.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/json/MatrixMap.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/json/SavedMatrix.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/CostReport.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/HtmlErrorReport.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/MatrixErrorReport.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/MatrixResultsReport.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/TestErrorCountReport.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/util/IReport.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/util/ReportManager.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/reports/util/TestData.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/run/AndroidTestRunner.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/run/GenericTestRunner.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/run/IosTestRunner.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/run/TestRunner.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/ArtifactRegex.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/Bash.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/Billing.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/MatrixState.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/MatrixUtil.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/Outcome.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/ProcessExtension.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/StopWatch.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/StreamReader.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/TestMatrixExtension.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/kotlin/ftl/util/Utils.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/main/resources/inline.html (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/MainTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/android/AndroidCatalogTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt (96%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/args/AndroidArgsTest.kt (94%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/args/IosArgsFileTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/args/IosArgsTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/doctor/DoctorTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/fixtures/flank.gcs.yml (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/fixtures/flank.ios.yml (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/fixtures/flank.local.yml (85%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/fixtures/flank2.ios.yml (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/ios/IosCatalogTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/ios/ParseTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/ios/XctestrunTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/test/util/FlankTestRunner.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/test/util/LocalGcs.kt (89%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/test/util/MockServer.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/test/util/TestArtifact.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/test/util/TestHelper.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/util/BashTest.kt (100%) rename {cloud_testing/kotlin_poc => test_runner}/src/test/kotlin/ftl/util/BillingTest.kt (100%) diff --git a/.gitignore b/.gitignore index 6aab610ae2..35f89281e4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,38 +1,6 @@ -# Created by https://www.gitignore.io - -Flank/*.tests -Flank/results/ - -### Intellij ### -# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm - *.iml - -# User-specific stuff: - .idea/workspace.xml - .idea/tasks.xml - .idea/dictionaries -**/.idea/** -!**/.idea/codeStyles/* +.idea/ build/ out/ - - Sensitive or high-churn files: - .idea/dataSources.ids - .idea/dataSources.xml - .idea/sqlDataSources.xml - .idea/dynamic.xml - .idea/uiDesigner.xml - -# Gradle: - .idea/gradle.xml - .idea/libraries - gradle/ -**/.gradle/** -shifu-java-client/.gradle - -## File-based project format: -*.ipr -*.iws - .DS_Store +.gradle/ diff --git a/README.md b/README.md index 7ffa00cafe..3bf42f6451 100644 --- a/README.md +++ b/README.md @@ -1,132 +1,9 @@ -# Flank [![Build Status](https://travis-ci.org/TestArmada/flank.svg?branch=master)](https://travis-ci.org/TestArmada/flank) [![](https://jitpack.io/v/TestArmada/flank.svg)](https://jitpack.io/#TestArmada/flank) +# Flank [![Build Status](https://app.bitrise.io/app/9767f3e19047d4db/status.svg?token=uDM3wCumR2xTd0axh4bjDQ&branch=master)](https://app.bitrise.io/app/9767f3e19047d4db) [![](https://jitpack.io/v/TestArmada/flank.svg)](https://jitpack.io/#TestArmada/flank) -Flank is a [Firebase Test Lab](https://firebase.google.com/docs/test-lab/?gclid=CjwKEAiA0fnFBRC6g8rgmICvrw0SJADx1_zAFTUPL4ffVSc5srwKT_Up4vJb15Ik4iIxIK4bQ5J-vxoCIS3w_wcB) tool for massively-scaling your automated Android tests. Run large test suites across many devices/versions/configurations at the same time, in parallel. Flank can easily be used in a CI environment where Gradle (or similar) first builds the APK:s and then Flank is used to execute the tests. +Flank is a massively parallel Android and iOS test runner for [Firebase Test Lab](https://firebase.google.com/docs/test-lab/). -To use Flank, please sign up for Firebase Test Lab and install the Google Cloud SDK. +### Contributing -### Setup - -* Install the [Java SDK](http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html) - -* Signup for [Firebase Test Lab](https://firebase.google.com/) - -* Install the [Google Cloud SDK](https://cloud.google.com/sdk/docs/) (>= 176.0.0) - -### Download - -Flank releases may be downloaded [directly from JitPack](https://jitpack.io/com/github/TestArmada/flank/) or via [a dependency manager.](https://jitpack.io/#TestArmada/flank) - - -### Run Tests - -To runs tests with Flank you will need the app and test apk's. You can specify in which class/package/annotation/testFile you would like tests to run by using ```-f```. If ```-f``` is not provided all the tests will be executed. Usage: - -``` -java -jar Flank.jar -a app-apk -t test-apk -f "class/package/annotation/testFile name" - -"class foo.FooTest, bar.BarTest" executes only the tests in the given class(es) -"class foo.FooTest#testFoo, bar.BarTest#testBar" executes only the given test(s) -"package foo, bar" executes only the tests in the given package(s) -"annotation foo.MyAnnotation, bar.MyAnnotation" executes only the tests annotated with the given annotation(s) -"testFile path/to/file" executes only the tests listed in the given file. The file should contain a list of line separated package names or test classes and optionally methods - -To invert the operator add the 'not' prefix. For example, 'notPackage' executes all the tests except the ones in the given package. -``` - -When the executions are completed Flanks will fetch the xml result files, add device name to the tests and store the files in a folder named: ```results```. - -### Configure Flank - -It's possible to configure Flank by including a Java properties file in the root folder: ```config.properties``` - -Following properties can be configured: - -``` -devices: Device Id, OSVersion, orientation, locale; Default values are `Nexus6P`, `25`, `portrait` and `en` -environment-variables: To set environment variables. Can also be used to enable code coverage -directories-to-pull: If directories from the device should be pulled -use-orchestrator: To enable Android Test Orchestrator -shard-timeout: Timeout in minutes for each shard. 5 minutes by default. -shard-duration: Duration in seconds for each shard - -numShards: Number of shards to split the tests across. Unused by default. -shardIndex: If a specific shard should be executed -debug-prints: If debug prints should be enabled. False by default. -fetch-xml-files: If the result xml files should be fetched. True by default. -fetch-bucket: If the bucket containing logs and artifacts should be fetched. False by default. -gcloud-path: The path to the glcoud binary. This shouldn't need to be set if `gcloud` is found on the path. -gsutil-path: The path to the gsutil binary. This shouldn't need to be set if `gcloud` is found on the path. -gcloud-bucket: The Google Cloud Storage bucket to use. If not specified Flank will create one. -use-gcloud-beta: If gcloud beta should be used. False by default. -auto-google-login: Automatically log into the test device using a preconfigured Google account before beginning the test. True by default. -record-video: If the video of the instrumentation test should be recorded. True by default. -record-performance-metrics: If the performance metrics should be recorded. True by default. - -aggregate-reports.enabled: Enable the experimental test aggregation feature. Requires fetch-bucket to be enabled. False by default. -aggregate-reports.xml: Generates and pushes to Google Cloud Storage an aggregated XML report. True by default. -aggregate-reports.html: Generates and pushes to Google Cloud Storage an aggregated HTML report, including Logcat and video for the failing tests. True by default. -aggregate-reports.split-video: For failing test cases, attempts to split the execution video to capture only the failing test and includes a link in the HTML report. Requires ffmpeg to be installed. False by default. - -deviceIds: The ID:s of the devices to run the tests on (deprecated, should not be used in conjunction with `device`) -os-version-ids: The API-levels of the devices to run the tests on (deprecated, should not be used in conjunction with `device`) -orientations: The orientations, portrait, landscape or both (deprecated, should not be used in conjunction with `device`) -locales: The device locales (deprecated, should not be used in conjunction with `device`) -``` - -Example of a properties file: - -``` -environment-variables=coverage=true,coverageFile=/sdcard/tempDir/coverage.ec -directories-to-pull=/sdcard -shard-timeout=5 -shard-duration=120 -devices=model:Nexus5X;version:23;orientation:portrait;locale:en,\ - model:Nexus6P;version:24,\ - model:NexusLowRes;version:26 - -numShards= -shardIndex= -debug-prints=false -fetch-xml-files=true -auto-google-login=true -fetch-bucket=false -gcloud-path= -gsutil-path= -``` - -### Configurable Shards - -Flank supports configurable shard durations. Instead of creating one shard per test case Flank can create shards that contain tests that add up to a given duration. This feature was introduced to make Flank faster while also saving cost (seconds are round up to minutes by Firebase test lab). By default Flank will try to create shards with tests adding up to 2 minutes in execution time. - -First time a new app is tested each test is run in its own shard so that Flank can save the individual execution times. This is also the case for new tests that are introduced. The execution times for tests are saved in a file: ```flank.tests```. This file is used by Flank to create shards and is backed up in your google cloud bucket. Open the file in an editor to edit the execution times. Create an empty ```flank.tests``` in the root Flank folder to start from a clean slate. - -```shard-duration``` can be set in ```config.properties```. Default shard duration is 120 seconds. To enable one test per shard set ```shard-duration``` to -1 or specify a custom number of shards with ```numShards```. - -### Troubleshooting - -Please enable debug mode ```debug-prints:true``` in the properties file if it's not working correctly. - -If Flank hangs and nothing seems to be happening (even when debug mode is enabled) make sure the correct user (registered with Firebase) is logged into Firebase. Please also see [Google Cloud Storage Authentication](https://cloud.google.com/storage/docs/authentication). - -If you see `AccessDeniedException: 403` verify that: -- The GCloud SDK is on the latest version -- The Firebase project is on a paid subscription (for free accounts specify the default bucket with property: `gcloud-bucket`) -- The Firebase account and project ID are in sync - -Follow below steps to set it: - -``` -gcloud components update - Update the GCloud SDK - -gcloud config list - To view gcloud SDK properties. - -gcloud auth login - To set gcloud to the correct google account. - -gcloud config set project - To set gcloud to the correct project ID. - -``` - -If you are using the terminal in OS X and Flank gets stuck at around 250 shards its because of a setting in OS X. To fix it [please follow these instructions](https://blog.dekstroza.io/ulimit-shenanigans-on-osx-el-capitan/). - -## License -Documentation in this project is licensed under Creative Commons Attribution 4.0 International License. Full details available at https://creativecommons.org/licenses/by/4.0 +- Use [JetBrains Toolbox](https://www.jetbrains.com/toolbox/app/) to install `IntelliJ IDEA Community` +- Clone the repo `git clone https://github.com/TestArmada/flank.git` +- Open `test_runner/build.gradle.kts` with `IntelliJ IDEA Community` diff --git a/cloud_testing/apis/start_mock_server.sh b/cloud_testing/apis/start_mock_server.sh deleted file mode 100755 index 8bf885fe0d..0000000000 --- a/cloud_testing/apis/start_mock_server.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/env bash - -prism run --mock --list --spec testing_v1_swagger_2.json diff --git a/cloud_testing/apis/testing/build.gradle b/cloud_testing/apis/testing/build.gradle deleted file mode 100644 index 90a0af3ee6..0000000000 --- a/cloud_testing/apis/testing/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -group 'ftl' -version '1.0-SNAPSHOT' - -apply plugin: 'java' - -sourceCompatibility = 1.8 - -repositories { - mavenCentral() -} - -dependencies { - // https://mvnrepository.com/artifact/com.google.api-client/google-api-client - compile 'com.google.api-client:google-api-client:1.23.0' -} diff --git a/cloud_testing/apis/testing/gradle b/cloud_testing/apis/testing/gradle deleted file mode 120000 index c53a687ce2..0000000000 --- a/cloud_testing/apis/testing/gradle +++ /dev/null @@ -1 +0,0 @@ -../../../gradle/gradle \ No newline at end of file diff --git a/cloud_testing/apis/testing/gradle.properties b/cloud_testing/apis/testing/gradle.properties deleted file mode 120000 index 72fb45c6ee..0000000000 --- a/cloud_testing/apis/testing/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -../../../gradle/gradle.properties \ No newline at end of file diff --git a/cloud_testing/apis/testing/gradlew b/cloud_testing/apis/testing/gradlew deleted file mode 120000 index fbb1d34b74..0000000000 --- a/cloud_testing/apis/testing/gradlew +++ /dev/null @@ -1 +0,0 @@ -../../../gradle/gradlew \ No newline at end of file diff --git a/cloud_testing/apis/testing/gradlew.bat b/cloud_testing/apis/testing/gradlew.bat deleted file mode 120000 index aab8a476b6..0000000000 --- a/cloud_testing/apis/testing/gradlew.bat +++ /dev/null @@ -1 +0,0 @@ -../../../gradle/gradlew.bat \ No newline at end of file diff --git a/cloud_testing/apis/testing/pom.xml b/cloud_testing/apis/testing/pom.xml deleted file mode 100644 index 4bb68e4c71..0000000000 --- a/cloud_testing/apis/testing/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - 4.0.0 - - org.sonatype.oss - oss-parent - 7 - - - com.google.apis - google-api-services-testing - v1-rev0-1.22.0-SNAPSHOT - Cloud Testing API v1-rev0-1.22.0-SNAPSHOT - jar - - 2011 - - - Google - http://www.google.com/ - - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - - - maven-compiler-plugin - 2.3.2 - - 1.5 - 1.5 - - - - maven-jar-plugin - 2.3.1 - - - - Google - 1.6.x - - - - - - maven-javadoc-plugin - 2.7 - - Cloud Testing API ${project.version} - Cloud Testing API ${project.version} - - http://docs.oracle.com/javase/7/docs/api - - http://javadoc.google-http-java-client.googlecode.com/hg/1.22.0-SNAPSHOT - - http://javadoc.google-oauth-java-client.googlecode.com/hg/1.22.0-SNAPSHOT - - http://javadoc.google-api-java-client.googlecode.com/hg/1.22.0-SNAPSHOT - - - - - . - - - - - com.google.api-client - google-api-client - 1.22.0-SNAPSHOT - - - - - UTF-8 - - \ No newline at end of file diff --git a/cloud_testing/apis/testing/settings.gradle b/cloud_testing/apis/testing/settings.gradle deleted file mode 100644 index 667320972d..0000000000 --- a/cloud_testing/apis/testing/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'testing' - diff --git a/cloud_testing/kotlin_poc/gradle b/cloud_testing/kotlin_poc/gradle deleted file mode 120000 index 73b0cb5ca6..0000000000 --- a/cloud_testing/kotlin_poc/gradle +++ /dev/null @@ -1 +0,0 @@ -../../gradle/gradle \ No newline at end of file diff --git a/cloud_testing/kotlin_poc/gradle.properties b/cloud_testing/kotlin_poc/gradle.properties deleted file mode 120000 index f70a75d6f5..0000000000 --- a/cloud_testing/kotlin_poc/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -../../gradle/gradle.properties \ No newline at end of file diff --git a/cloud_testing/kotlin_poc/gradlew b/cloud_testing/kotlin_poc/gradlew deleted file mode 120000 index 8b699fc783..0000000000 --- a/cloud_testing/kotlin_poc/gradlew +++ /dev/null @@ -1 +0,0 @@ -../../gradle/gradlew \ No newline at end of file diff --git a/cloud_testing/kotlin_poc/gradlew.bat b/cloud_testing/kotlin_poc/gradlew.bat deleted file mode 120000 index c15f9d1c72..0000000000 --- a/cloud_testing/kotlin_poc/gradlew.bat +++ /dev/null @@ -1 +0,0 @@ -../../gradle/gradlew.bat \ No newline at end of file diff --git a/cloud_testing/kotlin_poc/settings.gradle.kts b/cloud_testing/kotlin_poc/settings.gradle.kts deleted file mode 100644 index c1d7b964b8..0000000000 --- a/cloud_testing/kotlin_poc/settings.gradle.kts +++ /dev/null @@ -1,4 +0,0 @@ -rootProject.name = "kotlin_poc" - -include(":testing") -project(":testing").projectDir = File(rootProject.projectDir, "../apis/testing") diff --git a/cloud_testing/mock_server_readme.md b/cloud_testing/mock_server_readme.md deleted file mode 100644 index 597e768f2b..0000000000 --- a/cloud_testing/mock_server_readme.md +++ /dev/null @@ -1,13 +0,0 @@ -# WIP mock server for kotlin_poc - -check if server is online: - -```bash -nc -w 5 -z localhost 8080 -``` - -remove process on port 8080 - -```bash -kill -9 $(lsof -n -i4TCP:8080 | awk '{print $2}' | sed -n 2p) -``` diff --git a/contributing.md b/contributing.md index fd5abd8344..af56eeab96 100644 --- a/contributing.md +++ b/contributing.md @@ -1,15 +1,3 @@ ## CLA A CLA is required to contribute to flank. See [walmart labs](https://github.com/walmartlabs/walmart-cla#walmart-contributor-license-agreement-cla) for more information. Google's open source policy [explains why CLAs are commonly used](https://opensource.google.com/docs/cla/policy/) - -## Gradle - -When creating a new project, setup symlinks to gradle. This allows all projects to -use the same Gradle config. - -```bash -ln -sf ../gradle/gradle -ln -sf ../gradle/gradle.properties -ln -sf ../gradle/gradlew -ln -sf ../gradle/gradlew.bat -``` diff --git a/cloud_testing/client_generation.md b/docs/client_generation.md similarity index 100% rename from cloud_testing/client_generation.md rename to docs/client_generation.md diff --git a/cloud_testing/mock_server.md b/docs/mock_server.md similarity index 100% rename from cloud_testing/mock_server.md rename to docs/mock_server.md diff --git a/cloud_testing/readme.md b/docs/readme.md similarity index 100% rename from cloud_testing/readme.md rename to docs/readme.md diff --git a/cloud_testing/kotlin_poc/readme.md b/docs/readme2.md similarity index 100% rename from cloud_testing/kotlin_poc/readme.md rename to docs/readme2.md diff --git a/release_process.md b/docs/release_process.md similarity index 100% rename from release_process.md rename to docs/release_process.md diff --git a/gradle/README.md b/docs/update_gradle.md similarity index 100% rename from gradle/README.md rename to docs/update_gradle.md diff --git a/cloud_testing/generate.sh b/firebase_apis/generate_java_client.sh similarity index 100% rename from cloud_testing/generate.sh rename to firebase_apis/generate_java_client.sh diff --git a/cloud_testing/apis/testing_v1.json b/firebase_apis/json/testing_v1.json similarity index 100% rename from cloud_testing/apis/testing_v1.json rename to firebase_apis/json/testing_v1.json diff --git a/cloud_testing/apis/toolresults_v1beta3.json b/firebase_apis/json/toolresults_v1beta3.json similarity index 100% rename from cloud_testing/apis/toolresults_v1beta3.json rename to firebase_apis/json/toolresults_v1beta3.json diff --git a/cloud_testing/apis/update_api_json.sh b/firebase_apis/json/update_api_json.sh similarity index 100% rename from cloud_testing/apis/update_api_json.sh rename to firebase_apis/json/update_api_json.sh diff --git a/firebase_apis/test_api/build.gradle.kts b/firebase_apis/test_api/build.gradle.kts new file mode 100644 index 0000000000..97fba7e609 --- /dev/null +++ b/firebase_apis/test_api/build.gradle.kts @@ -0,0 +1,17 @@ +plugins { + `java-library` +} + +java { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 +} + +repositories { + mavenCentral() +} + +dependencies { + // https://mvnrepository.com/artifact/com.google.api-client/google-api-client + compile("com.google.api-client:google-api-client:1.23.0") +} diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/Testing.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/Testing.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/Testing.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/Testing.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/TestingRequest.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingRequest.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/TestingRequest.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingRequest.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/TestingRequestInitializer.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingRequestInitializer.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/TestingRequestInitializer.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingRequestInitializer.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/TestingScopes.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingScopes.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/TestingScopes.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/TestingScopes.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Account.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Account.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Account.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Account.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidDevice.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidDevice.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidDevice.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidDevice.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidDeviceCatalog.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidDeviceCatalog.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidDeviceCatalog.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidDeviceCatalog.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidDeviceList.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidDeviceList.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidDeviceList.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidDeviceList.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidInstrumentationTest.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidInstrumentationTest.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidInstrumentationTest.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidInstrumentationTest.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidMatrix.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidMatrix.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidMatrix.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidMatrix.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidModel.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidModel.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidModel.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidModel.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidRoboTest.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidRoboTest.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidRoboTest.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidRoboTest.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidRuntimeConfiguration.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidRuntimeConfiguration.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidRuntimeConfiguration.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidRuntimeConfiguration.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidTestLoop.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidTestLoop.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidTestLoop.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidTestLoop.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidVersion.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidVersion.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/AndroidVersion.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/AndroidVersion.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Apk.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Apk.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Apk.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Apk.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ApkDetail.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ApkDetail.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ApkDetail.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ApkDetail.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ApkManifest.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ApkManifest.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ApkManifest.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ApkManifest.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/CancelTestMatrixResponse.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/CancelTestMatrixResponse.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/CancelTestMatrixResponse.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/CancelTestMatrixResponse.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ClientInfo.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ClientInfo.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ClientInfo.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ClientInfo.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ClientInfoDetail.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ClientInfoDetail.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ClientInfoDetail.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ClientInfoDetail.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Date.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Date.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Date.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Date.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/DeviceFile.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/DeviceFile.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/DeviceFile.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/DeviceFile.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Distribution.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Distribution.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Distribution.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Distribution.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Environment.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Environment.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Environment.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Environment.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/EnvironmentMatrix.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/EnvironmentMatrix.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/EnvironmentMatrix.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/EnvironmentMatrix.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/EnvironmentVariable.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/EnvironmentVariable.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/EnvironmentVariable.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/EnvironmentVariable.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/FileReference.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/FileReference.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/FileReference.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/FileReference.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/GetApkDetailsResponse.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/GetApkDetailsResponse.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/GetApkDetailsResponse.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/GetApkDetailsResponse.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/GoogleAuto.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/GoogleAuto.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/GoogleAuto.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/GoogleAuto.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/GoogleCloudStorage.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/GoogleCloudStorage.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/GoogleCloudStorage.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/GoogleCloudStorage.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IntentFilter.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IntentFilter.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IntentFilter.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IntentFilter.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosDevice.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosDevice.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosDevice.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosDevice.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosDeviceCatalog.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosDeviceCatalog.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosDeviceCatalog.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosDeviceCatalog.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosDeviceList.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosDeviceList.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosDeviceList.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosDeviceList.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosModel.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosModel.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosModel.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosModel.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosTestSetup.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosTestSetup.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosTestSetup.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosTestSetup.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosVersion.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosVersion.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosVersion.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosVersion.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosXcTest.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosXcTest.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/IosXcTest.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/IosXcTest.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/LauncherActivityIntent.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/LauncherActivityIntent.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/LauncherActivityIntent.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/LauncherActivityIntent.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Locale.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Locale.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Locale.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Locale.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/NetworkConfiguration.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/NetworkConfiguration.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/NetworkConfiguration.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/NetworkConfiguration.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/NetworkConfigurationCatalog.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/NetworkConfigurationCatalog.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/NetworkConfigurationCatalog.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/NetworkConfigurationCatalog.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ObbFile.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ObbFile.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ObbFile.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ObbFile.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Orientation.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Orientation.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/Orientation.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/Orientation.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/RegularFile.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/RegularFile.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/RegularFile.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/RegularFile.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ResultStorage.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ResultStorage.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ResultStorage.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ResultStorage.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/RoboDirective.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/RoboDirective.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/RoboDirective.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/RoboDirective.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/RoboStartingIntent.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/RoboStartingIntent.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/RoboStartingIntent.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/RoboStartingIntent.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/StartActivityIntent.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/StartActivityIntent.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/StartActivityIntent.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/StartActivityIntent.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestDetails.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestDetails.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestDetails.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestDetails.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestEnvironmentCatalog.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestEnvironmentCatalog.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestEnvironmentCatalog.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestEnvironmentCatalog.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestExecution.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestExecution.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestExecution.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestExecution.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestMatrix.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestMatrix.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestMatrix.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestMatrix.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestSetup.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestSetup.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestSetup.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestSetup.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestSpecification.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestSpecification.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TestSpecification.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TestSpecification.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ToolResultsExecution.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ToolResultsExecution.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ToolResultsExecution.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ToolResultsExecution.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ToolResultsHistory.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ToolResultsHistory.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ToolResultsHistory.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ToolResultsHistory.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ToolResultsStep.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ToolResultsStep.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/ToolResultsStep.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/ToolResultsStep.java diff --git a/cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TrafficRule.java b/firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TrafficRule.java similarity index 100% rename from cloud_testing/apis/testing/src/main/java/com/google/api/services/testing/model/TrafficRule.java rename to firebase_apis/test_api/src/main/java/com/google/api/services/testing/model/TrafficRule.java diff --git a/gradle/gradle/spotless.gradle b/gradle/gradle/spotless.gradle deleted file mode 100644 index fc8f530690..0000000000 --- a/gradle/gradle/spotless.gradle +++ /dev/null @@ -1,7 +0,0 @@ -apply plugin: 'com.diffplug.gradle.spotless' - -spotless { // gradle spotlessApply - java { - googleJavaFormat() - } -} diff --git a/jitpack.yml b/jitpack.yml index f2aed13b4d..45cf192fbd 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -1,6 +1,6 @@ jdk: - openjdk8 install: - - echo "Running a custom install command" - - cloud_testing/kotlin_poc/gradlew -p cloud_testing/kotlin_poc/ clean fatJar - - mvn install:install-file -Dfile=cloud_testing/kotlin_poc/build/libs/kotlin_poc-all-1.0-SNAPSHOT.jar -DgroupId=com.github.TestArmada.flank -DartifactId=kotlin -Dversion=SNAPSHOT -Dpackaging=jar + - echo "Installing Flank" + - test_runner/gradlew -p test_runner/ clean assemble fatJar + - mvn install:install-file -Dfile=test_runner/build/libs/flank-3.0-SNAPSHOT.jar -DgroupId=com.github.TestArmada.flank -DartifactId=kotlin -Dversion=SNAPSHOT -Dpackaging=jar diff --git a/cloud_testing/junit_html_report/.gitignore b/junit_html_report/.gitignore similarity index 100% rename from cloud_testing/junit_html_report/.gitignore rename to junit_html_report/.gitignore diff --git a/cloud_testing/junit_html_report/README.md b/junit_html_report/README.md similarity index 100% rename from cloud_testing/junit_html_report/README.md rename to junit_html_report/README.md diff --git a/cloud_testing/junit_html_report/inline.js b/junit_html_report/inline.js similarity index 100% rename from cloud_testing/junit_html_report/inline.js rename to junit_html_report/inline.js diff --git a/cloud_testing/junit_html_report/kotlin_integration.md b/junit_html_report/kotlin_integration.md similarity index 100% rename from cloud_testing/junit_html_report/kotlin_integration.md rename to junit_html_report/kotlin_integration.md diff --git a/cloud_testing/junit_html_report/package.json b/junit_html_report/package.json similarity index 100% rename from cloud_testing/junit_html_report/package.json rename to junit_html_report/package.json diff --git a/cloud_testing/junit_html_report/packages/office-ui-fabric-react-tslint/package-deps.json b/junit_html_report/packages/office-ui-fabric-react-tslint/package-deps.json similarity index 100% rename from cloud_testing/junit_html_report/packages/office-ui-fabric-react-tslint/package-deps.json rename to junit_html_report/packages/office-ui-fabric-react-tslint/package-deps.json diff --git a/cloud_testing/junit_html_report/packages/office-ui-fabric-react-tslint/package.json b/junit_html_report/packages/office-ui-fabric-react-tslint/package.json similarity index 100% rename from cloud_testing/junit_html_report/packages/office-ui-fabric-react-tslint/package.json rename to junit_html_report/packages/office-ui-fabric-react-tslint/package.json diff --git a/cloud_testing/junit_html_report/packages/office-ui-fabric-react-tslint/tslint.json b/junit_html_report/packages/office-ui-fabric-react-tslint/tslint.json similarity index 100% rename from cloud_testing/junit_html_report/packages/office-ui-fabric-react-tslint/tslint.json rename to junit_html_report/packages/office-ui-fabric-react-tslint/tslint.json diff --git a/cloud_testing/junit_html_report/public/favicon.ico b/junit_html_report/public/favicon.ico similarity index 100% rename from cloud_testing/junit_html_report/public/favicon.ico rename to junit_html_report/public/favicon.ico diff --git a/cloud_testing/junit_html_report/public/index.html b/junit_html_report/public/index.html similarity index 100% rename from cloud_testing/junit_html_report/public/index.html rename to junit_html_report/public/index.html diff --git a/cloud_testing/junit_html_report/public/manifest.json b/junit_html_report/public/manifest.json similarity index 100% rename from cloud_testing/junit_html_report/public/manifest.json rename to junit_html_report/public/manifest.json diff --git a/cloud_testing/junit_html_report/src/App.css b/junit_html_report/src/App.css similarity index 100% rename from cloud_testing/junit_html_report/src/App.css rename to junit_html_report/src/App.css diff --git a/cloud_testing/junit_html_report/src/App.test.tsx b/junit_html_report/src/App.test.tsx similarity index 100% rename from cloud_testing/junit_html_report/src/App.test.tsx rename to junit_html_report/src/App.test.tsx diff --git a/cloud_testing/junit_html_report/src/App.tsx b/junit_html_report/src/App.tsx similarity index 100% rename from cloud_testing/junit_html_report/src/App.tsx rename to junit_html_report/src/App.tsx diff --git a/cloud_testing/junit_html_report/src/data.tsx b/junit_html_report/src/data.tsx similarity index 100% rename from cloud_testing/junit_html_report/src/data.tsx rename to junit_html_report/src/data.tsx diff --git a/cloud_testing/junit_html_report/src/index.css b/junit_html_report/src/index.css similarity index 100% rename from cloud_testing/junit_html_report/src/index.css rename to junit_html_report/src/index.css diff --git a/cloud_testing/junit_html_report/src/index.tsx b/junit_html_report/src/index.tsx similarity index 100% rename from cloud_testing/junit_html_report/src/index.tsx rename to junit_html_report/src/index.tsx diff --git a/cloud_testing/junit_html_report/src/logo.svg b/junit_html_report/src/logo.svg similarity index 100% rename from cloud_testing/junit_html_report/src/logo.svg rename to junit_html_report/src/logo.svg diff --git a/cloud_testing/junit_html_report/src/registerServiceWorker.ts b/junit_html_report/src/registerServiceWorker.ts similarity index 100% rename from cloud_testing/junit_html_report/src/registerServiceWorker.ts rename to junit_html_report/src/registerServiceWorker.ts diff --git a/cloud_testing/junit_html_report/tsconfig.json b/junit_html_report/tsconfig.json similarity index 100% rename from cloud_testing/junit_html_report/tsconfig.json rename to junit_html_report/tsconfig.json diff --git a/cloud_testing/junit_html_report/tsconfig.test.json b/junit_html_report/tsconfig.test.json similarity index 100% rename from cloud_testing/junit_html_report/tsconfig.test.json rename to junit_html_report/tsconfig.test.json diff --git a/cloud_testing/junit_html_report/tslint.json b/junit_html_report/tslint.json similarity index 100% rename from cloud_testing/junit_html_report/tslint.json rename to junit_html_report/tslint.json diff --git a/cloud_testing/junit_html_report/update_report.sh b/junit_html_report/update_report.sh similarity index 100% rename from cloud_testing/junit_html_report/update_report.sh rename to junit_html_report/update_report.sh diff --git a/cloud_testing/junit_html_report/yarn.lock b/junit_html_report/yarn.lock similarity index 100% rename from cloud_testing/junit_html_report/yarn.lock rename to junit_html_report/yarn.lock diff --git a/release_notes.md b/release_notes.md deleted file mode 100644 index 010504ff7d..0000000000 --- a/release_notes.md +++ /dev/null @@ -1,16 +0,0 @@ -Release notes for flank - -# next (unreleased) - -- - -# 2.0.3 - -- [Fix bug parsing test duration - **runningcode**](https://github.com/TestArmada/flank/pull/158) - -# 2.0.2 - -- [Add IntelliJ Idea Code Formatting settings for Java Flank - **doodla**](https://github.com/TestArmada/flank/pull/147) -- [Add ability to disable google login - **runningcode**](https://github.com/TestArmada/flank/pull/146) -- [Add the ability to disable video recording and performance metrics - **doodla**](https://github.com/TestArmada/flank/pull/149) -- [Added defaults to the configuration options - **doodla**](https://github.com/TestArmada/flank/pull/152) diff --git a/test_app/app/build.gradle b/test_app/app/build.gradle deleted file mode 100644 index 42d3bfd0c3..0000000000 --- a/test_app/app/build.gradle +++ /dev/null @@ -1,57 +0,0 @@ -apply plugin: 'com.android.application' - -android { - compileSdkVersion 27 - - defaultConfig { - applicationId "com.example.app" - minSdkVersion 21 - targetSdkVersion 27 - versionCode 1 - versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - } - } - - testOptions { - animationsDisabled = true - execution 'ANDROID_TEST_ORCHESTRATOR' - } -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'com.android.support:appcompat-v7:27.0.2' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - - def runnerVersion = '1.0.2-alpha1' - def orchestratorVersion = runnerVersion - def espressoVersion = '3.0.2-alpha1' - - androidTestUtil "com.android.support.test:orchestrator:$orchestratorVersion" - androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoVersion" - androidTestImplementation "com.android.support.test:runner:$runnerVersion" - testImplementation 'junit:junit:4.12' - -} - -// Run espresso tests *without* building the APKs. -// Useful for quickly running tests locally when the APKs already exist. -// -// Generates: -// test_app/app/build/outputs/androidTest-results/connected/TEST-*.xml -// test_app/app/build/reports/androidTests/connected/index.html -// -// gradle --configure-on-demand espresso -task espresso << { - def testTask = project.tasks["connectedDebugAndroidTest"] - def runTestsAction = testTask.getActions().get(0) - - runTestsAction.execute(testTask) -} diff --git a/test_app/app/build.gradle.kts b/test_app/app/build.gradle.kts new file mode 100644 index 0000000000..02324ab406 --- /dev/null +++ b/test_app/app/build.gradle.kts @@ -0,0 +1,44 @@ +import org.jetbrains.kotlin.config.KotlinCompilerVersion + +plugins { + id("com.android.application") + id("kotlin-android") + id("kotlin-android-extensions") +} + +android { + compileSdkVersion(28) + defaultConfig { + applicationId = "com.example.app" + minSdkVersion(24) + targetSdkVersion(28) + versionCode = 1 + versionName = "1.0" + testInstrumentationRunner = "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + getByName("release") { + isMinifyEnabled = false + } + } + + testOptions { + animationsDisabled = true + execution = "ANDROID_TEST_ORCHESTRATOR" + } +} + +dependencies { + implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) + implementation(kotlin("stdlib-jdk8", KotlinCompilerVersion.VERSION)) + implementation("com.android.support:appcompat-v7:28.0.0-rc01") + implementation("com.android.support.constraint:constraint-layout:1.1.2") + + val runnerVersion = "1.0.2-alpha1" + val espressoVersion = "3.0.2-alpha1" + + androidTestUtil("com.android.support.test:orchestrator:$runnerVersion") + androidTestImplementation("com.android.support.test.espresso:espresso-core:$espressoVersion") + androidTestImplementation("com.android.support.test:runner:$runnerVersion") + testImplementation("junit:junit:4.12") +} diff --git a/test_app/app/proguard-rules.pro b/test_app/app/proguard-rules.pro deleted file mode 100644 index c675e12622..0000000000 --- a/test_app/app/proguard-rules.pro +++ /dev/null @@ -1,25 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/medwards/Library/Android/sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/test_app/build.gradle b/test_app/build.gradle.kts similarity index 57% rename from test_app/build.gradle rename to test_app/build.gradle.kts index 5120095c4c..cad13438c4 100644 --- a/test_app/build.gradle +++ b/test_app/build.gradle.kts @@ -6,10 +6,11 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath("com.android.tools.build:gradle:3.2.0-rc02") + classpath(kotlin("gradle-plugin", version = "1.2.61")) // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + // in the individual module build.gradle.kts files } } @@ -20,6 +21,6 @@ allprojects { } } -task clean(type: Delete) { - delete rootProject.buildDir +tasks.register("clean", Delete::class.java) { + delete(rootProject.buildDir) } diff --git a/test_app/gradle b/test_app/gradle deleted file mode 120000 index a2df95ce1c..0000000000 --- a/test_app/gradle +++ /dev/null @@ -1 +0,0 @@ -../gradle/gradle \ No newline at end of file diff --git a/test_app/gradle.properties b/test_app/gradle.properties deleted file mode 120000 index 5b4fff3b3a..0000000000 --- a/test_app/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -../gradle/gradle.properties \ No newline at end of file diff --git a/test_app/gradle.properties b/test_app/gradle.properties new file mode 100644 index 0000000000..3cdceb6af8 --- /dev/null +++ b/test_app/gradle.properties @@ -0,0 +1 @@ +org.gradle.configureondemand=false diff --git a/test_app/gradlew b/test_app/gradlew deleted file mode 120000 index 4936b5d3b2..0000000000 --- a/test_app/gradlew +++ /dev/null @@ -1 +0,0 @@ -../gradle/gradlew \ No newline at end of file diff --git a/test_app/gradlew.bat b/test_app/gradlew.bat deleted file mode 120000 index d67a854c62..0000000000 --- a/test_app/gradlew.bat +++ /dev/null @@ -1 +0,0 @@ -../gradle/gradlew.bat \ No newline at end of file diff --git a/test_app/settings.gradle b/test_app/settings.gradle deleted file mode 100644 index e7b4def49c..0000000000 --- a/test_app/settings.gradle +++ /dev/null @@ -1 +0,0 @@ -include ':app' diff --git a/test_app/settings.gradle.kts b/test_app/settings.gradle.kts new file mode 100644 index 0000000000..15a801b10a --- /dev/null +++ b/test_app/settings.gradle.kts @@ -0,0 +1 @@ +include(":app") diff --git a/cloud_testing/kotlin_poc/.gitignore b/test_runner/.gitignore similarity index 73% rename from cloud_testing/kotlin_poc/.gitignore rename to test_runner/.gitignore index 40d92993d8..f8568b897e 100644 --- a/cloud_testing/kotlin_poc/.gitignore +++ b/test_runner/.gitignore @@ -1,7 +1,6 @@ results -*.jar *.zip tmp EarlGrey/ EarlGreyExample/ -xctestrun/ \ No newline at end of file +xctestrun/ diff --git a/cloud_testing/kotlin_poc/bash/flank b/test_runner/bash/flank similarity index 100% rename from cloud_testing/kotlin_poc/bash/flank rename to test_runner/bash/flank diff --git a/cloud_testing/kotlin_poc/bash/update_flank.sh b/test_runner/bash/update_flank.sh similarity index 100% rename from cloud_testing/kotlin_poc/bash/update_flank.sh rename to test_runner/bash/update_flank.sh diff --git a/cloud_testing/kotlin_poc/build.gradle.kts b/test_runner/build.gradle.kts similarity index 86% rename from cloud_testing/kotlin_poc/build.gradle.kts rename to test_runner/build.gradle.kts index e5dd61f7e2..202c2c71ca 100644 --- a/cloud_testing/kotlin_poc/build.gradle.kts +++ b/test_runner/build.gradle.kts @@ -4,17 +4,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.dsl.Coroutines group = "kotlin_poc" -version = "1.0-SNAPSHOT" - -buildscript { - repositories { - jcenter() - } - - dependencies { - classpath(Plugins.KOTLIN) - } -} +version = "3.0-SNAPSHOT" plugins { application @@ -87,7 +77,7 @@ dependencies { // NOTE: iOS support isn't in the public artifact. Use testing jar generated from the private gcloud CLI json // https://search.maven.org/#search%7Cga%7C1%7Cg%3A%22com.google.apis%22%20AND%20a%3A%22google-api-services-testing%22 // compile("com.google.apis:google-api-services-testing:v1-rev30-1.23.0") - compile(project(":testing")) + compile(project("test_api")) // yaml config // https://search.maven.org/search?q=a:jackson-databind%20g:com.fasterxml.jackson.core @@ -126,29 +116,20 @@ configurations.all { } } -val javaVersion = "1.8" -val compileKotlin: KotlinCompile by tasks -compileKotlin.kotlinOptions { - jvmTarget = javaVersion -} - -val compileTestKotlin: KotlinCompile by tasks -compileTestKotlin.kotlinOptions { - jvmTarget = javaVersion -} - -java { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - task("fatJar", type = Jar::class) { - baseName = "${project.name}-all" + baseName = "flank" manifest { attributes.apply { put("Main-Class", "ftl.Main") } } - from(configurations.runtime.map({ if (it.isDirectory) it else zipTree(it) })) + from(configurations.runtime.map { + @Suppress("IMPLICIT_CAST_TO_ANY") + if (it.isDirectory) it else zipTree(it) + }) with(tasks["jar"] as CopySpec) } + +tasks.withType { + kotlinOptions.jvmTarget = "1.8" +} diff --git a/cloud_testing/kotlin_poc/buildSrc/src/main/java/Deps.java b/test_runner/buildSrc/src/main/java/Deps.java similarity index 100% rename from cloud_testing/kotlin_poc/buildSrc/src/main/java/Deps.java rename to test_runner/buildSrc/src/main/java/Deps.java diff --git a/cloud_testing/kotlin_poc/build_earlgrey_example.sh b/test_runner/build_earlgrey_example.sh similarity index 100% rename from cloud_testing/kotlin_poc/build_earlgrey_example.sh rename to test_runner/build_earlgrey_example.sh diff --git a/cloud_testing/kotlin_poc/flank.ios.yml b/test_runner/flank.ios.yml similarity index 100% rename from cloud_testing/kotlin_poc/flank.ios.yml rename to test_runner/flank.ios.yml diff --git a/cloud_testing/kotlin_poc/flank.yml b/test_runner/flank.yml similarity index 100% rename from cloud_testing/kotlin_poc/flank.yml rename to test_runner/flank.yml diff --git a/gradle/gradle.properties b/test_runner/gradle.properties similarity index 100% rename from gradle/gradle.properties rename to test_runner/gradle.properties diff --git a/gradle/gradle/wrapper/gradle-wrapper.jar b/test_runner/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from gradle/gradle/wrapper/gradle-wrapper.jar rename to test_runner/gradle/wrapper/gradle-wrapper.jar diff --git a/gradle/gradle/wrapper/gradle-wrapper.properties b/test_runner/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from gradle/gradle/wrapper/gradle-wrapper.properties rename to test_runner/gradle/wrapper/gradle-wrapper.properties diff --git a/gradle/gradlew b/test_runner/gradlew similarity index 100% rename from gradle/gradlew rename to test_runner/gradlew diff --git a/gradle/gradlew.bat b/test_runner/gradlew.bat similarity index 100% rename from gradle/gradlew.bat rename to test_runner/gradlew.bat diff --git a/test_runner/settings.gradle.kts b/test_runner/settings.gradle.kts new file mode 100644 index 0000000000..f811f74db8 --- /dev/null +++ b/test_runner/settings.gradle.kts @@ -0,0 +1,2 @@ +include(":test_api") +project(":test_api").projectDir = File(rootProject.projectDir, "../firebase_apis/test_api") diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/Main.kt b/test_runner/src/main/kotlin/ftl/Main.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/Main.kt rename to test_runner/src/main/kotlin/ftl/Main.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/android/AndroidCatalog.kt b/test_runner/src/main/kotlin/ftl/android/AndroidCatalog.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/android/AndroidCatalog.kt rename to test_runner/src/main/kotlin/ftl/android/AndroidCatalog.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/AndroidArgs.kt b/test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/AndroidArgs.kt rename to test_runner/src/main/kotlin/ftl/args/AndroidArgs.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/ArgsHelper.kt b/test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/ArgsHelper.kt rename to test_runner/src/main/kotlin/ftl/args/ArgsHelper.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/IArgs.kt b/test_runner/src/main/kotlin/ftl/args/IArgs.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/IArgs.kt rename to test_runner/src/main/kotlin/ftl/args/IArgs.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/IArgsCompanion.kt b/test_runner/src/main/kotlin/ftl/args/IArgsCompanion.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/IArgsCompanion.kt rename to test_runner/src/main/kotlin/ftl/args/IArgsCompanion.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/IosArgs.kt b/test_runner/src/main/kotlin/ftl/args/IosArgs.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/IosArgs.kt rename to test_runner/src/main/kotlin/ftl/args/IosArgs.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/AndroidGcloudYml.kt b/test_runner/src/main/kotlin/ftl/args/yml/AndroidGcloudYml.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/AndroidGcloudYml.kt rename to test_runner/src/main/kotlin/ftl/args/yml/AndroidGcloudYml.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/FlankYml.kt b/test_runner/src/main/kotlin/ftl/args/yml/FlankYml.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/FlankYml.kt rename to test_runner/src/main/kotlin/ftl/args/yml/FlankYml.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/GcloudYml.kt b/test_runner/src/main/kotlin/ftl/args/yml/GcloudYml.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/GcloudYml.kt rename to test_runner/src/main/kotlin/ftl/args/yml/GcloudYml.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IYmlKeys.kt b/test_runner/src/main/kotlin/ftl/args/yml/IYmlKeys.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IYmlKeys.kt rename to test_runner/src/main/kotlin/ftl/args/yml/IYmlKeys.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IYmlMap.kt b/test_runner/src/main/kotlin/ftl/args/yml/IYmlMap.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IYmlMap.kt rename to test_runner/src/main/kotlin/ftl/args/yml/IYmlMap.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IosFlankYml.kt b/test_runner/src/main/kotlin/ftl/args/yml/IosFlankYml.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IosFlankYml.kt rename to test_runner/src/main/kotlin/ftl/args/yml/IosFlankYml.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IosGcloudYml.kt b/test_runner/src/main/kotlin/ftl/args/yml/IosGcloudYml.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/args/yml/IosGcloudYml.kt rename to test_runner/src/main/kotlin/ftl/args/yml/IosGcloudYml.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/FirebaseCommand.kt b/test_runner/src/main/kotlin/ftl/cli/FirebaseCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/FirebaseCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/FirebaseCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/TestCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/TestCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/TestCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/AndroidCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/IosCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidDoctorCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRefreshCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRefreshCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRefreshCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRefreshCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/android/AndroidRunCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosDoctorCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/ios/IosRefreshCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRefreshCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/ios/IosRefreshCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRefreshCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt b/test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt rename to test_runner/src/main/kotlin/ftl/cli/firebase/test/ios/IosRunCommand.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/config/Device.kt b/test_runner/src/main/kotlin/ftl/config/Device.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/config/Device.kt rename to test_runner/src/main/kotlin/ftl/config/Device.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/config/FtlConstants.kt b/test_runner/src/main/kotlin/ftl/config/FtlConstants.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/config/FtlConstants.kt rename to test_runner/src/main/kotlin/ftl/config/FtlConstants.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/doctor/Doctor.kt b/test_runner/src/main/kotlin/ftl/doctor/Doctor.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/doctor/Doctor.kt rename to test_runner/src/main/kotlin/ftl/doctor/Doctor.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcAndroidMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcAndroidMatrix.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcAndroidMatrix.kt rename to test_runner/src/main/kotlin/ftl/gc/GcAndroidMatrix.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt rename to test_runner/src/main/kotlin/ftl/gc/GcAndroidTestMatrix.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcIosMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcIosMatrix.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcIosMatrix.kt rename to test_runner/src/main/kotlin/ftl/gc/GcIosMatrix.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt rename to test_runner/src/main/kotlin/ftl/gc/GcIosTestMatrix.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcStorage.kt b/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt similarity index 97% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcStorage.kt rename to test_runner/src/main/kotlin/ftl/gc/GcStorage.kt index d83c4cd627..bc977b387b 100644 --- a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcStorage.kt +++ b/test_runner/src/main/kotlin/ftl/gc/GcStorage.kt @@ -79,7 +79,8 @@ object GcStorage { val bucket = gcsURI.authority val path = gcsURI.path.drop(1) // Drop leading slash - val outputFile = File("../../test_app/apks/$path") + val outputFile = File.createTempFile("apk", null) + outputFile.deleteOnExit() try { val blob = storage.get(bucket, path) diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcTestMatrix.kt b/test_runner/src/main/kotlin/ftl/gc/GcTestMatrix.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcTestMatrix.kt rename to test_runner/src/main/kotlin/ftl/gc/GcTestMatrix.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcTesting.kt b/test_runner/src/main/kotlin/ftl/gc/GcTesting.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcTesting.kt rename to test_runner/src/main/kotlin/ftl/gc/GcTesting.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcToolResults.kt b/test_runner/src/main/kotlin/ftl/gc/GcToolResults.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/gc/GcToolResults.kt rename to test_runner/src/main/kotlin/ftl/gc/GcToolResults.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/ios/IosCatalog.kt b/test_runner/src/main/kotlin/ftl/ios/IosCatalog.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/ios/IosCatalog.kt rename to test_runner/src/main/kotlin/ftl/ios/IosCatalog.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/ios/Parse.kt b/test_runner/src/main/kotlin/ftl/ios/Parse.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/ios/Parse.kt rename to test_runner/src/main/kotlin/ftl/ios/Parse.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/ios/Xctestrun.kt b/test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/ios/Xctestrun.kt rename to test_runner/src/main/kotlin/ftl/ios/Xctestrun.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/json/MatrixMap.kt b/test_runner/src/main/kotlin/ftl/json/MatrixMap.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/json/MatrixMap.kt rename to test_runner/src/main/kotlin/ftl/json/MatrixMap.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/json/SavedMatrix.kt b/test_runner/src/main/kotlin/ftl/json/SavedMatrix.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/json/SavedMatrix.kt rename to test_runner/src/main/kotlin/ftl/json/SavedMatrix.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/CostReport.kt b/test_runner/src/main/kotlin/ftl/reports/CostReport.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/CostReport.kt rename to test_runner/src/main/kotlin/ftl/reports/CostReport.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/HtmlErrorReport.kt b/test_runner/src/main/kotlin/ftl/reports/HtmlErrorReport.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/HtmlErrorReport.kt rename to test_runner/src/main/kotlin/ftl/reports/HtmlErrorReport.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/MatrixErrorReport.kt b/test_runner/src/main/kotlin/ftl/reports/MatrixErrorReport.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/MatrixErrorReport.kt rename to test_runner/src/main/kotlin/ftl/reports/MatrixErrorReport.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/MatrixResultsReport.kt b/test_runner/src/main/kotlin/ftl/reports/MatrixResultsReport.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/MatrixResultsReport.kt rename to test_runner/src/main/kotlin/ftl/reports/MatrixResultsReport.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/TestErrorCountReport.kt b/test_runner/src/main/kotlin/ftl/reports/TestErrorCountReport.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/TestErrorCountReport.kt rename to test_runner/src/main/kotlin/ftl/reports/TestErrorCountReport.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/util/IReport.kt b/test_runner/src/main/kotlin/ftl/reports/util/IReport.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/util/IReport.kt rename to test_runner/src/main/kotlin/ftl/reports/util/IReport.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/util/ReportManager.kt b/test_runner/src/main/kotlin/ftl/reports/util/ReportManager.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/util/ReportManager.kt rename to test_runner/src/main/kotlin/ftl/reports/util/ReportManager.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/util/TestData.kt b/test_runner/src/main/kotlin/ftl/reports/util/TestData.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/reports/util/TestData.kt rename to test_runner/src/main/kotlin/ftl/reports/util/TestData.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/AndroidTestRunner.kt b/test_runner/src/main/kotlin/ftl/run/AndroidTestRunner.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/AndroidTestRunner.kt rename to test_runner/src/main/kotlin/ftl/run/AndroidTestRunner.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/GenericTestRunner.kt b/test_runner/src/main/kotlin/ftl/run/GenericTestRunner.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/GenericTestRunner.kt rename to test_runner/src/main/kotlin/ftl/run/GenericTestRunner.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/IosTestRunner.kt b/test_runner/src/main/kotlin/ftl/run/IosTestRunner.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/IosTestRunner.kt rename to test_runner/src/main/kotlin/ftl/run/IosTestRunner.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/TestRunner.kt b/test_runner/src/main/kotlin/ftl/run/TestRunner.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/run/TestRunner.kt rename to test_runner/src/main/kotlin/ftl/run/TestRunner.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/ArtifactRegex.kt b/test_runner/src/main/kotlin/ftl/util/ArtifactRegex.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/ArtifactRegex.kt rename to test_runner/src/main/kotlin/ftl/util/ArtifactRegex.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Bash.kt b/test_runner/src/main/kotlin/ftl/util/Bash.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Bash.kt rename to test_runner/src/main/kotlin/ftl/util/Bash.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Billing.kt b/test_runner/src/main/kotlin/ftl/util/Billing.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Billing.kt rename to test_runner/src/main/kotlin/ftl/util/Billing.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/MatrixState.kt b/test_runner/src/main/kotlin/ftl/util/MatrixState.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/MatrixState.kt rename to test_runner/src/main/kotlin/ftl/util/MatrixState.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/MatrixUtil.kt b/test_runner/src/main/kotlin/ftl/util/MatrixUtil.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/MatrixUtil.kt rename to test_runner/src/main/kotlin/ftl/util/MatrixUtil.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Outcome.kt b/test_runner/src/main/kotlin/ftl/util/Outcome.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Outcome.kt rename to test_runner/src/main/kotlin/ftl/util/Outcome.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/ProcessExtension.kt b/test_runner/src/main/kotlin/ftl/util/ProcessExtension.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/ProcessExtension.kt rename to test_runner/src/main/kotlin/ftl/util/ProcessExtension.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/StopWatch.kt b/test_runner/src/main/kotlin/ftl/util/StopWatch.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/StopWatch.kt rename to test_runner/src/main/kotlin/ftl/util/StopWatch.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/StreamReader.kt b/test_runner/src/main/kotlin/ftl/util/StreamReader.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/StreamReader.kt rename to test_runner/src/main/kotlin/ftl/util/StreamReader.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/TestMatrixExtension.kt b/test_runner/src/main/kotlin/ftl/util/TestMatrixExtension.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/TestMatrixExtension.kt rename to test_runner/src/main/kotlin/ftl/util/TestMatrixExtension.kt diff --git a/cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Utils.kt b/test_runner/src/main/kotlin/ftl/util/Utils.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/main/kotlin/ftl/util/Utils.kt rename to test_runner/src/main/kotlin/ftl/util/Utils.kt diff --git a/cloud_testing/kotlin_poc/src/main/resources/inline.html b/test_runner/src/main/resources/inline.html similarity index 100% rename from cloud_testing/kotlin_poc/src/main/resources/inline.html rename to test_runner/src/main/resources/inline.html diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/MainTest.kt b/test_runner/src/test/kotlin/ftl/MainTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/MainTest.kt rename to test_runner/src/test/kotlin/ftl/MainTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/android/AndroidCatalogTest.kt b/test_runner/src/test/kotlin/ftl/android/AndroidCatalogTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/android/AndroidCatalogTest.kt rename to test_runner/src/test/kotlin/ftl/android/AndroidCatalogTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt similarity index 96% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt rename to test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt index 26536381e4..4e30842070 100644 --- a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/AndroidArgsFileTest.kt @@ -34,9 +34,9 @@ class AndroidArgsFileTest { private val localYamlFile = getPath("src/test/kotlin/ftl/fixtures/flank.local.yml") private val gcsYamlFile = getPath("src/test/kotlin/ftl/fixtures/flank.gcs.yml") - private val appApkLocal = getString("../../test_app/apks/app-debug.apk") + private val appApkLocal = getString("../test_app/apks/app-debug.apk") private val appApkGcs = "gs://tmp_bucket_2/app-debug.apk" - private val testApkLocal = getString("../../test_app/apks/app-debug-androidTest.apk") + private val testApkLocal = getString("../test_app/apks/app-debug-androidTest.apk") private val testApkGcs = "gs://tmp_bucket_2/app-debug-androidTest.apk" private val testName = "class com.example.app.ExampleUiTest#testPasses" private val directoryToPull = "/sdcard/screenshots" diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/AndroidArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt similarity index 94% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/AndroidArgsTest.kt rename to test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt index fe20037e39..9a991d9f0d 100644 --- a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/AndroidArgsTest.kt +++ b/test_runner/src/test/kotlin/ftl/args/AndroidArgsTest.kt @@ -10,8 +10,8 @@ import org.junit.runner.RunWith @RunWith(FlankTestRunner::class) class AndroidArgsTest { private val empty = emptyList() - private val appApk = "../../test_app/apks/app-debug.apk" - private val testApk = "../../test_app/apks/app-debug-androidTest.apk" + private val appApk = "../test_app/apks/app-debug.apk" + private val testApk = "../test_app/apks/app-debug-androidTest.apk" private val androidNonDefault = """ gcloud: @@ -87,8 +87,8 @@ AndroidArgs async: true projectId: projectFoo # Android gcloud - appApk: ../../test_app/apks/app-debug.apk - testApk: ../../test_app/apks/app-debug-androidTest.apk + appApk: ../test_app/apks/app-debug.apk + testApk: ../test_app/apks/app-debug-androidTest.apk autoGoogleLogin: false useOrchestrator: false environmentVariables: {clearPackageData=true} diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/IosArgsFileTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsFileTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/IosArgsFileTest.kt rename to test_runner/src/test/kotlin/ftl/args/IosArgsFileTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/IosArgsTest.kt b/test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/args/IosArgsTest.kt rename to test_runner/src/test/kotlin/ftl/args/IosArgsTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/doctor/DoctorTest.kt b/test_runner/src/test/kotlin/ftl/doctor/DoctorTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/doctor/DoctorTest.kt rename to test_runner/src/test/kotlin/ftl/doctor/DoctorTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank.gcs.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank.gcs.yml similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank.gcs.yml rename to test_runner/src/test/kotlin/ftl/fixtures/flank.gcs.yml diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank.ios.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank.ios.yml similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank.ios.yml rename to test_runner/src/test/kotlin/ftl/fixtures/flank.ios.yml diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank.local.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml similarity index 85% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank.local.yml rename to test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml index 8032d524d9..8702bba843 100644 --- a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank.local.yml +++ b/test_runner/src/test/kotlin/ftl/fixtures/flank.local.yml @@ -1,6 +1,6 @@ gcloud: - app: ../../test_app/apks/app-debug.apk - test: ../../test_app/apks/app-debug-androidTest.apk + app: ../test_app/apks/app-debug.apk + test: ../test_app/apks/app-debug-androidTest.apk results-bucket: tmp_bucket_2 auto-google-login: true use-orchestrator: true diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank2.ios.yml b/test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/fixtures/flank2.ios.yml rename to test_runner/src/test/kotlin/ftl/fixtures/flank2.ios.yml diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/ios/IosCatalogTest.kt b/test_runner/src/test/kotlin/ftl/ios/IosCatalogTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/ios/IosCatalogTest.kt rename to test_runner/src/test/kotlin/ftl/ios/IosCatalogTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/ios/ParseTest.kt b/test_runner/src/test/kotlin/ftl/ios/ParseTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/ios/ParseTest.kt rename to test_runner/src/test/kotlin/ftl/ios/ParseTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/ios/XctestrunTest.kt b/test_runner/src/test/kotlin/ftl/ios/XctestrunTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/ios/XctestrunTest.kt rename to test_runner/src/test/kotlin/ftl/ios/XctestrunTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/FlankTestRunner.kt b/test_runner/src/test/kotlin/ftl/test/util/FlankTestRunner.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/FlankTestRunner.kt rename to test_runner/src/test/kotlin/ftl/test/util/FlankTestRunner.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/LocalGcs.kt b/test_runner/src/test/kotlin/ftl/test/util/LocalGcs.kt similarity index 89% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/LocalGcs.kt rename to test_runner/src/test/kotlin/ftl/test/util/LocalGcs.kt index b5376d7b5c..d3c1dad767 100644 --- a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/LocalGcs.kt +++ b/test_runner/src/test/kotlin/ftl/test/util/LocalGcs.kt @@ -10,8 +10,8 @@ object LocalGcs { private const val APP_APK = "app-debug.apk" private const val TEST_APK = "app-debug-androidTest.apk" - private const val APP_APK_PATH = "../../test_app/apks/app-debug.apk" - private const val TEST_APK_PATH = "../../test_app/apks/app-debug-androidTest.apk" + private const val APP_APK_PATH = "../test_app/apks/app-debug.apk" + private const val TEST_APK_PATH = "../test_app/apks/app-debug-androidTest.apk" const val TEST_BUCKET = "tmp_bucket_2" diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/MockServer.kt b/test_runner/src/test/kotlin/ftl/test/util/MockServer.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/MockServer.kt rename to test_runner/src/test/kotlin/ftl/test/util/MockServer.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/TestArtifact.kt b/test_runner/src/test/kotlin/ftl/test/util/TestArtifact.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/TestArtifact.kt rename to test_runner/src/test/kotlin/ftl/test/util/TestArtifact.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/TestHelper.kt b/test_runner/src/test/kotlin/ftl/test/util/TestHelper.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/test/util/TestHelper.kt rename to test_runner/src/test/kotlin/ftl/test/util/TestHelper.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/util/BashTest.kt b/test_runner/src/test/kotlin/ftl/util/BashTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/util/BashTest.kt rename to test_runner/src/test/kotlin/ftl/util/BashTest.kt diff --git a/cloud_testing/kotlin_poc/src/test/kotlin/ftl/util/BillingTest.kt b/test_runner/src/test/kotlin/ftl/util/BillingTest.kt similarity index 100% rename from cloud_testing/kotlin_poc/src/test/kotlin/ftl/util/BillingTest.kt rename to test_runner/src/test/kotlin/ftl/util/BillingTest.kt