Skip to content

Commit

Permalink
Fix testsg
Browse files Browse the repository at this point in the history
  • Loading branch information
@vs2961
vs2961 committed Mar 17, 2023
1 parent 27f2b02 commit f502c10
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 28 deletions.
30 changes: 11 additions & 19 deletions app/src/main/java/com/team34/cse_110_project_team_34/CompassActivity.java
View file
@@ -1,6 +1,5 @@
package com.team34.cse_110_project_team_34;

import androidx.annotation.NonNull;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AppCompatActivity;

Expand All @@ -9,8 +8,6 @@
import androidx.lifecycle.LiveData;
import androidx.lifecycle.ViewModelProvider;


import android.annotation.SuppressLint;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.res.Resources;
Expand Down Expand Up @@ -40,9 +37,9 @@
public class CompassActivity extends AppCompatActivity {

private UserRepository userRepo;
private SharedPreferences preferences;
private OrientationService orientationService;
private LocationService locationService;
SharedPreferences preferences;
private LocationViewModel viewModel;

private String main_public_uid;
Expand Down Expand Up @@ -77,23 +74,24 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_compass);

UserDao dao = Database.getInstance(this).getUserDao();
// Setting up services
orientationService = OrientationService.getInstance(this);
locationService = LocationService.getInstance(this);

// Main user's uid info
preferences = getSharedPreferences("preferences", MODE_PRIVATE);
main_public_uid = preferences.getString("Public", "");
main_private_uid = preferences.getString("Private", "");

SharedPreferences preferences = getSharedPreferences("preferences", MODE_PRIVATE);
// API mocking
UserDao dao = Database.getInstance(this).getUserDao();
String link = preferences.getString("API_Link", "");
if (link.equals("")) {
userRepo = new UserRepository(dao);
} else {
userRepo = new UserRepository(dao, link);
}

orientationService = OrientationService.getInstance(this);
locationService = LocationService.getInstance(this);

main_public_uid = preferences.getString("Public", "");
main_private_uid = preferences.getString("Private", "");


// Getting the current user's public uid
TextView public_uid_text = this.findViewById(R.id.public_uid);
public_uid_text.setText(String.format("%s%s", getString(R.string.publicUIDString), preferences.getString("Public", "")));
Expand Down Expand Up @@ -130,7 +128,6 @@ else if (radiusIndex == 4) {
lastMainLong = locationService.getLocation().getValue() != null ? locationService.getLocation().getValue().second : 0;

setupObservers();

updateCircles();
observeLocation();
observeOrientation();
Expand Down Expand Up @@ -183,11 +180,9 @@ private void updateFriendLocations(List<User> users) {
}
locationViews.get(user.public_code).update(user);
updateCompassLocation(user);

}
}


/**
* Displays a user's location marker on the compass.
*
Expand Down Expand Up @@ -400,7 +395,4 @@ public LocationView addLocationView(ConstraintLayout cl, User user) {
return userView;
}

public Map<String, LocationView> getLocationsViews() {
return locationViews;
}
}
10 changes: 5 additions & 5 deletions app/src/test/java/com/team34/cse_110_project_team_34/LocationTimeTest.java
View file
Expand Up @@ -75,7 +75,7 @@ public void preTest() {
public void testIndicator() {
scenario.onActivity(activity -> {
ConstraintLayout layout = activity.findViewById(R.id.mainLayout);
Map<String, LocationView> views = activity.getLocationsViews();
Map<String, LocationView> views = activity.locationViews;
LocationView view = views.get(public_code);
assertNotNull("Invalid View", view);
assertEquals(view.statusView.getTag(), R.drawable.green_indicator);
Expand All @@ -94,7 +94,7 @@ public void testIndicator() {
public void testTimer() {
scenario.onActivity(activity -> {
ConstraintLayout layout = activity.findViewById(R.id.mainLayout);
Map<String, LocationView> views = activity.getLocationsViews();
Map<String, LocationView> views = activity.locationViews;
LocationView view = views.get(public_code);
assertNotNull("Invalid View", view);
assertEquals(view.timeView.getVisibility(), View.INVISIBLE);
Expand All @@ -115,7 +115,7 @@ public void testTimerTwo() {
scenario.moveToState(Lifecycle.State.RESUMED);
scenario.onActivity(activity -> {
ConstraintLayout layout = activity.findViewById(R.id.mainLayout);
Map<String, LocationView> views = activity.getLocationsViews();
Map<String, LocationView> views = activity.locationViews;
LocationView view = views.get(public_code);
assertNotNull("Invalid View", view);
assertEquals(view.timeView.getVisibility(), View.INVISIBLE);
Expand All @@ -133,7 +133,7 @@ public void testStory() {
repo.updateLocal(user);
scenario.onActivity(activity -> {
ConstraintLayout layout = activity.findViewById(R.id.mainLayout);
Map<String, LocationView> views = activity.getLocationsViews();
Map<String, LocationView> views = activity.locationViews;
LocationView view = views.get(public_code);
assertNotNull("Invalid View", view);

Expand All @@ -147,7 +147,7 @@ public void testStory() {
new_scenario.moveToState(Lifecycle.State.RESUMED);
new_scenario.onActivity(activity -> {
ConstraintLayout layout = activity.findViewById(R.id.mainLayout);
Map<String, LocationView> views = activity.getLocationsViews();
Map<String, LocationView> views = activity.locationViews;
LocationView view = views.get(public_code);
assertNotNull("Invalid View", view);
assertEquals(view.statusView.getTag(), R.drawable.green_indicator);
Expand Down
8 changes: 4 additions & 4 deletions app/src/test/java/com/team34/cse_110_project_team_34/ZoomTest.java
View file
Expand Up @@ -33,20 +33,20 @@ public void preTest() {
@Test
public void testZoomIn() {
scenario.onActivity(activity -> {
assertEquals(20, activity.radius, 1);
assertEquals(10, activity.radius, 1);
Button zoomIn = activity.findViewById(R.id.zoomInButton);
zoomIn.performClick();
assertEquals(10, activity.radius, 1);
assertEquals(1, activity.radius, 1);
});
}

@Test
public void testZoomOut() {
scenario.onActivity(activity -> {
assertEquals(20, activity.radius, 1);
assertEquals(10, activity.radius, 1);
Button zoomOut = activity.findViewById(R.id.zoomOutButton);
zoomOut.performClick();
assertEquals(40, activity.radius, 1);
assertEquals(500, activity.radius, 1);
});
}
}

0 comments on commit f502c10

Please sign in to comment.