Compare commits
	
		
			12 Commits
		
	
	
		
			c14ae9588f
			...
			v125051211
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| e4b6119f65 | |||
| ea70c64873 | |||
| 
						 | 
					f4a1805474 | ||
| a602f7adf2 | |||
| 
						 | 
					cf6ef51edf | ||
| 0b7f832573 | |||
| 22c966bf16 | |||
| bdf2bb8b31 | |||
| ceae91206d | |||
| 11c0e744dc | |||
| 7374e95b0e | |||
| 8a7743a6fb | 
@@ -1,65 +0,0 @@
 | 
			
		||||
name: Coverage
 | 
			
		||||
on:
 | 
			
		||||
  workflow_call:
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  BuildAndTestAndCoverage:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Check out repository code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
        with:
 | 
			
		||||
          fetch-depth: 0
 | 
			
		||||
      - name: Fetch tags
 | 
			
		||||
        run: git fetch --tags -p
 | 
			
		||||
      - uses: actions/setup-java@v4
 | 
			
		||||
        with:
 | 
			
		||||
          distribution: 'temurin'
 | 
			
		||||
          java-version: '17'
 | 
			
		||||
          cache: gradle
 | 
			
		||||
      - uses: gradle/actions/setup-gradle@v3
 | 
			
		||||
      - uses: android-actions/setup-android@v3
 | 
			
		||||
      - name: Configure gradle...
 | 
			
		||||
        run: mkdir -p ~/.gradle && echo "ignoreGitVersion=true" >> ~/.gradle/gradle.properties
 | 
			
		||||
      - uses: KengoTODA/actions-setup-docker-compose@v1
 | 
			
		||||
        with:
 | 
			
		||||
          version: "2.23.3"
 | 
			
		||||
      - name: run selfoss
 | 
			
		||||
        run: |
 | 
			
		||||
          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
 | 
			
		||||
      - name: Set env url
 | 
			
		||||
        run: |
 | 
			
		||||
          export SELFOSS_URL=172.17.0.1:8888
 | 
			
		||||
      # https://github.com/ReactiveCircus/android-emulator-runner/issues/385
 | 
			
		||||
      - name: Kill crashpad_handler processes
 | 
			
		||||
        if: always()
 | 
			
		||||
        run: |
 | 
			
		||||
          pkill -SIGTERM crashpad_handler || true
 | 
			
		||||
          sleep 5
 | 
			
		||||
          pkill -SIGKILL crashpad_handler || true
 | 
			
		||||
      - name: Tests
 | 
			
		||||
        uses: reactivecircus/android-emulator-runner@v2
 | 
			
		||||
        with:
 | 
			
		||||
          api-level: 29
 | 
			
		||||
          script: |
 | 
			
		||||
            ./gradlew androidApp:connectedAndroidTest
 | 
			
		||||
            killall -INT crashpad_handler || true
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        if: failure()
 | 
			
		||||
        with:
 | 
			
		||||
          name: failure-espresso
 | 
			
		||||
          path: build/reports/androidTests/connected/screenshots
 | 
			
		||||
          retention-days: 2
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        with:
 | 
			
		||||
          name: coverage-espresso
 | 
			
		||||
          path: build/reports/coverage/androidTest/githubConfig/debug/connected
 | 
			
		||||
          retention-days: 1
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - name: Clean
 | 
			
		||||
        if: always()
 | 
			
		||||
        run: |
 | 
			
		||||
          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
 | 
			
		||||
