From 422637ff1df4e91f0572f9f6a832d3e0ff5809fb Mon Sep 17 00:00:00 2001
From: NikM3 <nikolas.a.melendez@gmail.com>
Date: Sun, 23 Apr 2023 03:46:23 -0400
Subject: [PATCH] Code cleanup and JDK update
---
.idea/compiler.xml | 2 +-
.idea/misc.xml | 2 +-
app/build.gradle | 1 -
.../mrfit/ui/CurrentWorkoutActivityTest.kt | 17 ++++++-----------
.../java/com/symphony/mrfit/ui/ExerciseTest.kt | 13 ++-----------
.../com/symphony/mrfit/ui/GoalsActivityTest.kt | 5 +++--
.../com/symphony/mrfit/ui/HomeActivityTest.kt | 14 ++------------
.../com/symphony/mrfit/ui/LoginActivityTest.kt | 14 +++++---------
.../symphony/mrfit/ui/RegisterActivityTest.kt | 13 ++++++-------
.../mrfit/ui/TemplateSelectionActivityTest.kt | 13 ++-----------
.../mrfit/ui/UserProfileActivityTest.kt | 14 ++------------
.../mrfit/ui/WorkoutRoutineActivityTest.kt | 14 ++------------
.../mrfit/ui/WorkoutTemplateActivityTest.kt | 14 ++------------
13 files changed, 34 insertions(+), 102 deletions(-)
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
- <bytecodeTargetLevel target="11" />
+ <bytecodeTargetLevel target="17" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b1f8730..0ad17cb 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="Embedded JDK" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index 0f0394c..de91e1d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -57,7 +57,6 @@ dependencies {
// Testing dependencies
implementation 'androidx.arch.core:core-testing:2.2.0'
- implementation 'androidx.test:monitor:1.6.1'
testImplementation 'junit:junit:4.13.2'
testImplementation 'org.junit.jupiter:junit-jupiter'
testImplementation 'org.junit.jupiter:junit-jupiter-api:5.9.2'
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
index 3eff07c..7883615 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/CurrentWorkoutActivityTest.kt
@@ -1,22 +1,17 @@
+/*
+ * Created by Team Symphony on 4/23/23, 3:46 AM
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 4/23/23, 3:46 AM
+ */
+
package com.symphony.mrfit.ui
-import android.content.ComponentName
import android.content.Context
import android.content.Intent
-import android.os.Bundle
-import androidx.test.core.app.ActivityScenario
import androidx.test.core.app.ApplicationProvider
-import androidx.test.ext.junit.rules.activityScenarioRule
import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.rule.ActivityTestRule
-import org.junit.After
import org.junit.Assert.*
-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)
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
index bb258ad..022efea 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/ExerciseTest.kt
@@ -1,7 +1,7 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:46 AM
*/
package com.symphony.mrfit.ui
@@ -11,22 +11,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.symphony.mrfit.R
import org.hamcrest.CoreMatchers.not
-import org.junit.Before
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
class ExerciseTest {
- @Before
- fun setUp() {
- }
@get:Rule
var activityScenarioRule = activityScenarioRule<ExerciseActivity>()
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
index e4959c2..b78c811 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/GoalsActivityTest.kt
@@ -1,7 +1,7 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:11 AM
*/
package com.symphony.mrfit.ui
@@ -15,6 +15,7 @@ import org.junit.Rule
import org.junit.Test
class GoalsActivityTest {
+
@get:Rule
var activityScenarioRule = activityScenarioRule<GoalsActivity>()
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
index 118c83a..27ca635 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/HomeActivityTest.kt
@@ -1,7 +1,7 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:46 AM
*/
package com.symphony.mrfit.ui
@@ -11,23 +11,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.symphony.mrfit.R
import org.hamcrest.core.IsNot.not
-import org.junit.Before
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
class HomeActivityTest {
- @Before
- fun setUp() {
- }
-
@get:Rule
var activityScenarioRule = activityScenarioRule<HomeActivity>()
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
index eb6f532..696df75 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/LoginActivityTest.kt
@@ -1,27 +1,23 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:46 AM
*/
package com.symphony.mrfit.ui
import androidx.test.espresso.Espresso
-import androidx.test.espresso.action.ViewActions.*
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.closeSoftKeyboard
+import androidx.test.espresso.action.ViewActions.typeText
import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.symphony.mrfit.R
-import org.junit.Assert.*
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
class LoginActivityTest {
@get:Rule
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
index 7b20abc..7a0793b 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/RegisterActivityTest.kt
@@ -1,16 +1,17 @@
+/*
+ * Created by Team Symphony on 4/23/23, 3:46 AM
+ * Copyright (c) 2023 . All rights reserved.
+ * Last modified 4/23/23, 3:46 AM
+ */
+
package com.symphony.mrfit.ui
-import androidx.test.espresso.Espresso
import androidx.test.espresso.Espresso.onView
import androidx.test.espresso.action.ViewActions
-import androidx.test.espresso.assertion.ViewAssertions
-import androidx.test.espresso.matcher.ViewMatchers
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
import com.symphony.mrfit.R
-import org.junit.Assert.*
import org.junit.Rule
-
import org.junit.Test
class RegisterActivityTest {
@@ -18,8 +19,6 @@ class RegisterActivityTest {
@get:Rule
var activityScenarioRule = activityScenarioRule<RegisterActivity>()
-
-
/*tests if register works*/
@Test
fun checkValidRegister() {
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
index 76aee11..c0d3a6b 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/TemplateSelectionActivityTest.kt
@@ -1,7 +1,7 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:46 AM
*/
package com.symphony.mrfit.ui
@@ -11,22 +11,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.symphony.mrfit.R
import org.hamcrest.CoreMatchers.not
-import org.junit.Before
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
class TemplateSelectionActivityTest {
- @Before
- fun setUp() {
- }
@get:Rule
var activityScenarioRule = activityScenarioRule<RoutineSelectionActivity>()
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
index ed0b9c1..3f56c66 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/UserProfileActivityTest.kt
@@ -1,7 +1,7 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:46 AM
*/
package com.symphony.mrfit.ui
@@ -12,23 +12,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.symphony.mrfit.R
import org.hamcrest.CoreMatchers.not
-import org.junit.Before
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
class UserProfileActivityTest {
- @Before
- fun setUp() {
- }
-
@get:Rule
var activityScenarioRule = activityScenarioRule<UserProfileActivity>()
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
index 3057e4e..26b23b4 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutRoutineActivityTest.kt
@@ -1,7 +1,7 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:46 AM
*/
package com.symphony.mrfit.ui
@@ -13,23 +13,13 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.symphony.mrfit.R
import org.hamcrest.CoreMatchers.not
-import org.junit.Before
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
class WorkoutRoutineActivityTest {
- @Before
- fun setUp() {
- }
-
@get:Rule
var activityScenarioRule = activityScenarioRule<WorkoutRoutineActivity>(
intent = Intent(
diff --git a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
index ac1eb55..dddb07c 100644
--- a/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
+++ b/app/src/androidTest/java/com/symphony/mrfit/ui/WorkoutTemplateActivityTest.kt
@@ -1,7 +1,7 @@
/*
- * Created by Team Symphony on 4/22/23, 6:21 AM
+ * Created by Team Symphony on 4/23/23, 3:46 AM
* Copyright (c) 2023 . All rights reserved.
- * Last modified 4/22/23, 6:05 AM
+ * Last modified 4/23/23, 3:46 AM
*/
package com.symphony.mrfit.ui
@@ -13,22 +13,12 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
import androidx.test.espresso.matcher.ViewMatchers.withId
import androidx.test.ext.junit.rules.activityScenarioRule
-import androidx.test.filters.LargeTest
-import androidx.test.internal.runner.junit4.AndroidJUnit4ClassRunner
import com.symphony.mrfit.R
-import org.junit.Before
import org.junit.Rule
import org.junit.Test
-import org.junit.runner.RunWith
-@RunWith(AndroidJUnit4ClassRunner::class)
-@LargeTest
class WorkoutTemplateActivityTest {
- @Before
- fun setUp() {
- }
-
@get:Rule
var activityScenarioRule = activityScenarioRule<WorkoutTemplateActivity>(
intent = Intent(