Skip to content

Update library mockito-core to 5.3.1 and fix test #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 10, 2023
Merged

Update library mockito-core to 5.3.1 and fix test #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a75e38
Update library mockito-core to 5.1.0 and fix test
edsonjab Feb 23, 2023
843f54e
Update mockito-core to 5.2.0
edsonjab Mar 21, 2023
7520546
Update mockito-core to 5.3.0
edsonjab Apr 19, 2023
3943b19
Add .factorypath in .gitignore, update mockito-core to 5.3.1
edsonjab Apr 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,3 +128,4 @@ atlassian-ide-plugin.xml
.classpath
.project
.settings/
.factorypath
14 changes: 7 additions & 7 deletions analytics/src/test/java/com/segment/analytics/TypedInterceptorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.segment.analytics;

import static org.junit.Assert.assertNull;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

import com.segment.analytics.messages.AliasMessage;
import com.segment.analytics.messages.GroupMessage;
Expand All @@ -18,26 +18,26 @@ public void messagesFanOutCorrectly() {

AliasMessage alias = AliasMessage.builder("foo").userId("bar").build();
interceptor.intercept(alias);
verify(interceptor).alias(alias);
assertNull(interceptor.alias(alias));

GroupMessage group = GroupMessage.builder("foo").userId("bar").build();
interceptor.intercept(group);
verify(interceptor).group(group);
assertNull(interceptor.group(group));

IdentifyMessage identify = IdentifyMessage.builder().userId("bar").build();
interceptor.intercept(identify);
verify(interceptor).identify(identify);
assertNull(interceptor.identify(identify));

ScreenMessage screen = ScreenMessage.builder("foo").userId("bar").build();
interceptor.intercept(screen);
verify(interceptor).screen(screen);
assertNull(interceptor.screen(screen));

PageMessage page = PageMessage.builder("foo").userId("bar").build();
interceptor.intercept(page);
verify(interceptor).page(page);
assertNull(interceptor.page(page));

TrackMessage track = TrackMessage.builder("foo").userId("bar").build();
interceptor.intercept(track);
verify(interceptor).track(track);
assertNull(interceptor.track(track));
}
}
14 changes: 7 additions & 7 deletions analytics/src/test/java/com/segment/analytics/TypedTransformerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.segment.analytics;

import static org.junit.Assert.assertFalse;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

import com.segment.analytics.messages.AliasMessage;
import com.segment.analytics.messages.GroupMessage;
Expand All @@ -18,26 +18,26 @@ public void messagesFanOutCorrectly() {

AliasMessage.Builder alias = AliasMessage.builder("foo").userId("bar");
transformer.transform(alias);
verify(transformer).alias(alias);
assertFalse(transformer.alias(alias));

GroupMessage.Builder group = GroupMessage.builder("foo").userId("bar");
transformer.transform(group);
verify(transformer).group(group);
assertFalse(transformer.group(group));

IdentifyMessage.Builder identify = IdentifyMessage.builder().userId("bar");
transformer.transform(identify);
verify(transformer).identify(identify);
assertFalse(transformer.identify(identify));

ScreenMessage.Builder screen = ScreenMessage.builder("foo").userId("bar");
transformer.transform(screen);
verify(transformer).screen(screen);
assertFalse(transformer.screen(screen));

PageMessage.Builder page = PageMessage.builder("foo").userId("bar");
transformer.transform(page);
verify(transformer).page(page);
assertFalse(transformer.page(page));

TrackMessage.Builder track = TrackMessage.builder("foo").userId("bar");
transformer.transform(track);
verify(transformer).track(track);
assertFalse(transformer.track(track));
}
}
10 changes: 5 additions & 5 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
<kotlin.version>1.7.20</kotlin.version>
<spotless.version>2.27.2</spotless.version>
<retrofit.version>2.9.0</retrofit.version>
<auto.version>1.10</auto.version>
<auto.version>1.10.1</auto.version>

<findbugs.version>3.0.1</findbugs.version>
<gson.version>2.9.1</gson.version>
Expand All @@ -45,7 +45,7 @@
<!-- Test Dependencies -->
<junit.version>4.13.2</junit.version>
<burst.version>1.2.0</burst.version>
<mockito.version>4.9.0</mockito.version>
<mockito.version>5.3.1</mockito.version>
<assertj.version>3.24.2</assertj.version>
</properties>

Expand Down Expand Up @@ -189,7 +189,7 @@
<version>1.5</version>
<style>GOOGLE</style>
</googleJavaFormat>
<removeUnusedImports />
<removeUnusedImports/>
</java>
</configuration>
</plugin>
Expand Down Expand Up @@ -229,7 +229,7 @@
</goals>
</pluginExecutionFilter>
<action>
<ignore />
<ignore/>
</action>
</pluginExecution>
</pluginExecutions>
Expand Down Expand Up @@ -276,7 +276,7 @@
<format>html</format>
<format>xml</format>
</formats>
<check />
<check/>
</configuration>
</plugin>
<plugin>
Expand Down