@@ -6,16 +6,18 @@ jobs:
 | 
			
		||||
  BuildAndTestAndCoverage:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Check out repository code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
      - uses: actions/checkout@v4
 | 
			
		||||
        with:
 | 
			
		||||
          fetch-depth: 0
 | 
			
		||||
      - name: "Check android app changes"
 | 
			
		||||
        id: check-android-changes
 | 
			
		||||
        uses: tj-actions/changed-files@v45
 | 
			
		||||
        uses: tj-actions/changed-files@v46
 | 
			
		||||
        with:
 | 
			
		||||
          files: |
 | 
			
		||||
            androidApp/src/**
 | 
			
		||||
            shared/src/commonMain/**
 | 
			
		||||
            shared/src/androidMain/**
 | 
			
		||||
            shared/src/commonTest/**
 | 
			
		||||
      - name: Fetch tags
 | 
			
		||||
        if: steps.check-android-changes.outputs.any_modified == 'true'
 | 
			
		||||
        run: git fetch --tags -p
 | 
			
		||||
@@ -24,7 +26,6 @@ jobs:
 | 
			
		||||
        with:
 | 
			
		||||
          distribution: 'temurin'
 | 
			
		||||
          java-version: '17'
 | 
			
		||||
          cache: gradle
 | 
			
		||||
      - uses: gradle/actions/setup-gradle@v3
 | 
			
		||||
        if: steps.check-android-changes.outputs.any_modified == 'true'
 | 
			
		||||
      - uses: android-actions/setup-android@v3
 | 
			
		||||
@@ -34,14 +35,7 @@ jobs:
 | 
			
		||||
        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
 | 
			
		||||
      - name: Build and test
 | 
			
		||||
        if: steps.check-android-changes.outputs.any_modified == 'true'
 | 
			
		||||
        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest # These tests will be done
 | 
			
		||||
      # TESTS ARE RUN LOCALLY
 | 
			
		||||
      #      - uses: KengoTODA/actions-setup-docker-compose@v1
 | 
			
		||||
      #        with:
 | 
			
		||||
      #          version: "2.23.3"
 | 
			
		||||
      #      - name: run selfoss
 | 
			
		||||
      #        run: |
 | 
			
		||||
      #          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
 | 
			
		||||
        run: ./gradlew build -x testReleaseUnitTest -x testDebugUnitTest -x testGithubConfigReleaseUnitTest -x testGithubConfigDebugUnitTest
 | 
			
		||||
      - name: coverage
 | 
			
		||||
        if: steps.check-android-changes.outputs.any_modified == 'true'
 | 
			
		||||
        run: |
 | 
			
		||||
@@ -54,8 +48,3 @@ jobs:
 | 
			
		||||
          retention-days: 1
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
#      TESTS ARE RUN LOCALLY
 | 
			
		||||
#      - name: Clean
 | 
			
		||||
#        if: always()
 | 
			
		||||
#        run: |
 | 
			
		||||
#          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
name: Create tag
 | 
			
		||||
name: Realease
 | 
			
		||||
on:
 | 
			
		||||
  push:
 | 
			
		||||
    branches:
 | 
			
		||||
@@ -7,7 +7,7 @@ on:
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  build:
 | 
			
		||||
    uses: ./.gitea/workflows/common_build.yml
 | 
			
		||||
    uses: ./.gitea/workflows/on_called_build.yml
 | 
			
		||||
  createTagAndChangelog:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    needs: build
 | 
			
		||||
@@ -86,7 +86,6 @@ jobs:
 | 
			
		||||
        with:
 | 
			
		||||
          distribution: 'temurin'
 | 
			
		||||
          java-version: '17'
 | 
			
		||||
          cache: gradle
 | 
			
		||||
      - name: Setup Android SDK
 | 
			
		||||
        uses: android-actions/setup-android@v3
 | 
			
		||||
      - name: Configure gradle...
 | 
			
		||||
 
 | 
			
		||||
@@ -1,162 +1,90 @@
 | 
			
		||||
name: Check PR code
 | 
			
		||||
name: PR
 | 
			
		||||
on:
 | 
			
		||||
  pull_request:
 | 
			
		||||
    branches:
 | 
			
		||||
      - master
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  BuildAndTestAndCoverage:
 | 
			
		||||
  PR:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Check out repository code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
      - uses: actions/setup-java@v4
 | 
			
		||||
        with:
 | 
			
		||||
          distribution: 'temurin'
 | 
			
		||||
          java-version: '17'
 | 
			
		||||
      - name: Install klint
 | 
			
		||||
        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
 | 
			
		||||
      - name: Install detekt
 | 
			
		||||
        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip
 | 
			
		||||
      - name: Linting...
 | 
			
		||||
        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build'
 | 
			
		||||
      - name: Detecting...
 | 
			
		||||
        run: ./detekt-cli-1.23.7/bin/detekt-cli -c detekt.yml --excludes '**/shared/build/**/*.kt'
 | 
			
		||||
  translations:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Check out repository code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
        with:
 | 
			
		||||
          fetch-depth: 0
 | 
			
		||||
      - name: Fetch tags
 | 
			
		||||
        run: git fetch --tags -p
 | 
			
		||||
      - uses: actions/setup-java@v4
 | 
			
		||||
      - name: "Check translations changes"
 | 
			
		||||
        id: check-translations-changes
 | 
			
		||||
        uses: tj-actions/changed-files@v46
 | 
			
		||||
        with:
 | 
			
		||||
          distribution: 'temurin'
 | 
			
		||||
          java-version: '17'
 | 
			
		||||
      - uses: gradle/actions/setup-gradle@v3
 | 
			
		||||
      - uses: android-actions/setup-android@v3
 | 
			
		||||
      - name: Configure gradle...
 | 
			
		||||
        run: mkdir -p ~/.gradle && echo "ignoreGitVersion=true" >> ~/.gradle/gradle.properties
 | 
			
		||||
      - uses: KengoTODA/actions-setup-docker-compose@v1
 | 
			
		||||
          base_sha: ${{ github.event.pull_request.base.sha }}
 | 
			
		||||
          files: |
 | 
			
		||||
            androidApp/src/main/res/values/strings.xml
 | 
			
		||||
      - name: upload translation sources
 | 
			
		||||
        if: steps.check-translations-changes.outputs.any_modified == 'true'
 | 
			
		||||
        uses: crowdin/github-action@v2
 | 
			
		||||
        with:
 | 
			
		||||
          version: "2.23.3"
 | 
			
		||||
      - name: run selfoss
 | 
			
		||||
          config: './.gitea/workflows/assets/crowdin.yml'
 | 
			
		||||
          upload_sources: true
 | 
			
		||||
          upload_translations: false
 | 
			
		||||
          download_translations: false
 | 
			
		||||
          create_pull_request: false
 | 
			
		||||
          push_translations: false
 | 
			
		||||
        env:
 | 
			
		||||
          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
 | 
			
		||||
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 | 
			
		||||
      - name: wait
 | 
			
		||||
        if: steps.check-translations-changes.outputs.any_modified == 'true'
 | 
			
		||||
        run: sleep 10s
 | 
			
		||||
      - name: download translations
 | 
			
		||||
        if: steps.check-translations-changes.outputs.any_modified == 'true'
 | 
			
		||||
        uses: crowdin/github-action@v2
 | 
			
		||||
        with:
 | 
			
		||||
          config: './.gitea/workflows/assets/crowdin.yml'
 | 
			
		||||
          upload_sources: false
 | 
			
		||||
          upload_translations: false
 | 
			
		||||
          download_translations: true
 | 
			
		||||
          create_pull_request: false
 | 
			
		||||
          push_translations: false
 | 
			
		||||
        env:
 | 
			
		||||
          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
 | 
			
		||||
          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 | 
			
		||||
      - name: Check for uncommitted changes
 | 
			
		||||
        if: steps.check-translations-changes.outputs.any_modified == 'true'
 | 
			
		||||
        id: check-changes
 | 
			
		||||
        uses: mskri/check-uncommitted-changes-action@v1.0.1
 | 
			
		||||
      - name: Commit Changes
 | 
			
		||||
        if: steps.check-translations-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
 | 
			
		||||
        run: |
 | 
			
		||||
          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
 | 
			
		||||
      # https://github.com/ReactiveCircus/android-emulator-runner/issues/385
 | 
			
		||||
      - name: Kill crashpad_handler processes
 | 
			
		||||
        if: always()
 | 
			
		||||
        run: |
 | 
			
		||||
          pkill -SIGTERM crashpad_handler || true
 | 
			
		||||
          sleep 5
 | 
			
		||||
          pkill -SIGKILL crashpad_handler || true
 | 
			
		||||
      - name: Change url until I find a better way to do it
 | 
			
		||||
        run: |
 | 
			
		||||
          sed -i "s/val defaultUrl = \"http:\/\/10\.0\.2\.2\:8888\"/val defaultUrl = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
 | 
			
		||||
      - name: Tests
 | 
			
		||||
        uses: reactivecircus/android-emulator-runner@v2
 | 
			
		||||
          git config --global user.email aminecmi+giteadrone@pm.me
 | 
			
		||||
          git config --global user.name giteadrone
 | 
			
		||||
          git add ./androidApp/src/main/res/*
 | 
			
		||||
          git commit -m "translation: translation files"
 | 
			
		||||
      - name: Push changes
 | 
			
		||||
        if: steps.check-translations-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
 | 
			
		||||
        uses: appleboy/git-push-action@v1.0.0
 | 
			
		||||
        with:
 | 
			
		||||
          api-level: 29
 | 
			
		||||
          script: |
 | 
			
		||||
            ./gradlew androidApp:clearScreenshotsTask || true
 | 
			
		||||
            ./gradlew androidApp:createScreenshotDirectory
 | 
			
		||||
            adb logcat -G 16M
 | 
			
		||||
            ./gradlew JacocoDebugCodeCoverage || true
 | 
			
		||||
            ./gradlew androidApp:fetchScreenshots
 | 
			
		||||
            adb logcat 'InputReader:S' 'chatty:S' 'audio_hw_generic:S' '*:I' -d > ./androidApp/build/reports/androidTests/connected/screenshots/logs.txt
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        if: always()
 | 
			
		||||
        with:
 | 
			
		||||
          name: screenshot-espresso
 | 
			
		||||
          path: androidApp/build/reports/androidTests/connected/screenshots
 | 
			
		||||
          retention-days: 2
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        if: always()
 | 
			
		||||
        with:
 | 
			
		||||
          name: result-espresso
 | 
			
		||||
          path: androidApp/build/reports/androidTests/connected/debug/flavors/githubConfig
 | 
			
		||||
          retention-days: 1
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        with:
 | 
			
		||||
          name: coverage-espresso
 | 
			
		||||
          path: androidApp/build/reports/jacoco/JacocoDebugCodeCoverage
 | 
			
		||||
          retention-days: 1
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - name: Clean
 | 
			
		||||
        if: always()
 | 
			
		||||
        run: |
 | 
			
		||||
          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
 | 
			
		||||
 | 
			
		||||
#  Lint:
 | 
			
		||||
#    runs-on: ubuntu-latest
 | 
			
		||||
#    steps:
 | 
			
		||||
#      - name: Check out repository code
 | 
			
		||||
#        uses: actions/checkout@v4
 | 
			
		||||
#      - uses: actions/setup-java@v4
 | 
			
		||||
#        with:
 | 
			
		||||
#          distribution: 'temurin'
 | 
			
		||||
#          java-version: '17'
 | 
			
		||||
#          cache: gradle
 | 
			
		||||
#      - name: Install klint
 | 
			
		||||
#        run: curl -sSLO https://github.com/pinterest/ktlint/releases/download/1.5.0/ktlint && chmod a+x ktlint && mv ktlint /usr/local/bin/
 | 
			
		||||
#      - name: Install detekt
 | 
			
		||||
#        run: curl -sSLO https://github.com/detekt/detekt/releases/download/v1.23.7/detekt-cli-1.23.7.zip && unzip detekt-cli-1.23.7.zip
 | 
			
		||||
#      - name: Linting...
 | 
			
		||||
#        run: ktlint 'shared/**/*.kt' 'androidApp/**/*.kt' '!shared/build'
 | 
			
		||||
