Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Edit package name" #152

Merged
merged 1 commit into from
Dec 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/RunUsAndroid/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ apply plugin: 'checkstyle'


android {
namespace 'com.runus.runusandroid'
namespace 'com.example.runusandroid'
compileSdk 34

defaultConfig {
applicationId "com.runus.runusandroid"
applicationId "com.example.runusandroid"
minSdk 26
targetSdk 33
versionCode 1
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.runus.runusandroid;

import static org.junit.Assert.assertEquals;
package com.example.runusandroid;

import android.content.Context;

import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
Expand All @@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
assertEquals("com.runus.runusandroid", appContext.getPackageName());
assertEquals("com.example.runusandroid", appContext.getPackageName());
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.runus.runusandroid;
package com.example.runusandroid;

import static org.junit.Assert.assertEquals;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.runus.runusandroid;
package com.example.runusandroid;

import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
Expand All @@ -9,11 +9,12 @@
import static androidx.test.espresso.matcher.ViewMatchers.withId;

import androidx.test.core.app.ActivityScenario;
import androidx.test.espresso.matcher.ViewMatchers;
import androidx.test.espresso.contrib.NavigationViewActions;
import androidx.test.ext.junit.rules.ActivityScenarioRule;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.GrantPermissionRule;

import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.Test;
Expand Down Expand Up @@ -45,10 +46,10 @@ public class LoginTests {
public GrantPermissionRule permissionPostNotification = GrantPermissionRule.grant(android.Manifest.permission.POST_NOTIFICATIONS);

@BeforeClass
public static void beforeClass() throws InterruptedException {
public static void beforeClass() throws InterruptedException{
Thread.sleep(1000);
loginActivityScenario = ActivityScenario.launch(LoginActivity.class);
onView(ViewMatchers.withId(R.id.IdInput))
onView(withId(R.id.IdInput))
.perform(typeText("test"), closeSoftKeyboard());
onView(withId(R.id.PasswordInput))
.perform(typeText("test"), closeSoftKeyboard());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,44 +1,64 @@
package com.runus.runusandroid;
package com.example.runusandroid;

import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.actionWithAssertions;
import static androidx.test.espresso.action.ViewActions.clearText;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.action.ViewActions.closeSoftKeyboard;
import static androidx.test.espresso.action.ViewActions.pressBack;
import static androidx.test.espresso.action.ViewActions.replaceText;
import static androidx.test.espresso.action.ViewActions.typeText;
import static androidx.test.espresso.assertion.ViewAssertions.matches;
import static androidx.test.espresso.contrib.PickerActions.setTime;
import static androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom;
import static androidx.test.espresso.matcher.ViewMatchers.isDisplayed;
import static androidx.test.espresso.matcher.ViewMatchers.isRoot;
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.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.anyOf;
import static org.hamcrest.Matchers.endsWith;
import static org.hamcrest.Matchers.not;

import static org.hamcrest.Matchers.allOf;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;

import android.app.PendingIntent;
import android.content.Intent;
import android.icu.util.Calendar;
import android.util.Log;
import android.view.InputDevice;
import android.view.MotionEvent;
import android.view.View;
import android.widget.NumberPicker;
import android.widget.TextView;
import android.widget.TimePicker;

import androidx.test.core.app.ActivityScenario;
import androidx.test.espresso.UiController;
import androidx.test.espresso.ViewAction;
import androidx.test.espresso.ViewInteraction;
import androidx.test.espresso.action.GeneralClickAction;
import androidx.test.espresso.action.GeneralLocation;
import androidx.test.espresso.action.GeneralSwipeAction;
import androidx.test.espresso.action.Press;
import androidx.test.espresso.action.Swipe;
import androidx.test.espresso.action.Tap;
import androidx.test.espresso.matcher.ViewMatchers;
import androidx.test.espresso.action.ViewActions;
import androidx.test.espresso.contrib.NavigationViewActions;
import androidx.test.espresso.contrib.PickerActions;
import androidx.test.ext.junit.rules.ActivityScenarioRule;
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ActivityTestRule;
import androidx.test.rule.GrantPermissionRule;

import com.example.runusandroid.ActivityRecognition.UserActivityBroadcastReceiver;
import com.example.runusandroid.ActivityRecognition.UserActivityTransitionManager;
import com.google.android.gms.location.LocationServices;

import org.hamcrest.Matcher;
import org.junit.After;
import org.junit.Before;
Expand All @@ -50,12 +70,6 @@
@RunWith(AndroidJUnit4.class)
public class MultiModeTests {
public static ActivityScenario<LoginActivity> loginActivityScenario;
private final ViewAction clickTopCentre = actionWithAssertions(new GeneralClickAction(
Tap.SINGLE, GeneralLocation.TOP_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY));
private final ViewAction clickBottomCentre = actionWithAssertions(new GeneralClickAction(
Tap.SINGLE, GeneralLocation.BOTTOM_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY));
private final ViewAction swipeDown = actionWithAssertions(new GeneralSwipeAction(
Swipe.FAST, GeneralLocation.VISIBLE_CENTER, GeneralLocation.BOTTOM_CENTER, Press.FINGER));
public ActivityScenario<MainActivity2> mainActivityScenario;
@Rule
public GrantPermissionRule permissionInternet = GrantPermissionRule.grant(android.Manifest.permission.INTERNET);
Expand All @@ -69,20 +83,28 @@ public class MultiModeTests {
public GrantPermissionRule permissionFineLocation = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_FINE_LOCATION);
@Rule
public GrantPermissionRule permissionBackgroundLocation = GrantPermissionRule.grant(android.Manifest.permission.ACCESS_BACKGROUND_LOCATION);
// @Rule
// public ActivityScenarioRule<MainActivity2> mActivityRule =
// new ActivityScenarioRule<>(MainActivity2.class);
@Rule
public GrantPermissionRule permissionReadStorage = GrantPermissionRule.grant(android.Manifest.permission.READ_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule permissionWriteStorage = GrantPermissionRule.grant(android.Manifest.permission.WRITE_EXTERNAL_STORAGE);
@Rule
public GrantPermissionRule permissionPostNotification = GrantPermissionRule.grant(android.Manifest.permission.POST_NOTIFICATIONS);
// @Rule
// public ActivityScenarioRule<MainActivity2> mActivityRule =
// new ActivityScenarioRule<>(MainActivity2.class);

private ViewAction clickTopCentre = actionWithAssertions(new GeneralClickAction(
Tap.SINGLE, GeneralLocation.TOP_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY));
private ViewAction clickBottomCentre = actionWithAssertions(new GeneralClickAction(
Tap.SINGLE, GeneralLocation.BOTTOM_CENTER, Press.FINGER, InputDevice.SOURCE_UNKNOWN, MotionEvent.BUTTON_PRIMARY));
private ViewAction swipeDown = actionWithAssertions(new GeneralSwipeAction(
Swipe.FAST, GeneralLocation.VISIBLE_CENTER, GeneralLocation.BOTTOM_CENTER, Press.FINGER));


@BeforeClass
public static void beforeClass() throws InterruptedException {
public static void beforeClass() throws InterruptedException{
loginActivityScenario = ActivityScenario.launch(LoginActivity.class);
onView(ViewMatchers.withId(R.id.IdInput))
onView(withId(R.id.IdInput))
.perform(typeText("test"), closeSoftKeyboard());
onView(withId(R.id.PasswordInput))
.perform(typeText("test"), closeSoftKeyboard());
Expand All @@ -91,36 +113,6 @@ public static void beforeClass() throws InterruptedException {
Thread.sleep(1000);
}

public static String getText(final Matcher<View> matcher) {
try {
final String[] stringHolder = {null};
onView(matcher).perform(new ViewAction() {
@Override
public Matcher<View> getConstraints() {
return isAssignableFrom(TextView.class);
}

@Override
public String getDescription() {
return "get text";
}

@Override
public void perform(UiController uiController, View view) {
TextView tv = (TextView) view;
stringHolder[0] = tv.getText().toString();
}
});
if (stringHolder[0] == null || stringHolder[0] == "") {
fail("no text found");
}
return stringHolder[0];
} catch (Exception e) {
fail("null found");
return null;
}

}

@Before
public void before() {
Expand Down Expand Up @@ -151,7 +143,7 @@ public void roomCreation_play() throws InterruptedException {
Thread.sleep(1000);
onView(withId(R.id.dailyTime)).check(matches(not(withText(""))));
firstHistoryTime = getText(withId(R.id.dailyTime));
Log.d("History_log_test", "firstHistoryTime: " + firstHistoryTime);
Log.d("History_log_test","firstHistoryTime: " + firstHistoryTime);
assertNotNull(firstHistoryTime);
mainActivityScenario.onActivity(activity -> {
activity.navController.navigate(R.id.navigation_multi_mode);
Expand Down Expand Up @@ -196,6 +188,37 @@ public void roomCreation_play() throws InterruptedException {

}

public static String getText(final Matcher<View> matcher) {
try {
final String[] stringHolder = {null};
onView(matcher).perform(new ViewAction() {
@Override
public Matcher<View> getConstraints() {
return isAssignableFrom(TextView.class);
}

@Override
public String getDescription() {
return "get text";
}

@Override
public void perform(UiController uiController, View view) {
TextView tv = (TextView) view;
stringHolder[0] = tv.getText().toString();
}
});
if (stringHolder[0] == null || stringHolder[0] == "") {
fail("no text found");
}
return stringHolder[0];
} catch (Exception e) {
fail("null found");
return null;
}

}


}

Loading
Loading