root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Use AssertJ in PropertiesPropertySourceLoaderTests

This commit is contained in:
Andy Wilkinson 2016-05-06 11:59:03 +01:00
parent 95c78e4e4c
commit 03383be1ba
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
spring-boot/src/test/java/org/springframework/boot/env/PropertiesPropertySourceLoaderTests.java vendored
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2014 the original author or authors.
* Copyright 2012-2016 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.
@ -21,8 +21,7 @@ import org.junit.Test;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.ClassPathResource;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link PropertiesPropertySourceLoader}.
@ -35,22 +34,22 @@ public class PropertiesPropertySourceLoaderTests {
@Test
public void getFileExtensions() throws Exception {
assertThat(this.loader.getFileExtensions(),
equalTo(new String[] { "properties", "xml" }));
assertThat(this.loader.getFileExtensions())
.isEqualTo(new String[] { "properties", "xml" });
}
@Test
public void loadProperties() throws Exception {
PropertySource<?> source = this.loader.load("test.properties",
new ClassPathResource("test-properties.properties", getClass()), null);
assertThat(source.getProperty("test"), equalTo((Object) "properties"));
assertThat(source.getProperty("test")).isEqualTo("properties");
}
@Test
public void loadXml() throws Exception {
PropertySource<?> source = this.loader.load("test.xml",
new ClassPathResource("test-xml.xml", getClass()), null);
assertThat(source.getProperty("test"), equalTo((Object) "xml"));
assertThat(source.getProperty("test")).isEqualTo("xml");
}
}