Skip to content

#5 Added MockedStatic.verify() to mockito rules #6

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

Open
Bramaten wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#5 Added MockedStatic.verify() to mockito rules #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/jqassistant-rules/mockito.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
MATCH
(assertType:Java:Type)-[:DECLARES]->(assertMethod:Java:Method)
WHERE
assertType.fqn = 'org.mockito.Mockito'
and assertMethod.signature =~ '.* verify.*'
assertType.fqn = 'org.mockito.Mockito' and assertMethod.signature =~ '.* verify.*'
OR assertType.fqn = 'org.mockito.MockedStatic' and assertMethod.signature =~ '.* verify.*'
SET
assertMethod:Mockito:Assert
RETURN
Expand Down
10 changes: 10 additions & 0 deletions src/test/java/org/jqassistant/plugin/java_testing/concept/AssertExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@
import org.camunda.bpm.engine.repository.ProcessDefinition;
import org.camunda.bpm.engine.test.assertions.bpmn.BpmnAwareTests;
import org.mockito.BDDMockito;
import org.mockito.MockedStatic;
import org.xmlunit.assertj.XmlAssert;
import reactor.test.StepVerifier;

import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.mockStatic;

/**
* Example class used by integration tests.
Expand All @@ -29,6 +31,14 @@ void mockitoVerifyExampleMethod() {
verify(mock(Object.class).equals(any(Object.class)));
}

private static final String test = "testString";

void mockedStaticVerifyExampleMethod() {
try (MockedStatic<String> mocked = mockStatic(String.class)) {
mocked.verify(() -> test.equals("testString"));
}
}

void bddMockitoThenShouldExampleMethod() {
BDDMockito.then(mock(Object.class)).shouldHaveNoInteractions();
}
Expand Down
14 changes: 11 additions & 3 deletions src/test/java/org/jqassistant/plugin/java_testing/concept/MockitoIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

import org.junit.jupiter.api.Test;
import org.mockito.BDDMockito;
import org.mockito.MockedStatic;
import org.mockito.Mockito;

import static com.buschmais.jqassistant.core.report.api.model.Result.Status.SUCCESS;
Expand All @@ -32,16 +33,23 @@ void mockitoVerifyMethod() throws Exception {

store.beginTransaction();

assertThat(conceptResult.getRows().size()).isEqualTo(1);
assertThat(conceptResult.getRows().size()).isEqualTo(2);
assertThat(conceptResult.getRows()
.get(0)
.getColumns()
.get("assertMethod")
.getValue()).asInstanceOf(type(MethodDescriptor.class))
.is(methodDescriptor(Mockito.class, "verify", Object.class));

assertThat(conceptResult.getRows()
.get(1)
.getColumns()
.get("assertMethod")
.getValue()).asInstanceOf(type(MethodDescriptor.class))
.is(methodDescriptor(MockedStatic.class, "verify", MockedStatic.Verification.class));

final TestResult methodQueryResultForMockito = getMethodQueryResultForMockito();
assertThat(methodQueryResultForMockito.getRows().size()).isEqualTo(1);
assertThat(methodQueryResultForMockito.getRows().size()).isEqualTo(2);
verifyMockitoVerifyExampleContained(methodQueryResultForMockito);

store.commitTransaction();
Expand Down Expand Up @@ -89,7 +97,7 @@ void providedConceptAssertMethod() throws Exception {
assertThat(declaringTypes).haveExactly(1, typeDescriptor(Mockito.class));

final TestResult methodQueryResultForMockito = getMethodQueryResultForMockito();
assertThat(methodQueryResultForMockito.getRows().size()).isEqualTo(2);
assertThat(methodQueryResultForMockito.getRows().size()).isEqualTo(3);
verifyMockitoVerifyExampleContained(methodQueryResultForMockito);
verifyBddMockitoThenShouldExampleContained(methodQueryResultForMockito);
store.commitTransaction();
Expand Down
Loading