diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml new file mode 100644 index 0000000..2ccc7d1 --- /dev/null +++ b/.idea/androidTestResultsUserPreferences.xml @@ -0,0 +1,60 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 418c9b9..77a9f68 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -52,6 +52,9 @@ android { androidTestImplementation "androidx.arch.core:core-testing:$rootProject.coreTestingVersion" androidTestImplementation ("androidx.test.espresso:espresso-core:$rootProject.espressoVersion", { exclude group: 'com.android.support', module: 'support-annotations' + }) + androidTestImplementation ("androidx.test.espresso:espresso-core:$rootProject.espressoVersion", { + }) androidTestImplementation "androidx.test.ext:junit:$rootProject.androidxJunitVersion" } diff --git a/app/src/main/java/com/example/frogger2340project/PlayerConfig.java b/app/src/main/java/com/example/frogger2340project/PlayerConfig.java index 5672ba6..3d0ec7f 100644 --- a/app/src/main/java/com/example/frogger2340project/PlayerConfig.java +++ b/app/src/main/java/com/example/frogger2340project/PlayerConfig.java @@ -1,12 +1,12 @@ package com.example.frogger2340project; -import androidx.appcompat.app.AppCompatActivity; - import android.os.Bundle; import android.view.View; import android.widget.EditText; import android.widget.RadioButton; +import androidx.appcompat.app.AppCompatActivity; + public class PlayerConfig extends AppCompatActivity { private EditText playerNameText; @@ -80,4 +80,6 @@ public void startGame(View view) { public static String getPlayerName() { return playerName; } + + public String getDifficulty() {return difficulty;} } \ No newline at end of file diff --git a/app/src/test/java/com/example/frogger2340project/ShayahnTestCases.java b/app/src/test/java/com/example/frogger2340project/ShayahnTestCases.java index 2dfb8eb..85212c0 100644 --- a/app/src/test/java/com/example/frogger2340project/ShayahnTestCases.java +++ b/app/src/test/java/com/example/frogger2340project/ShayahnTestCases.java @@ -1,13 +1,23 @@ package com.example.frogger2340project; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; + +import android.widget.RadioButton; import org.junit.Test; +// import androidx.test.ext.junit.runners.AndroidJUnit4; + +// @RunWith(AndroidJUnit4.class) public class ShayahnTestCases { @Test public void onDifficultyButtonClicked() { + MainActivity activity = new MainActivity(); + PlayerConfig config = new PlayerConfig(); + RadioButton rb = (RadioButton) activity.findViewById(R.id.Easy); + config.onDifficultyButtonClicked(rb); + assertEquals("Easy", config.getDifficulty()); } @Test diff --git a/build.gradle b/build.gradle index d45b5bc..ed97a7d 100644 --- a/build.gradle +++ b/build.gradle @@ -15,4 +15,5 @@ ext { junitVersion = '4.13.2' espressoVersion = '3.4.0' androidxJunitVersion = '1.1.2' + testImplementation = "androidx.arch.core:core-testing:2.1.0" } \ No newline at end of file