#      - name: Detecting...
 | 
			
		||||
#        run: ./detekt-cli-1.23.7/bin/detekt-cli -c detekt.yml --excludes '**/shared/build/**/*.kt'
 | 
			
		||||
#  translations:
 | 
			
		||||
#    runs-on: ubuntu-latest
 | 
			
		||||
#    steps:
 | 
			
		||||
#      - name: Check out repository code
 | 
			
		||||
#        uses: actions/checkout@v4
 | 
			
		||||
#        with:
 | 
			
		||||
#          fetch-depth: 0
 | 
			
		||||
#      - name: "Check translations changes"
 | 
			
		||||
#        id: check-translations-changes
 | 
			
		||||
#        uses: tj-actions/changed-files@v45
 | 
			
		||||
#        with:
 | 
			
		||||
#          files: |
 | 
			
		||||
#            androidApp/src/main/res/values/strings.xml
 | 
			
		||||
#      - name: upload translation sources
 | 
			
		||||
#        if: steps.check-api-changes.outputs.any_modified == 'true'
 | 
			
		||||
#        uses: crowdin/github-action@v2
 | 
			
		||||
#        with:
 | 
			
		||||
#          config: './.gitea/workflows/assets/crowdin.yml'
 | 
			
		||||
#          upload_sources: true
 | 
			
		||||
#          upload_translations: false
 | 
			
		||||
#          download_translations: false
 | 
			
		||||
#          create_pull_request: false
 | 
			
		||||
#          push_translations: false
 | 
			
		||||
#        env:
 | 
			
		||||
#          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
 | 
			
		||||
#          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 | 
			
		||||
#      - name: wait
 | 
			
		||||
#        if: steps.check-api-changes.outputs.any_modified == 'true'
 | 
			
		||||
#        run: sleep 10s
 | 
			
		||||
#      - name: download translations
 | 
			
		||||
#        if: steps.check-api-changes.outputs.any_modified == 'true'
 | 
			
		||||
#        uses: crowdin/github-action@v2
 | 
			
		||||
#        with:
 | 
			
		||||
#          config: './.gitea/workflows/assets/crowdin.yml'
 | 
			
		||||
#          upload_sources: false
 | 
			
		||||
#          upload_translations: false
 | 
			
		||||
#          download_translations: true
 | 
			
		||||
#          create_pull_request: false
 | 
			
		||||
#          push_translations: false
 | 
			
		||||
#        env:
 | 
			
		||||
#          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
 | 
			
		||||
#          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
 | 
			
		||||
#      - name: Check for uncommitted changes
 | 
			
		||||
#        if: steps.check-api-changes.outputs.any_modified == 'true'
 | 
			
		||||
#        id: check-changes
 | 
			
		||||
#        uses: mskri/check-uncommitted-changes-action@v1.0.1
 | 
			
		||||
#      - name: Commit Changes
 | 
			
		||||
#        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
 | 
			
		||||
#        run: |
 | 
			
		||||
#          git config --global user.email aminecmi+giteadrone@pm.me
 | 
			
		||||
#          git config --global user.name giteadrone
 | 
			
		||||
#          git add ./androidApp/src/main/res/*
 | 
			
		||||
#          git commit -m "translation: translation files"
 | 
			
		||||
#      - name: Push changes
 | 
			
		||||
#        if: steps.check-api-changes.outputs.any_modified == 'true' && steps.check-changes.outputs.changes != ''
 | 
			
		||||
#        uses: appleboy/git-push-action@v1.0.0
 | 
			
		||||
#        with:
 | 
			
		||||
#          author_name: giteadrone
 | 
			
		||||
#          author_email: aminecmi+giteadrone@pm.me
 | 
			
		||||
#          remote: ${{ secrets.REMOTE_URL }}
 | 
			
		||||
#          ssh_key: ${{ secrets.PRIVATE_KEY }}
 | 
			
		||||
#          branch: ${{ github.head_ref || github.ref_name }}
 | 
			
		||||
#  build:
 | 
			
		||||
#    needs: Lint
 | 
			
		||||
#    uses: ./.gitea/workflows/common_build.yml
 | 
			
		||||
          author_name: giteadrone
 | 
			
		||||
          author_email: aminecmi+giteadrone@pm.me
 | 
			
		||||
          remote: ${{ secrets.REMOTE_URL }}
 | 
			
		||||
          ssh_key: ${{ secrets.PRIVATE_KEY }}
 | 
			
		||||
          branch: ${{ github.head_ref || github.ref_name }}
 | 
			
		||||
  build:
 | 
			
		||||
    needs: Lint
 | 
			
		||||
    uses: ./.gitea/workflows/on_called_build.yml
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										67
									
								
								.gitea/workflows/on_pr_test.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										67
									
								
								.gitea/workflows/on_pr_test.yml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,67 @@
 | 
			
		||||
name: PR test
 | 
			
		||||
on:
 | 
			
		||||
  pull_request:
 | 
			
		||||
    branches:
 | 
			
		||||
      - master
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  integrationTests:
 | 
			
		||||
    runs-on: ubuntu-latest
 | 
			
		||||
    steps:
 | 
			
		||||
      - name: Check out repository code
 | 
			
		||||
        uses: actions/checkout@v4
 | 
			
		||||
        with:
 | 
			
		||||
          fetch-depth: 0
 | 
			
		||||
      - name: Fetch tags
 | 
			
		||||
        run: git fetch --tags -p
 | 
			
		||||
      - uses: KengoTODA/actions-setup-docker-compose@v1
 | 
			
		||||
        with:
 | 
			
		||||
          version: "2.23.3"
 | 
			
		||||
      - name: run selfoss
 | 
			
		||||
        run: |
 | 
			
		||||
          docker compose -f .gitea/workflows/assets/docker-compose.yml up -d
 | 
			
		||||
      - uses: actions/setup-java@v4
 | 
			
		||||
        with:
 | 
			
		||||
          distribution: 'temurin'
 | 
			
		||||
          java-version: '17'
 | 
			
		||||
      - uses: gradle/actions/setup-gradle@v3
 | 
			
		||||
      - uses: android-actions/setup-android@v3
 | 
			
		||||
      - name: Configure gradle...
 | 
			
		||||
        run: mkdir -p ~/.gradle && echo "org.gradle.daemon=false\nignoreGitVersion=true" >> ~/.gradle/gradle.properties
 | 
			
		||||
      - name: Change url until I find a better way to do it
 | 
			
		||||
        run: |
 | 
			
		||||
          sed -i "s/const val DEFAULT_URL = \"http:\/\/10\.0\.2\.2\:8888\"/const val DEFAULT_URL = \"http:\/\/172\.17\.0\.1\:8888\"/g" ./androidApp/src/androidTest/kotlin/bou/amine/apps/readerforselfossv2/android/CommonTests.kt
 | 
			
		||||
      - name: Tests
 | 
			
		||||
        uses: reactivecircus/android-emulator-runner@v2
 | 
			
		||||
        with:
 | 
			
		||||
          api-level: 29
 | 
			
		||||
          profile: pixel_2
 | 
			
		||||
          script: |
 | 
			
		||||
            ./gradlew androidApp:clearScreenshotsTask || true
 | 
			
		||||
            ./gradlew androidApp:createScreenshotDirectory
 | 
			
		||||
            adb logcat -G 16M
 | 
			
		||||
            ./gradlew JacocoDebugCodeCoverage || (./gradlew androidApp:fetchScreenshots && adb logcat 'InputReader:S' 'chatty:S' 'audio_hw_generic:S' 'LogApiCalls:D' '*:I' -d > ./androidApp/build/reports/androidTests/connected/screenshots/logs.txt)
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        with:
 | 
			
		||||
          name: screenshot-espresso
 | 
			
		||||
          path: androidApp/build/reports/androidTests/connected/screenshots
 | 
			
		||||
          retention-days: 2
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        with:
 | 
			
		||||
          path: androidApp/build/reports/androidTests/connected/debug/flavors/githubConfig
 | 
			
		||||
          retention-days: 1
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - uses: actions/upload-artifact@v3
 | 
			
		||||
        with:
 | 
			
		||||
          name: coverage-espresso
 | 
			
		||||
          path: androidApp/build/reports/jacoco/JacocoDebugCodeCoverage
 | 
			
		||||
          retention-days: 1
 | 
			
		||||
          overwrite: true
 | 
			
		||||
          include-hidden-files: true
 | 
			
		||||
      - name: Clean
 | 
			
		||||
        if: always()
 | 
			
		||||
        run: |
 | 
			
		||||
          docker compose -f .gitea/workflows/assets/docker-compose.yml stop
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
name: Check master code
 | 
			
		||||
