Skip to content

Commit

Permalink
Remove lint warnings from tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@hannesa2 @d4rken
hannesa2 authored and d4rken committed Jul 10, 2022
1 parent 79b0f73 commit 37d78d7
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 187 deletions.
3 changes: 1 addition & 2 deletions exampleapp/src/main/java/org/matomo/demo/DemoActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
findViewById(R.id.trackGoalButton).setOnClickListener(v -> {
float revenue;
try {
revenue = Integer.valueOf(((EditText) findViewById(R.id.goalTextEditView)).getText().toString()
);
revenue = Integer.parseInt(((EditText) findViewById(R.id.goalTextEditView)).getText().toString());
} catch (Exception e) {
TrackHelper.track().exception(e).description("wrong revenue").with(getTracker());
revenue = 0;
Expand Down
8 changes: 4 additions & 4 deletions tracker/src/test/java/org/matomo/sdk/TrackMeTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
@RunWith(MockitoJUnitRunner.class)
public class TrackMeTest extends BaseTest {
@Test
public void testSourcingFromOtherTrackMe() throws Exception {
public void testSourcingFromOtherTrackMe() {
TrackMe base = new TrackMe();
for (QueryParams param : QueryParams.values()) {
String testValue = UUID.randomUUID().toString();
Expand Down Expand Up @@ -54,7 +54,7 @@ public void testAdd_overwrite() {
}

@Test
public void testSet() throws Exception {
public void testSet() {
TrackMe trackMe = new TrackMe();
trackMe.set(QueryParams.HOURS, "String");
assertEquals("String", trackMe.get(QueryParams.HOURS));
Expand All @@ -77,7 +77,7 @@ public void testSet() throws Exception {
}

@Test
public void testTrySet() throws Exception {
public void testTrySet() {
TrackMe trackMe = new TrackMe();
trackMe.trySet(QueryParams.HOURS, "A");
trackMe.trySet(QueryParams.HOURS, "B");
Expand Down Expand Up @@ -105,7 +105,7 @@ public void testTrySet() throws Exception {
}

@Test
public void testSetAll() throws Exception {
public void testSetAll() {
TrackMe trackMe = new TrackMe();
Map<QueryParams, String> testValues = new HashMap<>();
for (QueryParams param : QueryParams.values()) {
Expand Down
39 changes: 20 additions & 19 deletions tracker/src/test/java/org/matomo/sdk/TrackerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.matomo.sdk.QueryParams.FIRST_VISIT_TIMESTAMP;
import static org.matomo.sdk.QueryParams.SESSION_START;
import static org.mockito.ArgumentMatchers.any;
Expand All @@ -56,9 +57,6 @@ public class TrackerTest {
@Mock DeviceHelper mDeviceHelper;
SharedPreferences mTrackerPreferences = new TestPreferences();
SharedPreferences mPreferences = new TestPreferences();
private final String mApiUrl = "http://example.com";
private final int mSiteId = 11;
private final String mTrackerName = "Default Tracker";
@Mock TrackerBuilder mTrackerBuilder;

@Before
Expand All @@ -74,8 +72,11 @@ public void setup() {
when(mDeviceHelper.getUserAgent()).thenReturn("aUserAgent");
when(mDeviceHelper.getUserLanguage()).thenReturn("en");

String mApiUrl = "http://example.com";
when(mTrackerBuilder.getApiUrl()).thenReturn(mApiUrl);
int mSiteId = 11;
when(mTrackerBuilder.getSiteId()).thenReturn(mSiteId);
String mTrackerName = "Default Tracker";
when(mTrackerBuilder.getTrackerName()).thenReturn(mTrackerName);
when(mTrackerBuilder.getApplicationBaseUrl()).thenReturn("http://this.is.our.package/");

Expand Down Expand Up @@ -302,7 +303,7 @@ public void testApplicationDomain() {
TrackHelper.track().screen("test/test").title("Test title").with(tracker);
verify(mDispatcher).submit(mCaptor.capture());
validateDefaultQuery(mCaptor.getValue());
assertTrue(mCaptor.getValue().get(QueryParams.URL_PATH).equals("http://my-domain.com/test/test"));
assertEquals("http://my-domain.com/test/test", mCaptor.getValue().get(QueryParams.URL_PATH));
}

@Test(expected = IllegalArgumentException.class)
Expand Down Expand Up @@ -441,7 +442,7 @@ public void testSetNewSession() {
@Test
public void testSetNewSessionRaceCondition() {
for (int retry = 0; retry < 5; retry++) {
final List<TrackMe> trackMes = Collections.synchronizedList(new ArrayList<TrackMe>());
final List<TrackMe> trackMes = Collections.synchronizedList(new ArrayList<>());
doAnswer(invocation -> {
trackMes.add(invocation.getArgument(0));
return null;
Expand Down Expand Up @@ -501,7 +502,7 @@ public void testCheckSessionTimeout() {
tracker.setSessionTimeout(60000);
TrackHelper.track().screen("test").with(tracker);
verify(mDispatcher, times(3)).submit(mCaptor.capture());
assertEquals(null, mCaptor.getValue().get(QueryParams.SESSION_START));
assertNull(mCaptor.getValue().get(SESSION_START));
}

@Test
Expand All @@ -520,8 +521,8 @@ public void testTrackerEquals() {
Tracker tracker3 = new Tracker(mMatomo, builder3);

assertNotNull(tracker);
assertFalse(tracker.equals(tracker2));
assertTrue(tracker.equals(tracker3));
assertNotEquals(tracker, tracker2);
assertEquals(tracker, tracker3);
}

@Test
Expand Down Expand Up @@ -560,7 +561,7 @@ public void testSetUserAgent() {
trackMe = new TrackMe();
tracker.getDefaultTrackMe().set(QueryParams.USER_AGENT, null);
tracker.track(trackMe);
assertEquals(null, trackMe.get(QueryParams.USER_AGENT));
assertNull(trackMe.get(QueryParams.USER_AGENT));
}

@Test
Expand Down Expand Up @@ -620,7 +621,7 @@ public void testVisitCountMultipleThreads() throws Exception {

@Test
public void testSessionStartRaceCondition() throws Exception {
final List<TrackMe> trackMes = Collections.synchronizedList(new ArrayList<TrackMe>());
final List<TrackMe> trackMes = Collections.synchronizedList(new ArrayList<>());
doAnswer(invocation -> {
trackMes.add(invocation.getArgument(0));
return null;
Expand All @@ -643,19 +644,19 @@ public void testSessionStartRaceCondition() throws Exception {
countDownLatch.countDown();
} catch (Exception e) {
e.printStackTrace();
assertFalse(true);
fail();
}
}).start();
}
countDownLatch.await();
for (TrackMe out : trackMes) {
if (trackMes.indexOf(out) == 0) {
assertTrue(i + "#" + out.toMap().size(), out.get(QueryParams.LANGUAGE) != null);
assertTrue(out.get(QueryParams.FIRST_VISIT_TIMESTAMP) != null);
assertTrue(out.get(SESSION_START) != null);
assertNotNull(i + "#" + out.toMap().size(), out.get(QueryParams.LANGUAGE));
assertNotNull(out.get(FIRST_VISIT_TIMESTAMP));
assertNotNull(out.get(SESSION_START));
} else {
assertTrue(out.get(QueryParams.FIRST_VISIT_TIMESTAMP) == null);
assertTrue(out.get(SESSION_START) == null);
assertNull(out.get(FIRST_VISIT_TIMESTAMP));
assertNull(out.get(SESSION_START));
}
}
}
Expand All @@ -666,12 +667,12 @@ public void testFirstVisitMultipleThreads() throws Exception {
Tracker tracker = new Tracker(mMatomo, mTrackerBuilder);
int threadCount = 100;
final CountDownLatch countDownLatch = new CountDownLatch(threadCount);
final List<Long> firstVisitTimes = Collections.synchronizedList(new ArrayList<Long>());
final List<Long> firstVisitTimes = Collections.synchronizedList(new ArrayList<>());
for (int i = 0; i < threadCount; i++) {
new Thread(() -> {
TestHelper.sleep(new Random().nextInt(20 - 0) + 0);
TrackHelper.track().event("TestCategory", "TestAction").with(tracker);
long firstVisit = Long.valueOf(tracker.getDefaultTrackMe().get(FIRST_VISIT_TIMESTAMP));
long firstVisit = Long.parseLong(tracker.getDefaultTrackMe().get(FIRST_VISIT_TIMESTAMP));
firstVisitTimes.add(firstVisit);
countDownLatch.countDown();
}).start();
Expand All @@ -695,7 +696,7 @@ public void testPreviousVisits() {

}
assertFalse(previousVisitTimes.contains(0L));
Long lastTime = 0L;
long lastTime = 0L;
for (Long time : previousVisitTimes) {
assertTrue(lastTime < time);
lastTime = time;
Expand Down
Loading

0 comments on commit 37d78d7

Please sign in to comment.