Skip to content

Commit 5b2b1cf

Browse files
authored
Fix common tests to support patterns at end of string in useragent. (firebase#2700)
Old tests expected a whitespace between elements, but didn't account for the case when it's at the end of the string.
1 parent 929fa2b commit 5b2b1cf

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

firebase-common/src/test/java/com/google/firebase/platforminfo/FirebasePlatformLoggingTest.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import androidx.test.core.app.ApplicationProvider;
2424
import androidx.test.ext.junit.runners.AndroidJUnit4;
2525
import com.google.firebase.FirebaseOptions;
26+
import java.util.regex.Pattern;
2627
import org.junit.Test;
2728
import org.junit.runner.RunWith;
2829
import org.robolectric.annotation.Config;
@@ -79,7 +80,7 @@ public void test_watch_atNotHighEnoughApiLevel() {
7980
app -> {
8081
UserAgentPublisher ua = app.get(UserAgentPublisher.class);
8182

82-
assertThat(ua.getUserAgent()).contains("android-platform/ ");
83+
assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-platform/($|\\s)"));
8384
});
8485
}
8586

@@ -110,7 +111,7 @@ public void test_auto_atNotHighEnoughApiLevel() {
110111
app -> {
111112
UserAgentPublisher ua = app.get(UserAgentPublisher.class);
112113

113-
assertThat(ua.getUserAgent()).contains("android-platform/ ");
114+
assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-platform/($|\\s)"));
114115
});
115116
}
116117

@@ -141,7 +142,7 @@ public void test_embedded_atNotHighEnoughApiLevel() {
141142
app -> {
142143
UserAgentPublisher ua = app.get(UserAgentPublisher.class);
143144

144-
assertThat(ua.getUserAgent()).contains("android-platform/ ");
145+
assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-platform/($|\\s)"));
145146
});
146147
}
147148

@@ -153,7 +154,7 @@ public void test_installerPackage_withNoInstallerSet() {
153154
app -> {
154155
UserAgentPublisher ua = app.get(UserAgentPublisher.class);
155156

156-
assertThat(ua.getUserAgent()).contains("android-installer/ ");
157+
assertThat(ua.getUserAgent()).containsMatch(Pattern.compile("android-installer/($|\\s)"));
157158
});
158159
}
159160

0 commit comments

Comments
 (0)