diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 3662352..042392d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -34,24 +34,17 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} run: ./gradlew assembleRelease bundleRelease --stacktrace - - name: Find APK and AAB files - id: find_files - run: | - APK_PATH=$(find . -name "composeApp-release.apk" | head -n 1) - AAB_PATH=$(find . -name "composeApp-release.aab" | head -n 1) - echo "APK_PATH=$APK_PATH" >> $GITHUB_ENV - echo "AAB_PATH=$AAB_PATH" >> $GITHUB_ENV - name: Upload APK to Artifacts uses: actions/upload-artifact@v3 with: name: app-release.apk - path: ${{ env.APK_PATH }} + path: composeApp/build/outputs/apk/release/composeApp-release.apk - name: Upload AAB to Artifacts uses: actions/upload-artifact@v3 with: name: app-release.aab - path: ${{ env.AAB_PATH }} + path: composeApp/build/outputs/bundle/release/composeApp-release.aab test: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e24a8f3..13e2433 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -35,12 +35,6 @@ jobs: KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }} run: ./gradlew assembleRelease bundleRelease --stacktrace - - name: List files - run: ls composeApp - - - name: Print - run: pwd - - name: Upload APK to Artifacts uses: actions/upload-artifact@v3 with: diff --git a/shared/src/commonTest/kotlin/CalculateTakerScoreUnitTest.kt b/shared/src/commonTest/kotlin/CalculateTakerScoreUnitTest.kt deleted file mode 100644 index 1924d40..0000000 --- a/shared/src/commonTest/kotlin/CalculateTakerScoreUnitTest.kt +++ /dev/null @@ -1,59 +0,0 @@ -import commons.calculateTakerScore -import domain.models.Bid -import domain.models.Oudler -import kotlin.test.Test -import kotlin.test.assertEquals - -class CalculateTakerScoreUnitTest { - @Test - fun checkTakerPointSmallOne(){ - val points = 57 - val bid = Bid.SMALL - val oudlers : List = listOf() - - val score = calculateTakerScore(points, bid, oudlers.size) - - assertEquals(52, score) - } - - @Test - fun checkTakerPointSmallTwo(){ - val points = 24 - val bid = Bid.SMALL - val oudlers : List = listOf() - - val score = calculateTakerScore(points, bid, oudlers.size) - assertEquals(-114, score) - } - - - @Test - fun checkTakerPointGuardOne(){ - val points = 61 - val bid = Bid.GUARD - val oudlers : List = listOf(Oudler.EXCUSE) - - val score = calculateTakerScore(points, bid, oudlers.size) - assertEquals(140, score) - } - - @Test - fun checkTakerPointGuardWithoutOne(){ - val points = 63 - val bid = Bid.GUARD_WITHOUT - val oudlers : List = listOf(Oudler.PETIT, Oudler.EXCUSE) - - val score = calculateTakerScore(points, bid, oudlers.size) - assertEquals(376, score) - } - - @Test - fun checkTakerPointGuardWithoutTwo(){ - val points = 71 - val bid = Bid.GUARD_WITHOUT - val oudlers : List = listOf(Oudler.PETIT, Oudler.EXCUSE, Oudler.GRAND) - - val score = calculateTakerScore(points, bid, oudlers.size) - assertEquals(480, score) - } -} \ No newline at end of file