부산대 Android 김민혁 5주차 STEP1

.gitignore

@@ -33,5 +33,6 @@ google-services.json
 
 # Android Profiling
 *.hprof
+
 /keyStore
 /app/release

README.md

@@ -1 +1,6 @@
-# android-map-refactoring
+# android-map-refactoring STEP1
+
+## 개요
+
+`android-map-refactoring STEP1`에서는 `android-map-search`에서 SQLite를 이용해 구현했던 로컬 데이터베이스를 Room 라이브러리로 대체합니다.
+또한, `Hilt`를 이용해 의존성 주입 패턴을 적용합니다.

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
@@ -17,8 +19,9 @@ android {
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"
-
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        resValue("string", "kakao_api_key", getApiKey("KAKAO_API_KEY"))
+        buildConfigField("String", "KAKAO_REST_API_KEY", getApiKey("KAKAO_REST_API_KEY"))
     }
 
     buildTypes {
@@ -39,6 +42,7 @@ android {
     }
 
     buildFeatures {
+        viewBinding = true
         dataBinding = true
         buildConfig = true
     }
@@ -78,3 +82,5 @@ dependencies {
     androidTestImplementation("com.google.dagger:hilt-android-testing:2.48.1")
     kaptAndroidTest("com.google.dagger:hilt-android-compiler:2.48.1")
 }
+
+fun getApiKey(key: String): String = gradleLocalProperties(rootDir, providers).getProperty(key)

app/src/androidTest/java/campus/tech/kakao/map/MapActivityTest.kt

@@ -0,0 +1,34 @@
+package campus.tech.kakao.map
+
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.*
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class MapActivityTest {
+
+    @get:Rule
+    val activityScenarioRule = ActivityScenarioRule(MapActivity::class.java)
+
+    @Before
+    fun setUp() {
+    }
+
+    @Test
+    fun testFirstScreen() {
+        onView(withId(R.id.search_button)).check(ViewAssertions.matches(isDisplayed()))
+    }
+    @Test
+    fun testSearchButtonClick() {
+        onView(withId(R.id.search_button)).perform(click())
+        Thread.sleep(1000)
+        onView(withId(R.id.search_edit_text)).check(ViewAssertions.matches(ViewMatchers.isDisplayed()))
+    }
+}

app/src/androidTest/java/campus/tech/kakao/map/MapActivityUnitTest.kt

@@ -0,0 +1,45 @@
+package campus.tech.kakao.map
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.appcompat.app.AppCompatActivity
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.Assert.assertEquals
+
+@RunWith(AndroidJUnit4::class)
+class MapActivityUnitTest {
+
+    @get:Rule
+    val activityScenarioRule = ActivityScenarioRule(MapActivity::class.java)
+
+    private lateinit var sharedPreferences: SharedPreferences
+
+    @Before
+    fun setUp() {
+        val context = ApplicationProvider.getApplicationContext<Context>()
+        sharedPreferences = context.getSharedPreferences("lastLatLng", AppCompatActivity.MODE_PRIVATE)
+        sharedPreferences.edit().clear().apply()
+    }
+
+    @Test
+    fun testSaveLatLng() {
+        val latitude = "35.231627"
+        val longitude = "129.084020"
+
+        activityScenarioRule.scenario.onActivity { activity ->
+            activity.saveLatLng(latitude, longitude)
+
+            val savedLat = sharedPreferences.getString("lastLat", null)
+            val savedLng = sharedPreferences.getString("lastLng", null)
+
+            assertEquals(latitude, savedLat)
+            assertEquals(longitude, savedLng)
+        }
+    }
+}

app/src/androidTest/java/campus/tech/kakao/map/ResultRecyclerViewMatcher.kt

@@ -0,0 +1,38 @@
+package campus.tech.kakao.map
+
+import android.view.View
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.matcher.BoundedMatcher
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+
+class ResultRecyclerViewMatcher {
+    fun atPosition(position: Int, itemMatcher: Matcher<View>): Matcher<View> {
+        return object : BoundedMatcher<View, RecyclerView>(RecyclerView::class.java) {
+            override fun matchesSafely(recyclerView: RecyclerView): Boolean {
+                val viewHolder = recyclerView.findViewHolderForAdapterPosition(position)
+                return itemMatcher.matches(viewHolder?.itemView)
+            }
+
+            override fun describeTo(description: Description) {
+                description.appendText("has item at position $position: ")
+                itemMatcher.describeTo(description)
+            }
+        }
+    }
+
+    fun hasTextInViewWithId(viewId: Int, text: String): Matcher<View> {
+        return object : BoundedMatcher<View, View>(View::class.java) {
+            override fun matchesSafely(view: View): Boolean {
+                val textView = view.findViewById<TextView>(viewId)
+                return textView?.text.toString() == text
+            }
+
+            override fun describeTo(description: Description) {
+                description.appendText("has text '$text' in view with id $viewId")
+            }
+        }
+    }
+}

app/src/androidTest/java/campus/tech/kakao/map/SearchActivityTest.kt

@@ -0,0 +1,92 @@
+package campus.tech.kakao.map
+
+import android.annotation.SuppressLint
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.assertion.ViewAssertions.*
+import androidx.test.espresso.contrib.RecyclerViewActions
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.filters.MediumTest
+import org.hamcrest.CoreMatchers.*
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(androidx.test.ext.junit.runners.AndroidJUnit4::class)
+@MediumTest
+class SearchActivityTest {
+
+    @get:Rule
+    val activityScenarioRule = ActivityScenarioRule(SearchActivity::class.java)
+
+    @Before
+    fun setup() {
+        activityScenarioRule.scenario.onActivity { activity ->
+            (activity.application as KyleMaps).isTestMode = true
+        }
+    }
+
+    @Test
+    fun testSearchFunctionality() {
+        onView(withId(R.id.no_results))
+            .check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun testViewVisibility() {
+        onView(withId(R.id.search_edit_text)).perform(typeText("Hello"))
+        Thread.sleep(1000)
+        onView(withId(R.id.no_results)).check(matches(not(isDisplayed())))
+        onView(withId(R.id.recycler_view)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun testResultRecyclerViewItem() {
+        val resultRecyclerViewMatcher = ResultRecyclerViewMatcher()
+        onView(withId(R.id.search_edit_text)).perform(typeText("DDDD"))
+        Thread.sleep(1000)
+        onView(withId(R.id.recycler_view))
+            .check(matches(resultRecyclerViewMatcher.atPosition(
+                0,
+                resultRecyclerViewMatcher.hasTextInViewWithId(R.id.place_name, "DDDD")
+            )))
+        onView(withId(R.id.recycler_view))
+            .check(matches(resultRecyclerViewMatcher.atPosition(
+                0,
+                resultRecyclerViewMatcher.hasTextInViewWithId(R.id.place_category, "음식점")
+            )))
+        onView(withId(R.id.recycler_view))
+            .check(matches(resultRecyclerViewMatcher.atPosition(
+                0,
+                resultRecyclerViewMatcher.hasTextInViewWithId(R.id.place_address, "경남 창원시 성산구 용호동 17-1")
+            )))
+    }
+
+//    @SuppressLint("CheckResult")
+//    @Test
+//    fun testSearchHistoryRecyclerViewItem() {
+//        val searchHistoryRecyclerViewMatcher = SearchHistoryRecyclerViewMatcher()
+//        var itemCount = 0
+//        activityScenarioRule.scenario.onActivity { activity ->
+//            val recyclerView: RecyclerView = activity.findViewById(R.id.horizontal_recycler_view)
+//            itemCount = recyclerView.adapter?.itemCount ?: 0
+//        }
+//        onView(withId(R.id.search_edit_text)).perform(typeText("DDDD"))
+//        Thread.sleep(1000)
+//
+//        onView(withId(R.id.recycler_view))
+//            .perform(RecyclerViewActions.actionOnItemAtPosition<RecyclerView.ViewHolder>(0, click()))
+//        Thread.sleep(1000)
+//
+//        onView(withId(R.id.horizontal_recycler_view))
+//            .check(matches(searchHistoryRecyclerViewMatcher.atPosition(
+//                itemCount-1,
+//                searchHistoryRecyclerViewMatcher.hasTextInViewWithId(R.id.search_history_item, "DDDD")
+//            )))
+//    }
+    // 로그도 잘 찍히고 아무 문제 없어보이는데 왜 안 되는 지 도무지 모르겠는 테스트 코드 !
+
+}

app/src/androidTest/java/campus/tech/kakao/map/SearchActivityUnitTest.kt

@@ -0,0 +1,32 @@
+package campus.tech.kakao.map
+
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import junit.framework.TestCase.assertEquals
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class SearchActivityUnitTest {
+
+    @get:Rule
+    val activityScenarioRule = ActivityScenarioRule(SearchActivity::class.java)
+
+    @Before
+    fun setUp() {}
+
+//    @Test
+//    fun testSearchPlacesWithResults() {
+//        activityScenarioRule.scenario.onActivity { activity ->
+//            activity.searchPlaces("DDDD")
+//
+//            val recyclerViewAdapter = activity.findViewById<RecyclerView>(R.id.recycler_view).adapter as ResultRecyclerViewAdapter
+//            assertEquals(1, recyclerViewAdapter.itemCount)
+//        }
+//    }
+    // 도저히 왜 안 되는 지 모르겠는 코드 2..
+}

app/src/androidTest/java/campus/tech/kakao/map/SearchHistoryRecyclerViewMatcher.kt

@@ -0,0 +1,37 @@
+package campus.tech.kakao.map
+
+import android.view.View
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import androidx.test.espresso.matcher.BoundedMatcher
+import org.hamcrest.Description
+import org.hamcrest.Matcher
+
+class SearchHistoryRecyclerViewMatcher {
+    fun atPosition(position: Int, itemMatcher: Matcher<View>): Matcher<View> {
+        return object : BoundedMatcher<View, RecyclerView>(RecyclerView::class.java) {
+            override fun matchesSafely(recyclerView: RecyclerView): Boolean {
+                val viewHolder = recyclerView.findViewHolderForAdapterPosition(position)
+                return itemMatcher.matches(viewHolder?.itemView)
+            }
+
+            override fun describeTo(description: Description) {
+                description.appendText("has item at position $position: ")
+                itemMatcher.describeTo(description)
+            }
+        }
+    }
+
+    fun hasTextInViewWithId(viewId: Int, text: String): Matcher<View> {
+        return object : BoundedMatcher<View, View>(View::class.java) {
+            override fun matchesSafely(view: View): Boolean {
+                val textView = view.findViewById<TextView>(viewId)
+                return textView?.text.toString() == text
+            }
+
+            override fun describeTo(description: Description) {
+                description.appendText("has text '$text' in view with id $viewId")
+            }
+        }
+    }
+}

app/src/main/AndroidManifest.xml

@@ -2,25 +2,32 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+
     <application
+        android:name=".KyleMaps"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/kyle_maps_icon_foreground"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Map"
         tools:targetApi="31">
+
         <activity
-            android:name=".MainActivity"
+            android:name=".MapActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".AuthenticationErrorActivity" />
+        <activity android:name=".SearchActivity" />
+
     </application>
 
 </manifest>

app/src/main/java/campus/tech/kakao/map/AuthenticationErrorActivity.kt

@@ -0,0 +1,21 @@
+package campus.tech.kakao.map
+
+import android.os.Bundle
+import android.widget.ImageView
+import android.widget.ProgressBar
+import androidx.appcompat.app.AppCompatActivity
+
+class AuthenticationErrorActivity : AppCompatActivity() {
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_authentication_error)
+
+        val retryIcon: ImageView = findViewById(R.id.retry_icon)
+        val loadingIndicator: ProgressBar = findViewById(R.id.loading_indicator)
+
+        retryIcon.setOnClickListener {
+            loadingIndicator.visibility = ProgressBar.VISIBLE
+        }
+    }
+}