Skip to content

Commit 56c8bf7

Browse files
committed
Merge pull request spring-projects#12170 from izeye:assertj
* pr/12170: Use isTrue() and isFalse() for AssertJ
2 parents 865775e + 2fe86da commit 56c8bf7

File tree

11 files changed

+17
-17
lines changed

11 files changed

+17
-17
lines changed

spring-boot-project/spring-boot-actuator-autoconfigure/src/test/java/org/springframework/boot/actuate/autoconfigure/web/server/ManagementServerPropertiesTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public void defaultManagementServerProperties() {
3333
ManagementServerProperties properties = new ManagementServerProperties();
3434
assertThat(properties.getPort()).isNull();
3535
assertThat(properties.getServlet().getContextPath()).isEqualTo("");
36-
assertThat(properties.getAddApplicationContextHeader()).isEqualTo(false);
36+
assertThat(properties.getAddApplicationContextHeader()).isFalse();
3737
}
3838

3939
@Test

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ public void customConfiguration() {
175175
registerAndRefreshContext(
176176
"spring.groovy.template.configuration.auto-indent:true");
177177
assertThat(this.context.getBean(GroovyMarkupConfigurer.class).isAutoIndent())
178-
.isEqualTo(true);
178+
.isTrue();
179179
}
180180

181181
private void registerAndRefreshContext(String... env) {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public void commonsDbcp2IsFallback() {
137137
public void commonsDbcp2ValidatesConnectionByDefault() {
138138
assertDataSource(org.apache.commons.dbcp2.BasicDataSource.class,
139139
Arrays.asList("com.zaxxer.hikari", "org.apache.tomcat"), (dataSource) -> {
140-
assertThat(dataSource.getTestOnBorrow()).isEqualTo(true);
140+
assertThat(dataSource.getTestOnBorrow()).isTrue();
141141
assertThat(dataSource.getValidationQuery()).isNull(); // Use
142142
// Connection#isValid()
143143
});

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQAutoConfigurationTests.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ public void customConnectionFactoryIsApplied() {
114114
assertThat(connectionFactory.getPassword()).isEqualTo("bar");
115115
assertThat(connectionFactory.getCloseTimeout()).isEqualTo(500);
116116
assertThat(connectionFactory.isNonBlockingRedelivery())
117-
.isEqualTo(true);
117+
.isTrue();
118118
assertThat(connectionFactory.getSendTimeout()).isEqualTo(1000);
119119
assertThat(connectionFactory.isTrustAllPackages()).isFalse();
120120
assertThat(connectionFactory.getTrustedPackages())
@@ -178,22 +178,22 @@ public void customPooledConnectionFactoryIsApplied() {
178178
PooledConnectionFactory connectionFactory = context
179179
.getBean(PooledConnectionFactory.class);
180180
assertThat(connectionFactory.isBlockIfSessionPoolIsFull())
181-
.isEqualTo(false);
181+
.isFalse();
182182
assertThat(connectionFactory.getBlockIfSessionPoolIsFullTimeout())
183183
.isEqualTo(64);
184184
assertThat(connectionFactory.isCreateConnectionOnStartup())
185-
.isEqualTo(false);
185+
.isFalse();
186186
assertThat(connectionFactory.getExpiryTimeout()).isEqualTo(4096);
187187
assertThat(connectionFactory.getIdleTimeout()).isEqualTo(512);
188188
assertThat(connectionFactory.getMaxConnections()).isEqualTo(256);
189189
assertThat(connectionFactory.getMaximumActiveSessionPerConnection())
190190
.isEqualTo(1024);
191191
assertThat(connectionFactory.isReconnectOnException())
192-
.isEqualTo(false);
192+
.isFalse();
193193
assertThat(connectionFactory.getTimeBetweenExpirationCheckMillis())
194194
.isEqualTo(2048);
195195
assertThat(connectionFactory.isUseAnonymousProducers())
196-
.isEqualTo(false);
196+
.isFalse();
197197
});
198198
}
199199

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQPropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void setTrustAllPackages() {
7171
this.properties.getPackages().setTrustAll(true);
7272
assertThat(createFactory(this.properties)
7373
.createConnectionFactory(ActiveMQConnectionFactory.class)
74-
.isTrustAllPackages()).isEqualTo(true);
74+
.isTrustAllPackages()).isTrue();
7575
}
7676

7777
@Test
@@ -80,7 +80,7 @@ public void setTrustedPackages() {
8080
this.properties.getPackages().getTrusted().add("trusted.package");
8181
ActiveMQConnectionFactory factory = createFactory(this.properties)
8282
.createConnectionFactory(ActiveMQConnectionFactory.class);
83-
assertThat(factory.isTrustAllPackages()).isEqualTo(false);
83+
assertThat(factory.isTrustAllPackages()).isFalse();
8484
assertThat(factory.getTrustedPackages().size()).isEqualTo(1);
8585
assertThat(factory.getTrustedPackages().get(0)).isEqualTo("trusted.package");
8686
}

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/ServerPropertiesTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,11 +175,11 @@ public void testCustomizeJettyAccessLog() {
175175
map.put("server.jetty.accesslog.append", "true");
176176
bind(map);
177177
ServerProperties.Jetty jetty = this.properties.getJetty();
178-
assertThat(jetty.getAccesslog().isEnabled()).isEqualTo(true);
178+
assertThat(jetty.getAccesslog().isEnabled()).isTrue();
179179
assertThat(jetty.getAccesslog().getFilename()).isEqualTo("foo.txt");
180180
assertThat(jetty.getAccesslog().getFileDateFormat()).isEqualTo("yyyymmdd");
181181
assertThat(jetty.getAccesslog().getRetentionPeriod()).isEqualTo(4);
182-
assertThat(jetty.getAccesslog().isAppend()).isEqualTo(true);
182+
assertThat(jetty.getAccesslog().isAppend()).isTrue();
183183
}
184184

185185
private void bind(String name, String value) {

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/TomcatServletWebServerFactoryCustomizerTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ private void testCustomTldSkip(String... expectedJars) {
7777
public void redirectContextRootCanBeConfigured() {
7878
bind("server.tomcat.redirect-context-root=false");
7979
ServerProperties.Tomcat tomcat = this.serverProperties.getTomcat();
80-
assertThat(tomcat.getRedirectContextRoot()).isEqualTo(false);
80+
assertThat(tomcat.getRedirectContextRoot()).isFalse();
8181
TomcatWebServer server = customizeAndGetServer();
8282
Context context = (Context) server.getTomcat().getHost().findChildren()[0];
8383
assertThat(context.getMapperContextRootRedirectEnabled()).isFalse();

spring-boot-project/spring-boot-devtools/src/test/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfigurationTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public void devToolsSwitchesJspServletToDevelopmentMode() {
246246
StandardWrapper jspServletWrapper = (StandardWrapper) context.findChild("jsp");
247247
EmbeddedServletOptions options = (EmbeddedServletOptions) ReflectionTestUtils
248248
.getField(jspServletWrapper.getServlet(), "options");
249-
assertThat(options.getDevelopment()).isEqualTo(true);
249+
assertThat(options.getDevelopment()).isTrue();
250250
}
251251

252252
private ConfigurableApplicationContext initializeAndRun(Class<?> config,

spring-boot-project/spring-boot-test/src/test/java/org/springframework/boot/test/mock/mockito/DefinitionsParserTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void parseMockBeanAttributes() {
7373
assertThat(definition.getExtraInterfaces())
7474
.containsExactly(ExampleExtraInterface.class);
7575
assertThat(definition.getAnswer()).isEqualTo(Answers.RETURNS_SMART_NULLS);
76-
assertThat(definition.isSerializable()).isEqualTo(true);
76+
assertThat(definition.isSerializable()).isTrue();
7777
assertThat(definition.getReset()).isEqualTo(MockReset.NONE);
7878
assertThat(definition.getQualifier()).isNull();
7979
}

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/DelegatingFilterProxyRegistrationBeanTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ public void initShouldNotCauseEarlyInitialization() throws Exception {
9191
assertThat(mockFilterInitialized.get()).isNull();
9292
filter.doFilter(new MockHttpServletRequest(), new MockHttpServletResponse(),
9393
new MockFilterChain());
94-
assertThat(mockFilterInitialized.get()).isEqualTo(true);
94+
assertThat(mockFilterInitialized.get()).isTrue();
9595
}
9696

9797
@Test

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/server/AbstractServletWebServerFactoryTests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -982,7 +982,7 @@ public void jspServletIsNotInDevelopmentModeByDefault() throws Exception {
982982
JspServlet jspServlet = getJspServlet();
983983
EmbeddedServletOptions options = (EmbeddedServletOptions) ReflectionTestUtils
984984
.getField(jspServlet, "options");
985-
assertThat(options.getDevelopment()).isEqualTo(false);
985+
assertThat(options.getDevelopment()).isFalse();
986986
}
987987

988988
@Test

0 commit comments

Comments
 (0)