-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fixed issue with test failing due to wrong name
- Loading branch information
1 parent
3421b80
commit 88727a9
Showing
5 changed files
with
74 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 19 additions & 1 deletion
20
GNSS_Compare/app/src/main/java/com/galfins/gnss_compare/UserNotifier.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,27 @@ | ||
| package com.galfins.gnss_compare; | ||
|
|
||
| import android.support.design.widget.Snackbar; | ||
|
|
||
| /** | ||
| * Created by pc1 on 30-Dec-18. | ||
| * This class is for: | ||
| */ | ||
| public abstract class UserNotifier { | ||
| public abstract void notifyUser(String text, int duration, String id); | ||
|
|
||
| /** | ||
| * This method should implement a way to display the text to the user | ||
| * @param text Text do be displayed to be user | ||
| * @param duration duration of the message (ms) | ||
| * @param id id of the message (for advanced handling) | ||
| */ | ||
| protected abstract void displayMessage(String text, int duration, String id); | ||
|
|
||
| public void notifyUser(String text, int duration, String id){ | ||
| if(duration == Snackbar.LENGTH_SHORT) | ||
| duration = 2000; | ||
| else if (duration == Snackbar.LENGTH_LONG) | ||
| duration = 3500; | ||
|
|
||
| displayMessage(text, duration, id); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
73 changes: 46 additions & 27 deletions
73
GNSS_Compare/app/src/test/java/com/galfins/gnss_compare/UserNotifierTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,27 +1,46 @@ | ||
| package com.galfins.gnss_compare; | ||
|
|
||
| import static org.junit.Assert.*; | ||
|
|
||
| import org.junit.Test; | ||
|
|
||
| import org.junit.runner.RunWith; | ||
| import org.mockito.Mock; | ||
| import org.mockito.runners.MockitoJUnitRunner; | ||
| import static org.mockito.Mockito.when; | ||
|
|
||
| /** | ||
| * Test for the user MainActivity's implementation of User Notifier | ||
| * | ||
| * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> | ||
| */ | ||
| @RunWith(MockitoJUnitRunner.class) | ||
| public class UserNotifierTest { | ||
| /** | ||
| * Testing creation from description | ||
| * @throws Exception | ||
| */ | ||
| @Test | ||
| public void MainActivityUserNotifierTest() throws Exception{ | ||
|
|
||
| } | ||
| } | ||
| //package com.galfins.gnss_compare; | ||
| // | ||
| //import static org.junit.Assert.*; | ||
| // | ||
| //import org.junit.Rule; | ||
| //import org.junit.Test; | ||
| // | ||
| //import org.junit.runner.RunWith; | ||
| //import org.mockito.Mock; | ||
| //import org.mockito.runners.MockitoJUnitRunner; | ||
| //import static org.mockito.Mockito.when; | ||
| // | ||
| ///** | ||
| // * Test for the user MainActivity's implementation of User Notifier | ||
| // * | ||
| // * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> | ||
| // */ | ||
| //@RunWith(AndroidJUnit4.class) | ||
| //public class UserNotifierTest { | ||
| // | ||
| // private class TestUserNotifier extends UserNotifier{ | ||
| // | ||
| // private String lastMessage = null; | ||
| // private int lastDuration; | ||
| // private String lastId = null; | ||
| // | ||
| // @Override | ||
| // protected void displayMessage(String text, int duration, String id) { | ||
| // lastMessage = text; | ||
| // lastDuration = duration; | ||
| // lastId = id; | ||
| // } | ||
| // } | ||
| // | ||
| //// @Rule | ||
| //// public final ServiceTestRule mServiceRule = new ServiceTestRule(); | ||
| // | ||
| // /** | ||
| // * Testing creation from description | ||
| // * @throws Exception | ||
| // */ | ||
| // @Test | ||
| // public void MainActivityUserNotifierTest() throws Exception{ | ||
| // | ||
| // } | ||
| //} |