From e85d3ac7cffa7cdfac0b4938df31a5f6f88db9b5 Mon Sep 17 00:00:00 2001 From: khammami Date: Wed, 24 Apr 2024 09:05:30 +0100 Subject: [PATCH 1/2] Update eval test rules --- .github/classroom/autograding.json | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/.github/classroom/autograding.json b/.github/classroom/autograding.json index 1d891b9..3e2ecbe 100644 --- a/.github/classroom/autograding.json +++ b/.github/classroom/autograding.json @@ -1,34 +1,24 @@ { "tests": [ { - "name": "Testing App Build", + "name": "testSayHelloButton", "setup": "", - "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:assembleDebug --stacktrace --scan -p $ANDROID_APP_PATH", + "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.example.hellotoast.MainActivtyTest#testSayHelloButton -p $ANDROID_APP_PATH", "input": "", "output": "", "comparison": "included", "timeout": 5, - "points": 10 + "points": 6 }, { - "name": "Test 1", + "name": "testSayHelloButtonActivity", "setup": "", - "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -p $ANDROID_APP_PATH", + "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.example.hellotoast.MainActivtyTest#testSayHelloButtonActivity -p $ANDROID_APP_PATH", "input": "", "output": "", "comparison": "included", "timeout": 5, - "points": 1 - }, - { - "name": "Test 2", - "setup": "", - "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -p $ANDROID_APP_PATH", - "input": "", - "output": "", - "comparison": "included", - "timeout": 5, - "points": 1 + "points": 6 }, { "name": "Question 1", From c50e38ca3f78b1677fb5315dae41b574916ce933 Mon Sep 17 00:00:00 2001 From: khammami Date: Wed, 24 Apr 2024 09:14:27 +0100 Subject: [PATCH 2/2] Use the new test pkg name --- .github/classroom/autograding.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/classroom/autograding.json b/.github/classroom/autograding.json index 3e2ecbe..5f4e27c 100644 --- a/.github/classroom/autograding.json +++ b/.github/classroom/autograding.json @@ -3,7 +3,7 @@ { "name": "testSayHelloButton", "setup": "", - "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.example.hellotoast.MainActivtyTest#testSayHelloButton -p $ANDROID_APP_PATH", + "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.example.android.hellotoast.MainActivityTest#testSayHelloButton -p $ANDROID_APP_PATH", "input": "", "output": "", "comparison": "included", @@ -13,7 +13,7 @@ { "name": "testSayHelloButtonActivity", "setup": "", - "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.example.hellotoast.MainActivtyTest#testSayHelloButtonActivity -p $ANDROID_APP_PATH", + "run": ". ./setenv.sh && ./$ANDROID_APP_PATH/gradlew :app:connectedAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=com.example.android.hellotoast.MainActivityTest#testSayHelloButtonActivity -p $ANDROID_APP_PATH", "input": "", "output": "", "comparison": "included",