Skip to content

Commit

Permalink
Indent with spaces using spotless (#1820)
Browse files Browse the repository at this point in the history
  • Loading branch information
@TimvdLippe
TimvdLippe committed Nov 7, 2019
1 parent 9a2160c commit 8f68572
Show file tree
Hide file tree
Showing 13 changed files with 127 additions and 126 deletions.
1 change: 1 addition & 0 deletions build.gradle
View file
Expand Up @@ -109,6 +109,7 @@ spotless {
removeUnusedImports()
trimTrailingWhitespace()
endWithNewline()
indentWithSpaces(4)

importOrder 'static java', 'static javax', 'static ', 'java', 'javax', ''
}
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/mockito/internal/configuration/injection/SpyOnInjectedFieldsHandler.java
View file
Expand Up @@ -40,10 +40,10 @@ protected boolean processInjection(Field field, Object fieldOwner, Set<Object> m
Mockito.reset(instance);
} else {
Object mock = Mockito.mock(instance.getClass(), withSettings()
.spiedInstance(instance)
.defaultAnswer(Mockito.CALLS_REAL_METHODS)
.name(field.getName()));
setField(fieldOwner, field, mock);
.spiedInstance(instance)
.defaultAnswer(Mockito.CALLS_REAL_METHODS)
.name(field.getName()));
setField(fieldOwner, field, mock);
}
} catch (Exception e) {
throw new MockitoException("Problems initiating spied field " + field.getName(), e);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/mockito/internal/junit/JUnitRule.java
View file
Expand Up @@ -31,8 +31,8 @@ public JUnitRule(MockitoLogger logger, Strictness strictness) {
this.strictness = strictness;
}

@Override
public Statement apply(final Statement base, final FrameworkMethod method, final Object target) {
@Override
public Statement apply(final Statement base, final FrameworkMethod method, final Object target) {
return new Statement() {
public void evaluate() throws Throwable {
if (session == null) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mockito/internal/stubbing/answers/AnswerFunctionalInterfaces.java
View file
Expand Up @@ -25,7 +25,7 @@
* @since 2.1.0
*/
public class AnswerFunctionalInterfaces {
/**
/**
* Hide constructor to avoid instantiation of class with only static methods
*/
private AnswerFunctionalInterfaces() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/mockito/internal/util/MockUtil.java
View file
Expand Up @@ -89,7 +89,7 @@ public static void maybeRedefineMockName(Object mock, String newName) {
MockName mockName = getMockName(mock);
//TODO SF hacky...
MockCreationSettings mockSettings = getMockHandler(mock).getMockSettings();
if (mockName.isDefault() && mockSettings instanceof CreationSettings) {
if (mockName.isDefault() && mockSettings instanceof CreationSettings) {
((CreationSettings) mockSettings).setMockName(new MockNameImpl(newName));
}
}
Expand Down
30 changes: 15 additions & 15 deletions src/test/java/org/mockito/ArgumentCaptorTest.java
View file
Expand Up @@ -13,24 +13,24 @@

public class ArgumentCaptorTest {

/**
* Clean up the internal Mockito-Stubbing state
*/
@After
public void tearDown() {
try {
validateMockitoUsage();
} catch (InvalidUseOfMatchersException ignore) {
}
/**
* Clean up the internal Mockito-Stubbing state
*/
@After
public void tearDown() {
try {
validateMockitoUsage();
} catch (InvalidUseOfMatchersException ignore) {
}

}
}

@Test
public void tell_handy_return_values_to_return_value_for() throws Exception {
@Test
public void tell_handy_return_values_to_return_value_for() throws Exception {

ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
assertThat(captor.capture()).isNull();
ArgumentCaptor<Object> captor = ArgumentCaptor.forClass(Object.class);
assertThat(captor.capture()).isNull();

}
}

}
2 changes: 1 addition & 1 deletion src/test/java/org/mockito/internal/InvalidStateDetectionTest.java
View file
Expand Up @@ -152,7 +152,7 @@ public void shouldCorrectStateAfterDetectingUnfinishedStubbing() {
doThrow(new RuntimeException()).when(mock);

try {
doThrow(new RuntimeException()).when(mock).oneArg(true);
doThrow(new RuntimeException()).when(mock).oneArg(true);
fail();
} catch (UnfinishedStubbingException e) {}

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/mockito/internal/handler/MockHandlerFactoryTest.java
View file
Expand Up @@ -30,7 +30,7 @@ public class MockHandlerFactoryTest extends TestBase {
public void handle_result_must_not_be_null_for_primitives() throws Throwable {
//given:
MockCreationSettings<?> settings = (MockCreationSettings<?>) new MockSettingsImpl().defaultAnswer(new Returns(null));
MockHandler<?> handler = createMockHandler(settings);
MockHandler<?> handler = createMockHandler(settings);

mock.intReturningMethod();
Invocation invocation = super.getLastInvocation();
Expand Down
98 changes: 49 additions & 49 deletions src/test/java/org/mockito/internal/matchers/StringMatchersTest.java
View file
Expand Up @@ -13,65 +13,65 @@
* Tests for the Matchers that operate over strings
*/
public class StringMatchersTest {
@Test
public void startsWithString() {
assertTrue(new StartsWith("mockito").matches("mockito is here"));
}
@Test
public void startsWithString() {
assertTrue(new StartsWith("mockito").matches("mockito is here"));
}

@Test
public void doesNotStartWithString() {
assertFalse(new StartsWith("junit").matches("mockito is here"));
}
@Test
public void doesNotStartWithString() {
assertFalse(new StartsWith("junit").matches("mockito is here"));
}

@Test
public void nullStartsWith() {
assertFalse(new StartsWith("java").matches(null));
}
@Test
public void nullStartsWith() {
assertFalse(new StartsWith("java").matches(null));
}

@Test
public void endsWithString() {
assertTrue(new EndsWith("mockito").matches("here is mockito"));
}
@Test
public void endsWithString() {
assertTrue(new EndsWith("mockito").matches("here is mockito"));
}

@Test
public void doesNotEndWithString() {
assertFalse(new EndsWith("junit").matches("here is mockito"));
}
@Test
public void doesNotEndWithString() {
assertFalse(new EndsWith("junit").matches("here is mockito"));
}

@Test
public void nullEndsWith() {
assertFalse(new EndsWith("java").matches(null));
}
@Test
public void nullEndsWith() {
assertFalse(new EndsWith("java").matches(null));
}

@Test
public void containsString() {
assertTrue(new Contains("mockito").matches("****mockito****"));
}
@Test
public void containsString() {
assertTrue(new Contains("mockito").matches("****mockito****"));
}

@Test
public void stringDoesNotContain() {
assertFalse(new Contains("junit").matches("****mockito****"));
}
@Test
public void stringDoesNotContain() {
assertFalse(new Contains("junit").matches("****mockito****"));
}

@Test
public void nullContainsNothing() {
assertFalse(new Contains("mockito").matches(null));
}
@Test
public void nullContainsNothing() {
assertFalse(new Contains("mockito").matches(null));
}

@Test
public void matchesRegex() {
assertTrue(new Find("eleph.nt").matches("the elephant in the room"));
assertTrue(new Find("eleph.nt").matches("the elephInt in the room"));
}
@Test
public void matchesRegex() {
assertTrue(new Find("eleph.nt").matches("the elephant in the room"));
assertTrue(new Find("eleph.nt").matches("the elephInt in the room"));
}

@Test
public void doesNotMatchRegex() {
assertFalse(new Find("eleph.nt").matches("the otter in the room"));
}
@Test
public void doesNotMatchRegex() {
assertFalse(new Find("eleph.nt").matches("the otter in the room"));
}

@Test
public void nullDoesNotMatchRegex() {
assertFalse(new Find("eleph.nt").matches(null));
}
@Test
public void nullDoesNotMatchRegex() {
assertFalse(new Find("eleph.nt").matches(null));
}

}
10 changes: 5 additions & 5 deletions src/test/java/org/mockito/internal/progress/TimesTest.java
View file
Expand Up @@ -12,15 +12,15 @@


public class TimesTest {
@Rule
public ExpectedException exception = ExpectedException.none();
@Rule
public ExpectedException exception = ExpectedException.none();

@Test
public void shouldNotAllowNegativeNumberOfInvocations() throws Exception {

exception.expect(MockitoException.class);
exception.expectMessage("Negative value is not allowed here");
exception.expect(MockitoException.class);
exception.expectMessage("Negative value is not allowed here");

VerificationModeFactory.times(-50);
VerificationModeFactory.times(-50);
}
}
70 changes: 35 additions & 35 deletions .../java/org/mockito/internal/verification/checkers/MissingInvocationInOrderCheckerTest.java
View file
Expand Up @@ -29,17 +29,17 @@

public class MissingInvocationInOrderCheckerTest {

private InvocationMatcher wanted;
private List<Invocation> invocations;
private InvocationMatcher wanted;
private List<Invocation> invocations;

@Mock
private IMethods mock;
@Mock
private IMethods mock;

@Rule
public ExpectedException exception = ExpectedException.none();
@Rule
public ExpectedException exception = ExpectedException.none();

@Rule
public MockitoRule mockitoRule = MockitoJUnit.rule();
@Rule
public MockitoRule mockitoRule = MockitoJUnit.rule();

private InOrderContext context = new InOrderContextImpl();

Expand All @@ -50,72 +50,72 @@ public void setup() {
@Test
public void shouldPassWhenMatchingInteractionFound() throws Exception {

invocations = asList(buildSimpleMethod().toInvocation());
invocations = asList(buildSimpleMethod().toInvocation());
wanted = buildSimpleMethod().toInvocationMatcher();

checkMissingInvocation(invocations, wanted, context);
}

@Test
public void shouldReportWantedButNotInvoked() throws Exception {
invocations = asList(buildDifferentMethod().toInvocation());
invocations = asList(buildDifferentMethod().toInvocation());
wanted = buildSimpleMethod().toInvocationMatcher();

exception.expect(WantedButNotInvoked.class);
exception.expectMessage("Wanted but not invoked:");
exception.expectMessage("mock.simpleMethod()");
exception.expectMessage("Wanted but not invoked:");
exception.expectMessage("mock.simpleMethod()");

checkMissingInvocation(invocations, wanted, context);
}

@Test
public void shouldReportArgumentsAreDifferent() throws Exception {
invocations = asList(buildIntArgMethod().arg(1111).toInvocation());
invocations = asList(buildIntArgMethod().arg(1111).toInvocation());
wanted = buildIntArgMethod().arg(2222).toInvocationMatcher();

exception.expect(ArgumentsAreDifferent.class);

exception.expectMessage("Argument(s) are different! Wanted:");
exception.expectMessage("mock.intArgumentMethod(2222);");
exception.expectMessage("Actual invocations have different arguments:");
exception.expectMessage("mock.intArgumentMethod(1111);");
exception.expectMessage("Argument(s) are different! Wanted:");
exception.expectMessage("mock.intArgumentMethod(2222);");
exception.expectMessage("Actual invocations have different arguments:");
exception.expectMessage("mock.intArgumentMethod(1111);");

checkMissingInvocation(invocations, wanted, context);
checkMissingInvocation(invocations, wanted, context);

}

@Test
public void shouldReportWantedDiffersFromActual() throws Exception {

Invocation invocation1 = buildIntArgMethod().arg(1111).toInvocation();
Invocation invocation2 = buildIntArgMethod().arg(2222).toInvocation();
Invocation invocation1 = buildIntArgMethod().arg(1111).toInvocation();
Invocation invocation2 = buildIntArgMethod().arg(2222).toInvocation();

context.markVerified(invocation2);
invocations = asList(invocation1,invocation2);
context.markVerified(invocation2);
invocations = asList(invocation1,invocation2);
wanted = buildIntArgMethod().arg(2222).toInvocationMatcher();

exception.expect(VerificationInOrderFailure.class);

exception.expectMessage("Verification in order failure");
exception.expectMessage("Wanted but not invoked:");
exception.expectMessage("mock.intArgumentMethod(2222);");
exception.expectMessage("Wanted anywhere AFTER following interaction:");
exception.expectMessage("mock.intArgumentMethod(2222);");
exception.expectMessage("Verification in order failure");
exception.expectMessage("Wanted but not invoked:");
exception.expectMessage("mock.intArgumentMethod(2222);");
exception.expectMessage("Wanted anywhere AFTER following interaction:");
exception.expectMessage("mock.intArgumentMethod(2222);");

checkMissingInvocation(invocations, wanted, context);
}

private InvocationBuilder buildIntArgMethod() {
return new InvocationBuilder().mock(mock).method("intArgumentMethod").argTypes(int.class);
}
return new InvocationBuilder().mock(mock).method("intArgumentMethod").argTypes(int.class);
}

private InvocationBuilder buildSimpleMethod() {
return new InvocationBuilder().mock(mock).simpleMethod();
}
private InvocationBuilder buildSimpleMethod() {
return new InvocationBuilder().mock(mock).simpleMethod();
}

private InvocationBuilder buildDifferentMethod() {
return new InvocationBuilder().mock(mock).differentMethod();
}
private InvocationBuilder buildDifferentMethod() {
return new InvocationBuilder().mock(mock).differentMethod();
}


}
20 changes: 10 additions & 10 deletions src/test/java/org/mockito/internal/verification/checkers/NumberOfInvocationsCheckerTest.java
View file
Expand Up @@ -131,16 +131,16 @@ public void shouldReportNeverWantedButInvoked() throws Exception {
NumberOfInvocationsChecker.checkNumberOfInvocations(invocations, wanted, 0);
}

@Test
public void shouldMarkInvocationsAsVerified() throws Exception {
Invocation invocation = buildSimpleMethod().toInvocation();
assertThat(invocation.isVerified()).isFalse();

invocations = asList(invocation);
wanted = buildSimpleMethod().toInvocationMatcher();
NumberOfInvocationsChecker.checkNumberOfInvocations(invocations, wanted, 1);
assertThat(invocation.isVerified()).isTrue();
}
@Test
public void shouldMarkInvocationsAsVerified() throws Exception {
Invocation invocation = buildSimpleMethod().toInvocation();
assertThat(invocation.isVerified()).isFalse();

invocations = asList(invocation);
wanted = buildSimpleMethod().toInvocationMatcher();
NumberOfInvocationsChecker.checkNumberOfInvocations(invocations, wanted, 1);
assertThat(invocation.isVerified()).isTrue();
}

private InvocationBuilder buildSimpleMethod() {
return new InvocationBuilder().mock(mock).simpleMethod();
Expand Down

0 comments on commit 8f68572

Please sign in to comment.