name: Master
 | 
			
		||||
on:
 | 
			
		||||
  push:
 | 
			
		||||
    branches:
 | 
			
		||||
@@ -6,4 +6,4 @@ on:
 | 
			
		||||
 | 
			
		||||
jobs:
 | 
			
		||||
  build:
 | 
			
		||||
    uses: ./.gitea/workflows/common_build.yml
 | 
			
		||||
    uses: ./.gitea/workflows/on_called_build.yml
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										27
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						
									
										27
									
								
								CHANGELOG.md
									
									
									
									
									
								
							@@ -1,3 +1,30 @@
 | 
			
		||||
**v125040991
 | 
			
		||||
 | 
			
		||||
- fix: Connectivity toast message was causing issues.
 | 
			
		||||
- Changelog for v125030901
 | 
			
		||||
 | 
			
		||||
--------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
**v125030901
 | 
			
		||||
 | 
			
		||||
- Merge pull request 'fix-reload' (#195) from fix-reload into master
 | 
			
		||||
- fix: Infinite scroll needs loading stats.
 | 
			
		||||
- fix: do not reload items on resume.
 | 
			
		||||
- Merge pull request 'tests' (#193) from tests into master
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- chore: better handling of coroutine dispatchers.
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- chore: comment robolectric tests for now.
 | 
			
		||||
- fix: Fixed source deletion test.
 | 
			
		||||
- Merge pull request 'Fix alignment changes resetting reader article position' (#190) from davidoskky/ReaderForSelfoss-multiplatform:alignment into master
 | 
			
		||||
- Refactor star icon handling
 | 
			
		||||
- Don't restart activity changing alignment
 | 
			
		||||
- Changelog for v125030711
 | 
			
		||||
 | 
			
		||||
--------------------------------------------------------------------
 | 
			
		||||
 | 
			
		||||
**v125030711
 | 
			
		||||
 | 
			
		||||
- Merge pull request 'fix: initial status loading issues.' (#192) from connectivity into master
 | 
			
		||||
 
 | 
			
		||||
@@ -93,5 +93,6 @@ class `1-LoginActivityTest` : WithANRException() {
 | 
			
		||||
        performLogin()
 | 
			
		||||
        onView(withText(R.string.gdpr_dialog_title)).check(matches(isDisplayed()))
 | 
			
		||||
        onView(withText("OK")).perform(click())
 | 
			
		||||
        checkHomeLoadingDone()
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,7 @@
 | 
			
		||||
package bou.amine.apps.readerforselfossv2.android
 | 
			
		||||
 | 
			
		||||
import androidx.test.espresso.Espresso.onView
 | 
			
		||||
import androidx.test.espresso.IdlingRegistry
 | 
			
		||||
import androidx.test.espresso.action.ViewActions
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.click
 | 
			
		||||
import androidx.test.espresso.assertion.ViewAssertions.matches
 | 
			
		||||
@@ -14,7 +15,9 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 | 
			
		||||
import androidx.test.ext.junit.rules.ActivityScenarioRule
 | 
			
		||||
import androidx.test.ext.junit.runners.AndroidJUnit4
 | 
			
		||||
import androidx.test.filters.LargeTest
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import org.hamcrest.CoreMatchers.not
 | 
			
		||||
import org.junit.Before
 | 
			
		||||
import org.junit.FixMethodOrder
 | 
			
		||||
import org.junit.Rule
 | 
			
		||||
import org.junit.Test
 | 
			
		||||
@@ -29,6 +32,14 @@ class `2-HomeActivityTest` : WithANRException() {
 | 
			
		||||
    @get:Rule
 | 
			
		||||
    val activityRule = ActivityScenarioRule(HomeActivity::class.java)
 | 
			
		||||
 | 
			
		||||
    @Before
 | 
			
		||||
    fun registerIdlingResource() {
 | 
			
		||||
        IdlingRegistry
 | 
			
		||||
            .getInstance()
 | 
			
		||||
            .register(CountingIdlingResourceSingleton.countingIdlingResource)
 | 
			
		||||
        checkHomeLoadingDone()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Test
 | 
			
		||||
    fun testMenu() {
 | 
			
		||||
        onView(withId(R.id.action_search)).check(matches(isDisplayed())).check(
 | 
			
		||||
 
 | 
			
		||||
@@ -2,14 +2,17 @@ package bou.amine.apps.readerforselfossv2.android
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import androidx.test.espresso.Espresso.onView
 | 
			
		||||
import androidx.test.espresso.IdlingRegistry
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.click
 | 
			
		||||
import androidx.test.espresso.assertion.ViewAssertions.matches
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.isRoot
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.isSelected
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.withText
 | 
			
		||||
import androidx.test.ext.junit.rules.ActivityScenarioRule
 | 
			
		||||
import androidx.test.ext.junit.runners.AndroidJUnit4
 | 
			
		||||
import androidx.test.filters.LargeTest
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import org.hamcrest.CoreMatchers.allOf
 | 
			
		||||
import org.hamcrest.CoreMatchers.not
 | 
			
		||||
import org.junit.Before
 | 
			
		||||
@@ -31,6 +34,9 @@ class `3-SettingsActivityTest` : WithANRException() {
 | 
			
		||||
        activityRule.scenario.onActivity { activity ->
 | 
			
		||||
            context = activity.window.context
 | 
			
		||||
        }
 | 
			
		||||
        IdlingRegistry
 | 
			
		||||
            .getInstance()
 | 
			
		||||
            .register(CountingIdlingResourceSingleton.countingIdlingResource)
 | 
			
		||||
        openMenu()
 | 
			
		||||
        onView(withText(R.string.title_activity_settings)).perform(click())
 | 
			
		||||
    }
 | 
			
		||||
@@ -91,6 +97,7 @@ class `3-SettingsActivityTest` : WithANRException() {
 | 
			
		||||
    @Test
 | 
			
		||||
    fun testAbout() {
 | 
			
		||||
        onView(withText(R.string.action_about)).perform(click())
 | 
			
		||||
        onView(isRoot()).perform(waitUntilShown("ACRA", 30000))
 | 
			
		||||
        onView(withText("ACRA")).check(matches(isDisplayed()))
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,7 @@ package bou.amine.apps.readerforselfossv2.android
 | 
			
		||||
import androidx.test.core.app.ApplicationProvider
 | 
			
		||||
import androidx.test.espresso.Espresso.onView
 | 
			
		||||
import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 | 
			
		||||
import androidx.test.espresso.IdlingRegistry
 | 
			
		||||
import androidx.test.espresso.action.ViewActions
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.click
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.replaceText
 | 
			
		||||
@@ -19,6 +20,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 | 
			
		||||
import androidx.test.ext.junit.rules.ActivityScenarioRule
 | 
			
		||||
import androidx.test.ext.junit.runners.AndroidJUnit4
 | 
			
		||||
import androidx.test.filters.LargeTest
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import org.hamcrest.CoreMatchers.allOf
 | 
			
		||||
import org.hamcrest.CoreMatchers.not
 | 
			
		||||
import org.junit.Before
 | 
			
		||||
@@ -38,6 +40,9 @@ class `4-SettingsActivityGeneralTest` : WithANRException() {
 | 
			
		||||
 | 
			
		||||
    @Before
 | 
			
		||||
    fun init() {
 | 
			
		||||
        IdlingRegistry
 | 
			
		||||
            .getInstance()
 | 
			
		||||
            .register(CountingIdlingResourceSingleton.countingIdlingResource)
 | 
			
		||||
        openActionBarOverflowOrOptionsMenu(
 | 
			
		||||
            ApplicationProvider.getApplicationContext(),
 | 
			
		||||
        )
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import androidx.test.espresso.Espresso.onView
 | 
			
		||||
import androidx.test.espresso.IdlingRegistry
 | 
			
		||||
import androidx.test.espresso.action.ViewActions
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.click
 | 
			
		||||
import androidx.test.espresso.assertion.ViewAssertions.matches
 | 
			
		||||
@@ -13,6 +14,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 | 
			
		||||
import androidx.test.ext.junit.runners.AndroidJUnit4
 | 
			
		||||
import androidx.test.filters.LargeTest
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import org.hamcrest.CoreMatchers.allOf
 | 
			
		||||
import org.hamcrest.CoreMatchers.not
 | 
			
		||||
import org.junit.After
 | 
			
		||||
@@ -35,6 +37,9 @@ class `5-SettingsActivityReaderTest` : WithANRException() {
 | 
			
		||||
        activityRule.scenario.onActivity { activity ->
 | 
			
		||||
            context = activity.window.context
 | 
			
		||||
        }
 | 
			
		||||
        IdlingRegistry
 | 
			
		||||
            .getInstance()
 | 
			
		||||
            .register(CountingIdlingResourceSingleton.countingIdlingResource)
 | 
			
		||||
        onView(withText(R.string.pref_header_viewer)).perform(click())
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android
 | 
			
		||||
 | 
			
		||||
import android.content.Context
 | 
			
		||||
import androidx.test.espresso.Espresso.onView
 | 
			
		||||
import androidx.test.espresso.IdlingRegistry
 | 
			
		||||
import androidx.test.espresso.action.ViewActions
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.click
 | 
			
		||||
import androidx.test.espresso.assertion.ViewAssertions.matches
 | 
			
		||||
@@ -15,6 +16,7 @@ import androidx.test.ext.junit.rules.ActivityScenarioRule
 | 
			
		||||
import androidx.test.ext.junit.runners.AndroidJUnit4
 | 
			
		||||
import androidx.test.filters.LargeTest
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import org.hamcrest.CoreMatchers.allOf
 | 
			
		||||
import org.hamcrest.CoreMatchers.not
 | 
			
		||||
import org.junit.After
 | 
			
		||||
@@ -37,6 +39,9 @@ class `6-SettingsActivityOfflineTest` : WithANRException() {
 | 
			
		||||
        activityRule.scenario.onActivity { activity ->
 | 
			
		||||
            context = activity.window.context
 | 
			
		||||
        }
 | 
			
		||||
        IdlingRegistry
 | 
			
		||||
            .getInstance()
 | 
			
		||||
            .register(CountingIdlingResourceSingleton.countingIdlingResource)
 | 
			
		||||
        onView(withText(R.string.pref_header_offline)).perform(click())
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -2,6 +2,7 @@ package bou.amine.apps.readerforselfossv2.android
 | 
			
		||||
 | 
			
		||||
import androidx.test.espresso.AmbiguousViewMatcherException
 | 
			
		||||
import androidx.test.espresso.Espresso.onView
 | 
			
		||||
import androidx.test.espresso.IdlingRegistry
 | 
			
		||||
import androidx.test.espresso.action.ViewActions
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.click
 | 
			
		||||
import androidx.test.espresso.action.ViewActions.swipeDown
 | 
			
		||||
@@ -14,6 +15,7 @@ import androidx.test.espresso.matcher.ViewMatchers.withText
 | 
			
		||||
import androidx.test.ext.junit.rules.ActivityScenarioRule
 | 
			
		||||
import androidx.test.ext.junit.runners.AndroidJUnit4
 | 
			
		||||
import androidx.test.filters.LargeTest
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import org.junit.After
 | 
			
		||||
import org.junit.Before
 | 
			
		||||
import org.junit.Rule
 | 
			
		||||
@@ -32,6 +34,9 @@ class `7-SourcesActivityTest` : WithANRException() {
 | 
			
		||||
 | 
			
		||||
    @Before
 | 
			
		||||
    fun init() {
 | 
			
		||||
        IdlingRegistry
 | 
			
		||||
            .getInstance()
 | 
			
		||||
            .register(CountingIdlingResourceSingleton.countingIdlingResource)
 | 
			
		||||
        sourceName = UUID.randomUUID().toString().substring(0, 15)
 | 
			
		||||
 | 
			
		||||
        goToSources()
 | 
			
		||||
 
 | 
			
		||||
@@ -15,6 +15,7 @@ import androidx.test.espresso.action.ViewActions.typeTextIntoFocusedView
 | 
			
		||||
import androidx.test.espresso.assertion.ViewAssertions.doesNotExist
 | 
			
		||||
import androidx.test.espresso.assertion.ViewAssertions.matches
 | 
			
		||||
import androidx.test.espresso.base.DefaultFailureHandler
 | 
			
		||||
import androidx.test.espresso.matcher.RootMatchers.isDialog
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.isChecked
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.isNotChecked
 | 
			
		||||
@@ -24,6 +25,7 @@ import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
 | 
			
		||||
import androidx.test.uiautomator.UiDevice
 | 
			
		||||
import androidx.test.uiautomator.UiSelector
 | 
			
		||||
import org.hamcrest.CoreMatchers.allOf
 | 
			
		||||
import org.hamcrest.CoreMatchers.not
 | 
			
		||||
import org.hamcrest.Matchers.hasToString
 | 
			
		||||
import org.junit.BeforeClass
 | 
			
		||||
import java.io.BufferedOutputStream
 | 
			
		||||
@@ -33,13 +35,13 @@ import java.io.IOException
 | 
			
		||||
import java.util.Locale
 | 
			
		||||
 | 
			
		||||
// For now, do not move this as it is modified by the integration tests
 | 
			
		||||
val defaultUrl = "http://10.0.2.2:8888"
 | 
			
		||||
const val DEFAULT_URL = "http://10.0.2.2:8888"
 | 
			
		||||
 | 
			
		||||
fun performLogin(someUrl: String? = null) {
 | 
			
		||||
    Log.i("AUTOMATION", "The url used will be ${if (!someUrl.isNullOrEmpty()) someUrl else defaultUrl}")
 | 
			
		||||
    Log.i("AUTOMATION", "The url used will be ${if (!someUrl.isNullOrEmpty()) someUrl else DEFAULT_URL}")
 | 
			
		||||
    onView(withId(R.id.urlView)).perform(click()).perform(
 | 
			
		||||
        typeTextIntoFocusedView(
 | 
			
		||||
            if (!someUrl.isNullOrEmpty()) someUrl else defaultUrl,
 | 
			
		||||
            if (!someUrl.isNullOrEmpty()) someUrl else DEFAULT_URL,
 | 
			
		||||
        ),
 | 
			
		||||
    )
 | 
			
		||||
    onView(withId(R.id.signInButton)).perform(click())
 | 
			
		||||
@@ -139,6 +141,10 @@ fun testAddSourceWithUrl(
 | 
			
		||||
    onView(withText(sourceName)).check(matches(isDisplayed()))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun checkHomeLoadingDone() {
 | 
			
		||||
    onView(withId(R.id.swipeRefreshLayout)).inRoot(not(isDialog())).perform(waitForRecyclerViewToStopLoading(300000))
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@Suppress("detekt:UtilityClassWithPublicConstructor")
 | 
			
		||||
open class WithANRException {
 | 
			
		||||
    companion object {
 | 
			
		||||
@@ -154,7 +160,7 @@ open class WithANRException {
 | 
			
		||||
                    "default root matcher, it may be picking a root that never takes focus. " +
 | 
			
		||||
                    "Root:",
 | 
			
		||||
            )
 | 
			
		||||
        private val otherException = "System Ul isn't responding"
 | 
			
		||||
        private const val OTHER_EXCEPTION = "System Ul isn't responding"
 | 
			
		||||
 | 
			
		||||
        private fun handleAnrDialogue() {
 | 
			
		||||
            val device = UiDevice.getInstance(getInstrumentation())
 | 
			
		||||
@@ -169,7 +175,7 @@ open class WithANRException {
 | 
			
		||||
            Espresso.setFailureHandler { error, viewMatcher ->
 | 
			
		||||
 | 
			
		||||
                takeScreenshot()
 | 
			
		||||
                if (error.message!!.contains(otherException)) {
 | 
			
		||||
                if (error.message!!.contains(OTHER_EXCEPTION)) {
 | 
			
		||||
                    handleAnrDialogue()
 | 
			
		||||
                } else if (error.message!!.contains(rootViewWithoutFocusExceptionMsg) &&
 | 
			
		||||
                    anrCount < 20
 | 
			
		||||
@@ -186,6 +192,7 @@ open class WithANRException {
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@Suppress("detekt:NestedBlockDepth")
 | 
			
		||||
fun takeScreenshot() {
 | 
			
		||||
    try {
 | 
			
		||||
        val bitmap = getInstrumentation().uiAutomation.takeScreenshot()
 | 
			
		||||
 
 | 
			
		||||
@@ -8,22 +8,32 @@ import android.widget.RelativeLayout
 | 
			
		||||
import androidx.annotation.DrawableRes
 | 
			
		||||
import androidx.annotation.StringRes
 | 
			
		||||
import androidx.core.graphics.drawable.toBitmap
 | 
			
		||||
import androidx.core.view.isVisible
 | 
			
		||||
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 | 
			
		||||
import androidx.test.core.app.ApplicationProvider
 | 
			
		||||
import androidx.test.espresso.Espresso.openActionBarOverflowOrOptionsMenu
 | 
			
		||||
import androidx.test.espresso.PerformException
 | 
			
		||||
import androidx.test.espresso.Root
 | 
			
		||||
import androidx.test.espresso.UiController
 | 
			
		||||
import androidx.test.espresso.ViewAction
 | 
			
		||||
import androidx.test.espresso.matcher.RootMatchers.isPlatformPopup
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.hasSibling
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.isRoot
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.withChild
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.withClassName
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.withId
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.withParent
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.withResourceName
 | 
			
		||||
import androidx.test.espresso.matcher.ViewMatchers.withText
 | 
			
		||||
import androidx.test.espresso.util.HumanReadables
 | 
			
		||||
import androidx.test.espresso.util.TreeIterables
 | 
			
		||||
import org.hamcrest.CoreMatchers.allOf
 | 
			
		||||
import org.hamcrest.CoreMatchers.any
 | 
			
		||||
import org.hamcrest.Description
 | 
			
		||||
import org.hamcrest.Matcher
 | 
			
		||||
import org.hamcrest.Matchers
 | 
			
		||||
import org.hamcrest.TypeSafeMatcher
 | 
			
		||||
import java.util.concurrent.TimeoutException
 | 
			
		||||
 | 
			
		||||
fun withError(
 | 
			
		||||
    @StringRes id: Int,
 | 
			
		||||
@@ -44,6 +54,86 @@ fun withError(
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun waitUntilShown(
 | 
			
		||||
    viewText: String,
 | 
			
		||||
    millis: Long,
 | 
			
		||||
): ViewAction {
 | 
			
		||||
    return object : ViewAction {
 | 
			
		||||
        override fun getConstraints(): Matcher<View> = isRoot()
 | 
			
		||||
 | 
			
		||||
        override fun getDescription(): String = "wait for $millis millis, for a specific view with text <$viewText> to be visible."
 | 
			
		||||
 | 
			
		||||
        override fun perform(
 | 
			
		||||
            uiController: UiController,
 | 
			
		||||
            view: View,
 | 
			
		||||
        ) {
 | 
			
		||||
            uiController.loopMainThreadUntilIdle()
 | 
			
		||||
            val startTime = System.currentTimeMillis()
 | 
			
		||||
            val endTime = startTime + millis
 | 
			
		||||
            val viewMatcher = withText(viewText)
 | 
			
		||||
 | 
			
		||||
            do {
 | 
			
		||||
                for (child in TreeIterables.breadthFirstViewTraversal(view)) {
 | 
			
		||||
                    if (viewMatcher.matches(child) && child.isShown) {
 | 
			
		||||
                        return
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                uiController.loopMainThreadForAtLeast(100)
 | 
			
		||||
            } while (System.currentTimeMillis() < endTime)
 | 
			
		||||
 | 
			
		||||
            // timeout happens
 | 
			
		||||
            throw PerformException
 | 
			
		||||
                .Builder()
 | 
			
		||||
                .withActionDescription(this.description)
 | 
			
		||||
                .withViewDescription(HumanReadables.describe(view))
 | 
			
		||||
                .withCause(TimeoutException())
 | 
			
		||||
                .build()
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun waitForRecyclerViewToStopLoading(millis: Long): ViewAction {
 | 
			
		||||
    return object : ViewAction {
 | 
			
		||||
        override fun getConstraints(): Matcher<View> = any(View::class.java)
 | 
			
		||||
 | 
			
		||||
        override fun getDescription(): String = "wait for  $millis millis for the recyclerview to stop loading."
 | 
			
		||||
 | 
			
		||||
        override fun perform(
 | 
			
		||||
            uiController: UiController,
 | 
			
		||||
            view: View?,
 | 
			
		||||
        ) {
 | 
			
		||||
            uiController.loopMainThreadUntilIdle()
 | 
			
		||||
            val startTime = System.currentTimeMillis()
 | 
			
		||||
            val endTime = startTime + millis
 | 
			
		||||
 | 
			
		||||
            do {
 | 
			
		||||
                // either the empty view is displayed
 | 
			
		||||
                for (child in TreeIterables.breadthFirstViewTraversal(view)) {
 | 
			
		||||
                    // found view with required ID
 | 
			
		||||
                    if (withId(R.id.emptyText).matches(child) && child.isVisible) {
 | 
			
		||||
                        return
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
 | 
			
		||||
                // or the refresh layout is refreshing
 | 
			
		||||
                if (view is SwipeRefreshLayout && !view.isRefreshing) {
 | 
			
		||||
                    return
 | 
			
		||||
                }
 | 
			
		||||
                uiController.loopMainThreadForAtLeast(100)
 | 
			
		||||
            } while (System.currentTimeMillis() < endTime)
 | 
			
		||||
 | 
			
		||||
            // timeout happens
 | 
			
		||||
            throw PerformException
 | 
			
		||||
                .Builder()
 | 
			
		||||
                .withActionDescription(this.description)
 | 
			
		||||
                .withViewDescription(HumanReadables.describe(view))
 | 
			
		||||
                .withCause(TimeoutException())
 | 
			
		||||
                .build()
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
fun isPopupWindow(): Matcher<Root> = isPlatformPopup()
 | 
			
		||||
 | 
			
		||||
fun withDrawable(
 | 
			
		||||
 
 | 
			
		||||
@@ -120,6 +120,7 @@ class HomeActivity :
 | 
			
		||||
        binding.swipeRefreshLayout.setOnRefreshListener {
 | 
			
		||||
            repository.offlineOverride = false
 | 
			
		||||
            lastFetchDone = false
 | 
			
		||||
            items.clear()
 | 
			
		||||
            getElementsAccordingToTab()
 | 
			
		||||
            binding.swipeRefreshLayout.isRefreshing = false
 | 
			
		||||
        }
 | 
			
		||||
@@ -386,6 +387,7 @@ class HomeActivity :
 | 
			
		||||
                    lastFetchDone = false
 | 
			
		||||
 | 
			
		||||
                    elementsShown = ItemType.fromInt(position + 1)
 | 
			
		||||
                    items = ArrayList()
 | 
			
		||||
                    getElementsAccordingToTab()
 | 
			
		||||
                    binding.recyclerView.scrollToPosition(0)
 | 
			
		||||
 | 
			
		||||
@@ -458,23 +460,28 @@ class HomeActivity :
 | 
			
		||||
        appendResults: Boolean,
 | 
			
		||||
        itemType: ItemType,
 | 
			
		||||
    ) {
 | 
			
		||||
        CountingIdlingResourceSingleton.increment()
 | 
			
		||||
        binding.swipeRefreshLayout.isRefreshing = true
 | 
			
		||||
        CoroutineScope(Dispatchers.IO).launch {
 | 
			
		||||
            repository.displayedItems = itemType
 | 
			
		||||
            items =
 | 
			
		||||
                if (appendResults) {
 | 
			
		||||
                    repository.getOlderItems()
 | 
			
		||||
                } else {
 | 
			
		||||
                    repository.getNewerItems()
 | 
			
		||||
                }
 | 
			
		||||
        @Suppress("detekt:ComplexCondition")
 | 
			
		||||
        if ((appendResults && items.size > 0) || (!appendResults && items.size == 0)) {
 | 
			
		||||
            CountingIdlingResourceSingleton.increment()
 | 
			
		||||
            launch(Dispatchers.Main) {
 | 
			
		||||
                binding.swipeRefreshLayout.isRefreshing = false
 | 
			
		||||
                handleListResult()
 | 
			
		||||
            binding.swipeRefreshLayout.isRefreshing = true
 | 
			
		||||
            CoroutineScope(Dispatchers.IO).launch {
 | 
			
		||||
                repository.displayedItems = itemType
 | 
			
		||||
                items =
 | 
			
		||||
                    if (appendResults) {
 | 
			
		||||
                        repository.getOlderItems()
 | 
			
		||||
                    } else {
 | 
			
		||||
                        repository.getNewerItems()
 | 
			
		||||
                    }
 | 
			
		||||
                CountingIdlingResourceSingleton.increment()
 | 
			
		||||
                launch(Dispatchers.Main) {
 | 
			
		||||
                    binding.swipeRefreshLayout.isRefreshing = false
 | 
			
		||||
                    handleListResult()
 | 
			
		||||
                    CountingIdlingResourceSingleton.decrement()
 | 
			
		||||
                }
 | 
			
		||||
                CountingIdlingResourceSingleton.decrement()
 | 
			
		||||
            }
 | 
			
		||||
            CountingIdlingResourceSingleton.decrement()
 | 
			
		||||
        } else {
 | 
			
		||||
            handleListResult()
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
@@ -534,7 +541,10 @@ class HomeActivity :
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    private fun reloadBadges() {
 | 
			
		||||
        if (appSettingsService.isDisplayUnreadCountEnabled() || appSettingsService.isDisplayAllCountEnabled()) {
 | 
			
		||||
        if (appSettingsService.isInfiniteLoadingEnabled() ||
 | 
			
		||||
            appSettingsService.isDisplayUnreadCountEnabled() ||
 | 
			
		||||
            appSettingsService.isDisplayAllCountEnabled()
 | 
			
		||||
        ) {
 | 
			
		||||
            CountingIdlingResourceSingleton.increment()
 | 
			
		||||
            CoroutineScope(Dispatchers.IO).launch {
 | 
			
		||||
                repository.reloadBadges()
 | 
			
		||||
 
 | 
			
		||||
@@ -132,6 +132,7 @@ class LoginActivity :
 | 
			
		||||
        showProgress(false)
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    @Suppress("detekt:LongMethod")
 | 
			
		||||
    private fun attemptLogin() {
 | 
			
		||||
        // Reset errors.
 | 
			
		||||
        binding.urlView.error = null
 | 
			
		||||
@@ -310,6 +311,7 @@ class LoginActivity :
 | 
			
		||||
                    .withAboutSpecial2Description(AppSettingsService.BUG_URL)
 | 
			
		||||
                    .withAboutSpecial1("Project Page")
 | 
			
		||||
                    .withAboutSpecial1Description(AppSettingsService.SOURCE_URL)
 | 
			
		||||
                    .withShowLoadingProgress(false)
 | 
			
		||||
                    .start(this)
 | 
			
		||||
                true
 | 
			
		||||
            }
 | 
			
		||||
 
 | 
			
		||||
@@ -82,13 +82,14 @@ class MyApp :
 | 
			
		||||
                        } else {
 | 
			
		||||
                            R.string.network_connectivity_lost
 | 
			
		||||
                        }
 | 
			
		||||
 | 
			
		||||
                    Toast
 | 
			
		||||
                        .makeText(
 | 
			
		||||
                            applicationContext,
 | 
			
		||||
                            toastMessage,
 | 
			
		||||
                            Toast.LENGTH_SHORT,
 | 
			
		||||
                        ).show()
 | 
			
		||||
                    launch(Dispatchers.Main) {
 | 
			
		||||
                        Toast
 | 
			
		||||
                            .makeText(
 | 
			
		||||
                                applicationContext,
 | 
			
		||||
                                toastMessage,
 | 
			
		||||
                                Toast.LENGTH_SHORT,
 | 
			
		||||
                            ).show()
 | 
			
		||||
                    }
 | 
			
		||||
                }
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
 
 | 
			
		||||
@@ -50,6 +50,7 @@ class SourcesActivity :
 | 
			
		||||
 | 
			
		||||
    override fun onResume() {
 | 
			
		||||
        super.onResume()
 | 
			
		||||
        CountingIdlingResourceSingleton.increment()
 | 
			
		||||
        val mLayoutManager = LinearLayoutManager(this)
 | 
			
		||||
 | 
			
		||||
        var items: ArrayList<SelfossModel.SourceDetail>
 | 
			
		||||
@@ -57,7 +58,6 @@ class SourcesActivity :
 | 
			
		||||
        binding.recyclerView.setHasFixedSize(true)
 | 
			
		||||
        binding.recyclerView.layoutManager = mLayoutManager
 | 
			
		||||
 | 
			
		||||
        CountingIdlingResourceSingleton.increment()
 | 
			
		||||
        CoroutineScope(Dispatchers.IO).launch {
 | 
			
		||||
            val response = repository.getSourcesDetails()
 | 
			
		||||
            CountingIdlingResourceSingleton.increment()
 | 
			
		||||
 
 | 
			
		||||
@@ -30,7 +30,7 @@ import org.kodein.di.instance
 | 
			
		||||
 | 
			
		||||
class ItemCardAdapter(
 | 
			
		||||
    override val app: Activity,
 | 
			
		||||
    override val items: ArrayList<SelfossModel.Item>,
 | 
			
		||||
    override var items: ArrayList<SelfossModel.Item>,
 | 
			
		||||
    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 | 
			
		||||
) : ItemsAdapter<ItemCardAdapter.ViewHolder>() {
 | 
			
		||||
    override lateinit var binding: CardItemBinding
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,7 @@ import org.kodein.di.instance
 | 
			
		||||
 | 
			
		||||
class ItemListAdapter(
 | 
			
		||||
    override val app: Activity,
 | 
			
		||||
    override val items: ArrayList<SelfossModel.Item>,
 | 
			
		||||
    override var items: ArrayList<SelfossModel.Item>,
 | 
			
		||||
    override val updateHomeItems: (ArrayList<SelfossModel.Item>) -> Unit,
 | 
			
		||||
) : ItemsAdapter<ItemListAdapter.ViewHolder>() {
 | 
			
		||||
    override lateinit var binding: ListItemBinding
 | 
			
		||||
 
 | 
			
		||||
@@ -21,7 +21,7 @@ import org.kodein.di.DIAware
 | 
			
		||||
abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
 | 
			
		||||
    RecyclerView.Adapter<VH>(),
 | 
			
		||||
    DIAware {
 | 
			
		||||
    abstract val items: ArrayList<SelfossModel.Item>
 | 
			
		||||
    abstract var items: ArrayList<SelfossModel.Item>
 | 
			
		||||
    abstract val repository: Repository
 | 
			
		||||
    abstract val binding: ViewBinding
 | 
			
		||||
    abstract val appSettingsService: AppSettingsService
 | 
			
		||||
@@ -31,8 +31,7 @@ abstract class ItemsAdapter<VH : RecyclerView.ViewHolder?> :
 | 
			
		||||
    protected val c: Context get() = app.baseContext
 | 
			
		||||
 | 
			
		||||
    fun updateAllItems(items: ArrayList<SelfossModel.Item>) {
 | 
			
		||||
        this.items.clear()
 | 
			
		||||
        this.items.addAll(items)
 | 
			
		||||
        this.items = items
 | 
			
		||||
        updateHomeItems(items)
 | 
			
		||||
        notifyDataSetChanged()
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -12,6 +12,7 @@ import androidx.recyclerview.widget.RecyclerView
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.R
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.UpsertSourceActivity
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.databinding.SourceListItemBinding
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.circularDrawable
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.model.SelfossModel
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.repository.Repository
 | 
			
		||||
@@ -104,8 +105,10 @@ class SourcesListAdapter(
 | 
			
		||||
            source: SelfossModel.SourceDetail,
 | 
			
		||||
            position: Int,
 | 
			
		||||
        ) {
 | 
			
		||||
            CountingIdlingResourceSingleton.increment()
 | 
			
		||||
            CoroutineScope(Dispatchers.IO).launch {
 | 
			
		||||
                val successfullyDeletedSource = repository.deleteSource(source.id, source.title)
 | 
			
		||||
                CountingIdlingResourceSingleton.increment()
 | 
			
		||||
                launch(Dispatchers.Main) {
 | 
			
		||||
                    if (successfullyDeletedSource) {
 | 
			
		||||
                        items.removeAt(position)
 | 
			
		||||
@@ -119,7 +122,9 @@ class SourcesListAdapter(
 | 
			
		||||
                                Toast.LENGTH_SHORT,
 | 
			
		||||
                            ).show()
 | 
			
		||||
                    }
 | 
			
		||||
                    CountingIdlingResourceSingleton.decrement()
 | 
			
		||||
                }
 | 
			
		||||
                CountingIdlingResourceSingleton.decrement()
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
 
 | 
			
		||||
@@ -14,6 +14,7 @@ import android.view.ViewGroup
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.HomeActivity
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.R
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.databinding.FilterFragmentBinding
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.testing.CountingIdlingResourceSingleton
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.utils.acra.sendSilentlyWithAcraWithName
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.utils.glide.imageIntoViewTarget
 | 
			
		||||
import bou.amine.apps.readerforselfossv2.android.utils.maybeIfContext
 | 
			
		||||
@@ -59,12 +60,14 @@ class FilterSheetFragment :
 | 
			
		||||
            )
 | 
			
		||||
 | 
			
		||||
        try {
 | 
			
		||||
            CountingIdlingResourceSingleton.increment()
 | 
			
		||||
            CoroutineScope(Dispatchers.Main).launch {
 | 
			
		||||
                handleTagChips()
 | 
			
		||||
                handleSourceChips()
 | 
			
		||||
 | 
			
		||||
                binding.progressBar2.visibility = GONE
 | 
			
		||||
                binding.filterView.visibility = VISIBLE
 | 
			
		||||
                CountingIdlingResourceSingleton.decrement()
 | 
			
		||||
            }
 | 
			
		||||
        } catch (e: IllegalStateException) {
 | 
			
		||||
            dismiss()
 | 
			
		||||
 
 | 
			
		||||
@@ -124,6 +124,7 @@ class SettingsActivity :
 | 
			
		||||
                        LibsBuilder()
 | 
			
		||||
                            .withAboutIconShown(true)
 | 
			
		||||
                            .withAboutVersionShown(true)
 | 
			
		||||
                            .withShowLoadingProgress(false)
 | 
			
		||||
                            .start(it)
 | 
			
		||||
                    }
 | 
			
		||||
                    true
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										17
									
								
								fastlane/metadata/android/en-US/changelogs/v125030901.txt
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										17
									
								
								fastlane/metadata/android/en-US/changelogs/v125030901.txt
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,17 @@
 | 
			
		||||
**v125030901**
 | 
			
		||||
 | 
			
		||||
- Merge pull request 'fix-reload' (#195) from fix-reload into master
 | 
			
		||||
- fix: Infinite scroll needs loading stats.
 | 
			
		||||
- fix: do not reload items on resume.
 | 
			
		||||
- Merge pull request 'tests' (#193) from tests into master
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- chore: better handling of coroutine dispatchers.
 | 
			
		||||
- ci: Instrumentation tests coverage in ci.
 | 
			
		||||
- chore: comment robolectric tests for now.
 | 
			
		||||
- fix: Fixed source deletion test.
 | 
			
		||||
- Merge pull request 'Fix alignment changes resetting reader article position' (#190) from davidoskky/ReaderForSelfoss-multiplatform:alignment into master
 | 
			
		||||
- Refactor star icon handling
 | 
			
		||||
- Don't restart activity changing alignment
 | 
			
		||||
- Changelog for v125030711
 | 
			
		||||
@@ -0,0 +1,4 @@
 | 
			
		||||
**v125040991**
 | 
			
		||||
 | 
			
		||||
- fix: Connectivity toast message was causing issues.
 | 
			
		||||
- Changelog for v125030901
 | 
			
		||||
@@ -32,6 +32,7 @@ import io.ktor.utils.io.charsets.Charsets
 | 
			
		||||
import io.ktor.utils.io.core.toByteArray
 | 
			
		||||
import kotlinx.coroutines.CoroutineScope
 | 
			
		||||
import kotlinx.coroutines.Dispatchers
 | 
			
		||||
import kotlinx.coroutines.IO
 | 
			
		||||
import kotlinx.coroutines.launch
 | 
			
		||||
import kotlinx.serialization.json.Json
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user