Skip to content

Commit a98f3e3

Browse files
authored
Update/tests (#6)
* Update tests to more accurately match dates and optimize test imports
1 parent 29b344f commit a98f3e3

File tree

1 file changed

+13
-17
lines changed

1 file changed

+13
-17
lines changed

src/test/java/com/segment/analytics/android/integration/firebase/FirebaseTest.java

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,39 @@
11
package com.segment.analytics.android.integration.firebase;
22

3-
import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
4-
import static com.segment.analytics.Utils.createTraits;
5-
import static org.assertj.core.api.Assertions.assertThat;
6-
import static org.mockito.Matchers.eq;
7-
import static org.mockito.Mockito.verify;
8-
9-
import android.app.Activity;
103
import android.content.Context;
114
import android.os.Bundle;
125

136
import com.google.firebase.analytics.FirebaseAnalytics;
7+
import com.segment.analytics.Properties;
148
import com.segment.analytics.Traits;
159
import com.segment.analytics.android.integrations.firebase.FirebaseIntegration;
16-
import com.segment.analytics.Properties;
1710
import com.segment.analytics.core.tests.BuildConfig;
1811
import com.segment.analytics.integrations.Logger;
1912
import com.segment.analytics.test.IdentifyPayloadBuilder;
2013
import com.segment.analytics.test.TrackPayloadBuilder;
21-
import java.util.Date;
2214

15+
import org.hamcrest.Description;
16+
import org.hamcrest.TypeSafeMatcher;
2317
import org.junit.Before;
2418
import org.junit.Rule;
2519
import org.junit.Test;
2620
import org.junit.runner.RunWith;
27-
import org.mockito.Mock;
2821
import org.mockito.Mockito;
29-
import static org.mockito.Matchers.argThat;
30-
import org.hamcrest.Description;
31-
import org.hamcrest.TypeSafeMatcher;
3222
import org.powermock.api.mockito.PowerMockito;
3323
import org.powermock.core.classloader.annotations.PowerMockIgnore;
3424
import org.powermock.core.classloader.annotations.PrepareForTest;
3525
import org.powermock.modules.junit4.rule.PowerMockRule;
36-
import static org.powermock.api.mockito.PowerMockito.mock;
3726
import org.robolectric.RobolectricTestRunner;
3827
import org.robolectric.annotation.Config;
3928

29+
import java.util.Date;
30+
31+
import static com.segment.analytics.Analytics.LogLevel.VERBOSE;
32+
import static com.segment.analytics.Utils.createTraits;
33+
import static org.mockito.Matchers.argThat;
34+
import static org.mockito.Matchers.eq;
35+
import static org.mockito.Mockito.verify;
36+
4037
@RunWith(RobolectricTestRunner.class)
4138
@Config(constants = BuildConfig.class)
4239
@PowerMockIgnore({ "org.mockito.*", "org.roboelectric.*", "android.*" })
@@ -76,14 +73,13 @@ public void identifyWithTraits() {
7673
.putValue("Sign Up Date", new Date(117, 6, 14))
7774
.putValue(" extra spaces ", "bar");
7875

79-
8076
integration.identify(new IdentifyPayloadBuilder().traits(traits).build());
8177

8278
verify(firebase).setUserId("foo");
8379
verify(firebase).setUserProperty("firstName", "bar");
8480
verify(firebase).setUserProperty("lastName", "baz");
8581
verify(firebase).setUserProperty("anonymousId", "123");
86-
verify(firebase).setUserProperty("Sign_Up_Date", "Fri Jul 14 00:00:00 PDT 2017");
82+
verify(firebase).setUserProperty("Sign_Up_Date", String.valueOf(new Date(117, 6, 14)));
8783
verify(firebase).setUserProperty("extra_spaces", "bar");
8884
}
8985

@@ -110,7 +106,7 @@ public void trackWithProperties() {
110106
expected.putInt("integer", 1);
111107
expected.putDouble("double", 1.0);
112108
expected.putString("string", "foo");
113-
expected.putString("date", "Sun Jan 01 00:00:00 PST 2017");
109+
expected.putString("date", String.valueOf(new Date(117, 0, 1)));
114110
expected.putString("key_with_spaces", "bar");
115111
expected.putDouble("value", 100.0);
116112
expected.putString("currency", "USD");

0 commit comments

Comments
 (0)