Kamila/lastfm_genre_api

app/src/androidTest/java/ch/sdp/vibester/GenreTemporaryTest.kt

@@ -0,0 +1,76 @@
+package ch.sdp.vibester
+
+import androidx.test.espresso.Espresso.onData
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.PerformException
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.assertion.ViewAssertions.*
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.matcher.ViewMatchers.*
+import androidx.test.ext.junit.rules.ActivityScenarioRule
+import org.hamcrest.Matchers.*
+import org.junit.After
+import org.junit.Before
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.ExpectedException
+
+
+class GenreTemporaryTest {
+
+    @get:Rule
+    val testRule = ActivityScenarioRule(
+        GenreTemporary::class.java
+    )
+
+    @Before
+    fun setUp() {
+        Intents.init()
+    }
+
+    @After
+    fun clean() {
+        Intents.release()
+    }
+
+    @Test
+    fun GenreLayoutIsDisplayed() {
+        onView(withId(R.id.rockButton)).check(matches(isDisplayed()))
+        onView(withId(R.id.kpopButton)).check(matches(isDisplayed()))
+        onView(withId(R.id.topTracksButton)).check(matches(isDisplayed()))
+        onView(withId(R.id.songsListView)).check(matches(isDisplayed()))
+    }
+
+    @get:Rule
+    var exception = ExpectedException.none()
+
+    @Test
+    fun songListIsEmpty(){
+        exception.expect(PerformException::class.java)
+        onView(withId(R.id.songsListView)).check(matches(isDisplayed()))
+        onData(allOf(`is`(instanceOf(String::class.java)))).atPosition(2).perform(click())
+    }
+
+    @Test
+    fun rockButtonClick() {
+        onView(withId(R.id.rockButton)).perform(click())
+        onView(withId(R.id.songsListView)).check(matches(isDisplayed()))
+        Thread.sleep(1000)   // wait for data to fetch
+        onData(allOf(`is`(instanceOf(String::class.java)))).atPosition(2).perform(click())
+    }
+    @Test
+    fun topButtonClick() {
+        onView(withId(R.id.topTracksButton)).perform(click())
+        onView(withId(R.id.songsListView)).check(matches(isDisplayed()))
+        Thread.sleep(1000)   // wait for data to fetch
+        onData(allOf(`is`(instanceOf(String::class.java)))).atPosition(2).perform(click())
+    }
+
+    @Test
+    fun kpopButtonClick() {
+        onView(withId(R.id.kpopButton)).perform(click())
+        onView(withId(R.id.songsListView)).check(matches(isDisplayed()))
+        Thread.sleep(1000)   // wait for data to fetch
+        onData(allOf(`is`(instanceOf(String::class.java)))).atPosition(2).perform(click())
+    }
+}

app/src/androidTest/java/ch/sdp/vibester/LyricTemporaryTest.kt

@@ -64,7 +64,7 @@ class LyricTemporaryTest {
         onView(withId(R.id.artistForLyric)).perform(typeText(inputArtistName), closeSoftKeyboard())
         onView(withId(R.id.trackForLyric)).perform(typeText(inputTrackName), closeSoftKeyboard())
         onView(withId(R.id.validateForLyric)).perform(click())
-        Thread.sleep(1500) // wait for API response
+        Thread.sleep(5000) // wait for API response
         onView(withId(R.id.lyricBody)).check(matches(withText(containsString("First things first"))))
     }
 }

app/src/androidTest/java/ch/sdp/vibester/MainActivityTest.kt

@@ -50,6 +50,13 @@ class MainActivityTest {
         intended(hasComponent(WelcomeScreen::class.qualifiedName))
     }
 
