Browse Source

Polishing

pull/22916/head
Juergen Hoeller 6 years ago
parent
commit
8eb9782ca2
  1. 15
      spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java
  2. 10
      spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java

15
spring-core/src/test/java/org/springframework/core/annotation/MissingMergedAnnotationTests.java

@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
/*
* Copyright 2002-2018 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@ -38,9 +38,10 @@ public class MissingMergedAnnotationTests { @@ -38,9 +38,10 @@ public class MissingMergedAnnotationTests {
private final MergedAnnotation<?> missing = MissingMergedAnnotation.getInstance();
@Test
public void getTypeThrowsNoSuchElementException() {
assertThatNoSuchElementException().isThrownBy(() -> this.missing.getType());
assertThatNoSuchElementException().isThrownBy(this.missing::getType);
}
@Test
@ -288,17 +289,19 @@ public class MissingMergedAnnotationTests { @@ -288,17 +289,19 @@ public class MissingMergedAnnotationTests {
assertThat(map).isInstanceOf(ConcurrentReferenceHashMap.class);
}
private static ThrowableTypeAssert<NoSuchElementException> assertThatNoSuchElementException() {
return assertThatExceptionOfType(NoSuchElementException.class);
}
private static enum TestEnum {
private enum TestEnum {
ONE, TWO, THREE
}
@Retention(RetentionPolicy.RUNTIME)
private static @interface TestAnnotation {
@Retention(RetentionPolicy.RUNTIME)
private @interface TestAnnotation {
}
}

10
spring-messaging/src/test/java/org/springframework/messaging/rsocket/DefaultRSocketRequesterBuilderTests.java

@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
* https://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
@ -47,8 +47,9 @@ public class DefaultRSocketRequesterBuilderTests { @@ -47,8 +47,9 @@ public class DefaultRSocketRequesterBuilderTests {
when(this.transport.connect(anyInt())).thenReturn(Mono.just(new MockConnection()));
}
@SuppressWarnings("unchecked")
@Test
@SuppressWarnings("unchecked")
public void shouldApplyCustomizationsAtSubscription() {
Consumer<RSocketFactory.ClientRSocketFactory> factoryConfigurer = mock(Consumer.class);
Consumer<RSocketStrategies.Builder> strategiesConfigurer = mock(Consumer.class);
@ -59,8 +60,8 @@ public class DefaultRSocketRequesterBuilderTests { @@ -59,8 +60,8 @@ public class DefaultRSocketRequesterBuilderTests {
verifyZeroInteractions(this.transport, factoryConfigurer, strategiesConfigurer);
}
@SuppressWarnings("unchecked")
@Test
@SuppressWarnings("unchecked")
public void shouldApplyCustomizations() {
Consumer<RSocketFactory.ClientRSocketFactory> factoryConfigurer = mock(Consumer.class);
Consumer<RSocketStrategies.Builder> strategiesConfigurer = mock(Consumer.class);
@ -74,6 +75,7 @@ public class DefaultRSocketRequesterBuilderTests { @@ -74,6 +75,7 @@ public class DefaultRSocketRequesterBuilderTests {
verify(strategiesConfigurer).accept(any(RSocketStrategies.Builder.class));
}
static class MockConnection implements DuplexConnection {
@Override
@ -97,4 +99,4 @@ public class DefaultRSocketRequesterBuilderTests { @@ -97,4 +99,4 @@ public class DefaultRSocketRequesterBuilderTests {
}
}
}
}

Loading…
Cancel
Save