Merge pull request #213 from corenting/fixes/tramway-icons

fix: fix tramway icons tests
corenting · Oct 30, 2022 · b5e517c · b5e517c
2 parents cdbf92f + 5568232
commit b5e517c
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/checkout@v3
+    - name: Setup JDK
+      uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
     - name: Grant execute permission for gradlew
@@ -26,7 +26,7 @@ jobs:
     - name: Test
       run: ./gradlew testDebugUnitTest
     - name: Upload artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
         name: app-debug.apk
         path: app/build/outputs/apk/debug/app-debug.apk
diff --git a/app/src/main/java/fr/corenting/traficparis/utils/DrawableUtils.kt b/app/src/main/java/fr/corenting/traficparis/utils/DrawableUtils.kt
@@ -26,7 +26,7 @@ object DrawableUtils {
 
         return ContextCompat.getDrawable(
             context,
-            getLineDrawable(context, name)
+            identifier
         )
     }
 

diff --git a/...c/main/res/drawable-anydpi/tramway_3a.xml → .../main/res/drawable-anydpi/tramway_t3a.xml b/...c/main/res/drawable-anydpi/tramway_3a.xml → .../main/res/drawable-anydpi/tramway_t3a.xml
diff --git a/app/src/test/java/fr/corenting/traficparis/utils/DrawableUtilsTest.kt b/app/src/test/java/fr/corenting/traficparis/utils/DrawableUtilsTest.kt
@@ -37,7 +37,7 @@ class DrawableUtilsTest {
 
     @Test
     fun getDrawableForTramway() {
-        for (i in listOf("1", "2", "3a", "3b", "4", "5", "6", "7", "8", "11")) {
+        for (i in listOf("T1", "T2", "T3a", "T3b", "T4", "T5", "T6", "T7", "T8", "T11")) {
             val ret =
                 DrawableUtils.getDrawableForLine(this.context, LineType.TRAMWAY, i)
             assertNotNull(ret)