Skip to content
This repository was archived by the owner on Jul 25, 2024. It is now read-only.

Commit bc5a25f

Browse files
kunall17timabbott
authored andcommitted
Reformat project using the default Android Studio formatting.
1 parent 5c9a5c7 commit bc5a25f

File tree

102 files changed

+1794
-1879
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1794
-1879
lines changed

app/src/androidTest/java/com/zulip/android/activities/BaseTest.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,16 @@
3737
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
3838
public class BaseTest {
3939

40+
public static final String SERVER_URL = "www.local.test.com";
4041
private static final String PASSWORD_TEST = "yourpasswordhere";
4142
private static final String EMAIL_TEST = "[email protected]";
42-
public static final String SERVER_URL = "www.local.test.com";
43-
4443
@Rule
4544
public ActivityTestRule<ZulipActivity> mActivityTestRule = new ActivityTestRule<>(ZulipActivity.class);
4645

46+
public static Matcher<Root> isToast() {
47+
return new ToastMatcher();
48+
}
49+
4750
@Before
4851
public void setUp() {
4952
if (ZulipApp.get().getApiKey() != null) {
@@ -89,10 +92,6 @@ public void WrongLoginPasswordToast() {
8992
onView(withText("Your username or password is incorrect.")).inRoot(isToast()).check(matches(isDisplayed()));
9093
}
9194

92-
public static Matcher<Root> isToast() {
93-
return new ToastMatcher();
94-
}
95-
9695
@Test
9796
public void logout() {
9897
try {

app/src/androidTest/java/com/zulip/android/activities/LoginDevAuthTest.java

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,11 @@
3838
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
3939
public class LoginDevAuthTest {
4040

41-
@Rule
42-
public ActivityTestRule<ZulipActivity> mActivityTestRule = new ActivityTestRule<>(ZulipActivity.class);
43-
4441
private static String EMAIL_TEST = "";
4542
private static String SERVER_URL = "http://www.local.test.com";
46-
43+
private static boolean matchedBefore = false;
44+
@Rule
45+
public ActivityTestRule<ZulipActivity> mActivityTestRule = new ActivityTestRule<>(ZulipActivity.class);
4746

4847
// Convenience helper
4948
@Test
@@ -61,7 +60,6 @@ public void TestSerially() {
6160
loginThroughDevMail();
6261
}
6362

64-
6563
public void getDevEmails() {
6664
try {
6765
Thread.sleep(1000);
@@ -85,8 +83,6 @@ public void getDevEmails() {
8583
onView(withId(R.id.devAuthRecyclerView)).check(hasItemsCount());
8684
}
8785

88-
private static boolean matchedBefore = false;
89-
9086
private void loginThroughDevMail() {
9187
//If EMAIL not specified click on first EMAIL.
9288
if (EMAIL_TEST.equals("")) {

app/src/androidTest/java/com/zulip/android/activities/RecyclerViewTests.java

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,29 @@
4747
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
4848
@RunWith(AndroidJUnit4.class)
4949
public class RecyclerViewTests {
50-
@Rule
51-
public ActivityTestRule<ZulipActivity> mActivityTestRule = new ActivityTestRule<>(ZulipActivity.class);
52-
5350
public static String LOG_TAG = RecyclerViewTests.class.getName();
5451
private static String testMessageStream;
5552
private static String testMessagePrivate;
56-
53+
@Rule
54+
public ActivityTestRule<ZulipActivity> mActivityTestRule = new ActivityTestRule<>(ZulipActivity.class);
5755
private ZulipApp app;
5856

57+
public static String getTestMessageStream() {
58+
return testMessageStream;
59+
}
60+
61+
public static void setTestMessageStream(String testMessageStream) {
62+
RecyclerViewTests.testMessageStream = testMessageStream;
63+
}
64+
65+
public static String getTestMessagePrivate() {
66+
return testMessagePrivate;
67+
}
68+
69+
public static void setTestMessagePrivate(String testMessagePrivate) {
70+
RecyclerViewTests.testMessagePrivate = testMessagePrivate;
71+
}
72+
5973
@Before
6074
public void setUp() {
6175
app = ZulipApp.get();
@@ -168,7 +182,6 @@ public void run() {
168182
onView(withId(R.id.recyclerView)).check(ViewAssertions.checkIfBelongToSameNarrow(mActivityTestRule.getActivity()));
169183
}
170184

171-
172185
@Test
173186
public void checkOrderOfMessagesCurrentList() {
174187
sleep(2000);
@@ -181,7 +194,6 @@ public void checkIfMessagesMatchTheHeaderParent() {
181194
onView(withId(R.id.recyclerView)).check(ViewAssertions.checkIfMessagesMatchTheHeaderParent(mActivityTestRule.getActivity()));
182195
}
183196

184-
185197
@Test
186198
public void checkTodaysFilter() {
187199
sleep(2000);
@@ -205,7 +217,6 @@ public void run() {
205217
onView(withId(R.id.recyclerView)).check(checkMessagesOnlyFromToday());
206218
}
207219

208-
209220
@Test
210221
public void sendPrivateMessage() {
211222
//Wait to make sure the messages are loaded
@@ -262,20 +273,4 @@ public void run() {
262273
//Check if Arrow TextView is not displayed for switchingChatBox
263274
onView(withId(R.id.textView)).check(matches(not(isDisplayed())));
264275
}
265-
266-
public static String getTestMessageStream() {
267-
return testMessageStream;
268-
}
269-
270-
public static void setTestMessageStream(String testMessageStream) {
271-
RecyclerViewTests.testMessageStream = testMessageStream;
272-
}
273-
274-
public static String getTestMessagePrivate() {
275-
return testMessagePrivate;
276-
}
277-
278-
public static void setTestMessagePrivate(String testMessagePrivate) {
279-
RecyclerViewTests.testMessagePrivate = testMessagePrivate;
280-
}
281276
}

app/src/androidTest/java/com/zulip/android/test/UnsortedTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ private Message sampleMessage(ZulipApp app, int id) throws SQLException {
220220
TESTUSER_EXAMPLE_COM, ""));
221221
rtr.setContent("Test message");
222222
rtr.setType(MessageType.PRIVATE_MESSAGE);
223-
rtr.setRecipient(new String[] {TESTUSER_EXAMPLE_COM});
223+
rtr.setRecipient(new String[]{TESTUSER_EXAMPLE_COM});
224224
rtr.setID(id);
225225
messageDao.create(rtr);
226226
return rtr;

app/src/androidTest/java/com/zulip/android/test/mutated/FakeAsyncGetOldMessages.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package com.zulip.android.test.mutated;
22

3-
import java.util.ArrayList;
4-
import java.util.List;
5-
6-
import com.zulip.android.models.Message;
73
import com.zulip.android.activities.MessageListFragment;
4+
import com.zulip.android.models.Message;
85
import com.zulip.android.models.MessageRange;
9-
import com.zulip.android.util.MessageListener.LoadPosition;
106
import com.zulip.android.networking.AsyncGetOldMessages;
7+
import com.zulip.android.util.MessageListener.LoadPosition;
8+
9+
import java.util.ArrayList;
10+
import java.util.List;
1111

1212
public class FakeAsyncGetOldMessages extends
1313
AsyncGetOldMessages {
14+
public List<Message> appendTheseMessages;
15+
public List<FakeAsyncGetOldMessages> recurseRequestsReceived;
1416
private String calculatedResult;
1517
private int fmAnchor;
1618
private int fmNumBefore;
1719
private int fmNumAfter;
1820
private boolean shouldFmSucceed;
1921
private boolean fmCalled;
20-
public List<Message> appendTheseMessages;
21-
public List<FakeAsyncGetOldMessages> recurseRequestsReceived;
2222
private MessageListFragment myfragment;
2323

2424
public FakeAsyncGetOldMessages(MessageListFragment fragment) {
@@ -39,7 +39,7 @@ public void executeBasedOnPresetValues() {
3939

4040
@Override
4141
protected boolean fetchMessages(int anchor, int numBefore, int numAfter,
42-
String[] params) {
42+
String[] params) {
4343
fmCalled = true;
4444
fmAnchor = anchor;
4545
fmNumBefore = numBefore;
@@ -52,7 +52,7 @@ protected boolean fetchMessages(int anchor, int numBefore, int numAfter,
5252

5353
@Override
5454
protected void recurse(LoadPosition position, int amount, MessageRange rng,
55-
int anchor) {
55+
int anchor) {
5656
FakeAsyncGetOldMessages task = new FakeAsyncGetOldMessages(myfragment);
5757
task.rng = rng;
5858
if (position == LoadPosition.ABOVE) {

app/src/debug/res/xml/file_paths.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<paths>
3-
<external-path name="images" path="Android/data/com.zulip.android.dev/files/Pictures" />
3+
<external-path
4+
name="images"
5+
path="Android/data/com.zulip.android.dev/files/Pictures" />
46
</paths>

0 commit comments

Comments
 (0)