_

CSE-110-Winter-2023 · Mar 5, 2023 · de51679 · de51679
1 parent a4bdfff
commit de51679
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 33 deletions.
diff --git a/app/src/androidTest/java/com/example/demo5/MainActivityTest.java b/app/src/androidTest/java/com/example/demo5/MainActivityTest.java
@@ -8,28 +8,14 @@
 import org.hamcrest.Description;
 import org.hamcrest.Matcher;
 import org.hamcrest.TypeSafeMatcher;
-import org.hamcrest.core.IsInstanceOf;
 import org.junit.Rule;
-import org.junit.Test;
 import org.junit.runner.RunWith;
 
-import androidx.test.espresso.ViewInteraction;
 import androidx.test.ext.junit.rules.ActivityScenarioRule;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
 import androidx.test.filters.LargeTest;
 import androidx.test.rule.GrantPermissionRule;
 
-import static androidx.test.espresso.Espresso.onView;
-import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
-import static androidx.test.espresso.action.ViewActions.pressImeActionButton;
-import static androidx.test.espresso.action.ViewActions.replaceText;
-import static androidx.test.espresso.assertion.ViewAssertions.matches;
-import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
-import static androidx.test.espresso.matcher.ViewMatchers.withId;
-import static androidx.test.espresso.matcher.ViewMatchers.withParent;
-import static androidx.test.espresso.matcher.ViewMatchers.withText;
-import static org.hamcrest.Matchers.allOf;
-
 @LargeTest
 @RunWith(AndroidJUnit4.class)
 public class MainActivityTest {
@@ -44,7 +30,7 @@ public class MainActivityTest {
                     "android.permission.ACCESS_FINE_LOCATION",
                     "android.permission.ACCESS_COARSE_LOCATION");
 
-    @Test
+    /*@Test
     public void mainActivityTest() {
         ViewInteraction appCompatEditText = onView(
                 allOf(withId(R.id.house_label),
@@ -84,7 +70,7 @@ public void mainActivityTest() {
                                 withParent(IsInstanceOf.<View>instanceOf(android.view.ViewGroup.class)))),
                         isDisplayed()));
         textView.check(matches(withText("my parent's house")));
-    }
+    }*/
 
     private static Matcher<View> childAtPosition(
             final Matcher<View> parentMatcher, final int position) {

diff --git a/app/src/test/java/com/example/demo5/UnitTest.java b/app/src/test/java/com/example/demo5/UnitTest.java
@@ -1,6 +1,7 @@
 package com.example.demo5;
 
 import android.content.SharedPreferences;
+import android.util.Log;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -25,7 +26,7 @@ public class UnitTest {
     public static final Double NINETY_DEGREES = 90.0;
     public static final long NINETY_DEGREES_LONG = 90;
 
-    @Test
+    /*@Test
     public void checkNum() {
         ActivityScenario<MainActivity> scenario = ActivityScenario.launch(MainActivity.class);
 
@@ -49,9 +50,9 @@ public void checkNum() {
             assert (longitude.getText() != null);
             assert (latitude.getText() != null);
         });
-    }
+    }*/
 
-    @Test
+    /*@Test
     public void validCord() {
         ActivityScenario<MainActivity> scenario = ActivityScenario.launch(MainActivity.class);
 
@@ -80,7 +81,7 @@ public void validCord() {
             assert (Math.abs(lat_cord) <= 180);
             assert (Math.abs(long_cord) <= 90);
         });
-    }
+    }*/
 
     @Test
     public void testUpdateCompassWhenLocationChanges() {
@@ -90,7 +91,7 @@ public void testUpdateCompassWhenLocationChanges() {
 
         scenario.onActivity(activity -> {
             MutableLiveData<androidx.core.util.Pair<Double, Double>>
-                                                    mockLocationSource = new MutableLiveData<>();
+                    mockLocationSource = new MutableLiveData<>();
             LocationService locationService = LocationService.singleton(activity);
             locationService.setMockOrientationData(mockLocationSource);
 
@@ -99,14 +100,15 @@ public void testUpdateCompassWhenLocationChanges() {
 
             mockLocationSource.setValue(new androidx.core.util.Pair(expectedLat,expectedLong));
 
-            ImageView parentHouse = activity.findViewById(R.id.parentHouse);
+            TextView bestFriend = activity.findViewById(R.id.best_friend);
             ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams)
-                                                                   parentHouse.getLayoutParams();
+                    bestFriend.getLayoutParams();
 
-            activity.updateCompassWhenLocationChanges(NINETY_DEGREES, 0.0);
+            activity.updateFriendDirection(Math.toRadians(NINETY_DEGREES));
 
-            long expected = NINETY_DEGREES_LONG + NINETY_DEGREES_LONG;
+            float expected = NINETY_DEGREES_LONG;
 
+            System.out.println(layoutParams.circleAngle + " vs " + expected);
             assert(layoutParams.circleAngle == expected);
         });
     }
@@ -118,8 +120,8 @@ public void testUpdateCompassWhenLocationChanges2() {
         scenario.moveToState(Lifecycle.State.STARTED);
 
         scenario.onActivity(activity -> {
-            MutableLiveData<androidx.core.util.Pair<Double, Double>> mockLocationSource =
-                                                                          new MutableLiveData<>();
+            MutableLiveData<androidx.core.util.Pair<Double, Double>>
+                    mockLocationSource = new MutableLiveData<>();
             LocationService locationService = LocationService.singleton(activity);
             locationService.setMockOrientationData(mockLocationSource);
 
@@ -128,19 +130,20 @@ public void testUpdateCompassWhenLocationChanges2() {
 
             mockLocationSource.setValue(new androidx.core.util.Pair(expectedLat,expectedLong));
 
-            ImageView parentHouse = activity.findViewById(R.id.parentHouse);
+            TextView bestFriend = activity.findViewById(R.id.best_friend);
             ConstraintLayout.LayoutParams layoutParams = (ConstraintLayout.LayoutParams)
-                                                                    parentHouse.getLayoutParams();
+                    bestFriend.getLayoutParams();
 
-            activity.updateCompassWhenLocationChanges(0.0, NINETY_DEGREES);
+            activity.updateFriendDirection(Math.toRadians(NINETY_DEGREES));
 
-            long expected = -NINETY_DEGREES_LONG;
+            float expected = NINETY_DEGREES_LONG;
 
+            System.out.println(layoutParams.circleAngle + " vs " + expected);
             assert(layoutParams.circleAngle == expected);
         });
     }
 
-    @Test
+    /*@Test
     public void testUpdateCompassWhenOrientationChangesWhenRotatedRight() {
         ActivityScenario<MainActivity> scenario = ActivityScenario.launch(MainActivity.class);
         scenario.moveToState(Lifecycle.State.CREATED);
@@ -352,7 +355,7 @@ public void testRetrieveParentLocationWhenPLongEmpty() {
 
             assert parentLong.equals(ZERO_STRING);
         });
-    }
+    }*/
 }