+    @Test
+    fun checkIntentOnGenre(){
+        onView(withId(R.id.genreButton)).perform(click())
+        intended(hasComponent(GenreTemporary::class.qualifiedName))
+    }
+
+
     @Test
     fun checkIntentOnLyric() {
         onView(withId(R.id.lyricButton)).perform(click())

app/src/androidTest/java/ch/sdp/vibester/api/LastfmApiTest.kt

@@ -0,0 +1,35 @@
+package ch.sdp.vibester.api
+
+import ch.sdp.vibester.model.SongList
+import junit.framework.Assert.assertEquals
+import junit.framework.Assert.assertTrue
+import okhttp3.OkHttpClient
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.ExpectedException
+
+import java.lang.Exception
+
+class LastfmApiTest {
+    private val BY_TAG = "tag.gettoptracks"
+
+    @Test
+    fun lastfmApiQueryWorks() {
+        var songListFut = LastfmApi.querySongList(OkHttpClient(), LastfmUri(method = BY_TAG, tag="rock"))
+        val songListObj = SongList(songListFut.get())
+        assertTrue(songListObj.getSongList().size > 0)
+        assertTrue(songListObj.getSongList().size == songListObj.getSongsPerPage().toInt())
+        assertEquals(songListObj.getPage(),"1")
+    }
+
+    @get:Rule
+    var exception = ExpectedException.none()
+
+    @Test
+    fun lastfmApiQueryError() {
+        exception.expect(Exception::class.java)
+        var songsFut = LastfmApi.querySongList(OkHttpClient(), LastfmUri(method = BY_TAG, tag="rock"), baseUrl="ThisSiteDoesNotExist" )
+        songsFut.get()
+    }
+
+}

app/src/androidTest/java/ch/sdp/vibester/api/LastfmHelperTest.kt

@@ -0,0 +1,24 @@
+package ch.sdp.vibester.api
+
+import junit.framework.Assert.assertTrue
+import org.junit.Test
+
+class LastfmHelperTest {
+    private val BY_TAG = "tag.gettoptracks"
+    private val BY_CHART = "chart.gettoptracks"
+    private val GAME_SIZE = 10
+
+    @Test
+    fun mergeWorks(){
+        val listOne = listOf<String>("One","Two")
+        val listTwo = listOf<String>("Three", "Four")
+        val finalList = listOf<String>("One","Two","Three","Four")
+        val test = LastfmHelper.merge(listOne, listTwo)
+        assertTrue(test.size == finalList.size && test.containsAll(finalList) && finalList.containsAll(test));
+    }
+
+    @Test
+    fun getRandomSongListWorks(){
+        assertTrue(LastfmHelper.getRandomSongList(method = BY_TAG, tag = "kpop").size == GAME_SIZE)
+    }
+}

app/src/androidTest/java/ch/sdp/vibester/model/SongListTest.kt

@@ -0,0 +1,53 @@
+package ch.sdp.vibester.model
+
+import org.junit.Assert.assertEquals
+import org.junit.Rule
+import org.junit.Test
+import org.junit.rules.ExpectedException
+
+class SongListTest {
+
+    @Test
+    fun jsonPreviewParseCorrectText(){
+            val inputTxt = """
+            {"tracks":
+            {"track":[{"name":"Wonderwall","duration":"259","mbid":"31623cce-9717-4513-9d83-1b5d04e44f9b",
+            "url":"https://www.last.fm/music/Oasis/_/Wonderwall",
+            "streamable":{"#text":"0","fulltrack":"0"},
+            "artist":{"name":"Oasis","mbid":"ecf9f3a3-35e9-4c58-acaa-e707fba45060","url":"https://www.last.fm/music/Oasis"},
+            "image":[{"#text":"https://lastfm.freetls.fastly.net/i/u/34s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"small"},
+            {"#text":"https://lastfm.freetls.fastly.net/i/u/64s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"medium"},
+            {"#text":"https://lastfm.freetls.fastly.net/i/u/174s/2a96cbd8b46e442fc41c2b86b821562f.png","size":"large"},
+            {"#text":"https://lastfm.freetls.fastly.net/i/u/300x300/2a96cbd8b46e442fc41c2b86b821562f.png","size":"extralarge"}],
+            "@attr":{"rank":"1"}}],"@attr":{"tag":"british","page":"1","perPage":"1","totalPages":"66649","total":"66649"}}}
+            """
+
+            val mySongsList = SongList(inputTxt)
+
+            val songName = "Wonderwall"
+            val artistName = "Oasis"
+            val inputSongsList = mutableListOf<String>("$songName $artistName")
+            val page = "1"
+            val songsPerPage = "1"
+            val totalPages = "66649"
+            val totalSongs = "66649"
+
+
+            assertEquals(inputSongsList, mySongsList.getSongList())
+            assertEquals(page, mySongsList.getPage())
+            assertEquals(songsPerPage, mySongsList.getSongsPerPage())
+            assertEquals(totalPages, mySongsList.getTotalPages())
+            assertEquals(totalSongs, mySongsList.getTotalSongs())
+    }
+
+    @get:Rule
+    var exception = ExpectedException.none()
+
+    @Test
+    fun jsonPreviewParseErrorText() {
+        exception.expect(IllegalArgumentException::class.java)
+        exception.expectMessage("SongsList constructor, bad argument")
+        SongList("")
+    }
+
+}

app/src/main/AndroidManifest.xml

@@ -1,63 +1,66 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="ch.sdp.vibester">
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:usesCleartextTraffic="true"
-        android:theme="@style/Theme.MyApplication">
-        <activity
-            android:name=".IncorrectSongsScreen"
-            android:exported="false" />
-        <activity
-            android:name=".GameEndingScreen"
-            android:exported="false" />
-        <activity
-            android:name=".games.TypingGame"
-            android:exported="false" />
-        <activity
-            android:name="ch.sdp.vibester.GamescreenActivity"
-            android:exported="false" />
-        <activity
-            android:name=".profile.ProfileSetup"
-            android:exported="false" />
-        <activity
-            android:name=".MusicTemporary"
-            android:exported="false" />
-        <activity
-            android:name=".LyricTemporary"
-            android:exported="false" />
-        <activity
-            android:name=".GameSetupScreen"
-            android:exported="false" />
-        <activity
-            android:name=".scoreboard.ScoreBoardActivity"
-            android:theme="@style/AppTheme.NoActionBar" />
-        <activity
-            android:name=".WelcomeScreen"
-            android:exported="false" />
-        <activity
-            android:name=".Register"
-            android:exported="true" />
-        <activity
-            android:name=".GreetingActivity"
-            android:exported="false" />
-        <activity
-            android:name=".MainActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="ch.sdp.vibester">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+
+    <application
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:usesCleartextTraffic="true"
+        android:theme="@style/Theme.MyApplication">
+        <activity
+            android:name=".IncorrectSongsScreen"
+            android:exported="false" />
+        <activity
+            android:name=".GameEndingScreen"
+            android:exported="false" />
+        <activity
+            android:name=".games.TypingGame"
+            android:exported="false" />
+        <activity
+            android:name="ch.sdp.vibester.GamescreenActivity"
+            android:exported="false" />
+        <activity
+            android:name=".profile.ProfileSetup"
+            android:exported="false" />
+        <activity
+            android:name=".MusicTemporary"
+            android:exported="false" />
+        <activity
+            android:name=".LyricTemporary"
+            android:exported="false" />
+        <activity
+            android:name=".GameSetupScreen"
+            android:exported="false" />
+        <activity
+            android:name=".scoreboard.ScoreBoardActivity"
+            android:theme="@style/AppTheme.NoActionBar" />
+        <activity
+            android:name=".WelcomeScreen"
+            android:exported="false" />
+        <activity
+            android:name=".Register"
+            android:exported="true" />
+        <activity
+            android:name=".GreetingActivity"
+            android:exported="false" />
+        <activity
+            android:name=".GenreTemporary"
+            android:exported="false" />
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
 </manifest>

app/src/main/java/ch/sdp/vibester/GenreTemporary.kt

@@ -0,0 +1,46 @@
+package ch.sdp.vibester
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import android.view.View
+import android.widget.ArrayAdapter
+import android.widget.ListView
+import ch.sdp.vibester.api.LastfmHelper
+
+/**
+ * Activity to show the list of songs for a chosen tag
+ */
+class GenreTemporary : AppCompatActivity() {
+    private val BY_TAG = "tag.gettoptracks"
+    private val BY_CHART = "chart.gettoptracks"
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_genre_temporary)
+    }
+
+    /**
+     * Fetch data from Lastfm and show song list in a ListView
+     * @param method: BY_TAG or BY_CHART (top tracks without tag)
+     * @param tag: tag name if method BY_TAG is chosen
+     */
+    fun performQuery(method: String, tag: String=""){
+        val listSongs = findViewById<ListView>(R.id.songsListView)
+        val songList = LastfmHelper.getRandomSongList(method, tag)
+        val arr = ArrayAdapter(this, android.R.layout.simple_list_item_1 , songList)
+        listSongs.adapter = arr
+    }
+
+    fun getKpopSongList(view: View) {
+        performQuery(BY_TAG,"kpop")
+    }
+
+    fun getRockSongList(view: View) {
+        performQuery(BY_TAG, "rock")
+    }
+
+    fun getTopSongList(view: View) {
+        performQuery(BY_CHART)
+    }
+
+}