diff options
Diffstat (limited to 'sonar-application')
5 files changed, 10 insertions, 10 deletions
diff --git a/sonar-application/src/test/java/org/sonar/application/AppTest.java b/sonar-application/src/test/java/org/sonar/application/AppTest.java index 9d5c0e48826..370bff02686 100644 --- a/sonar-application/src/test/java/org/sonar/application/AppTest.java +++ b/sonar-application/src/test/java/org/sonar/application/AppTest.java @@ -34,7 +34,7 @@ import java.io.IOException; import java.util.List; import java.util.Properties; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -87,7 +87,7 @@ public class AppTest { ArgumentCaptor<List<JavaCommand>> argument = ArgumentCaptor.forClass(listClass); verify(monitor).start(argument.capture()); - assertThat(argument.getValue()).onProperty("key").containsOnly("search", "web"); + assertThat(argument.getValue()).extracting("key").containsOnly("search", "web"); } @Test @@ -102,7 +102,7 @@ public class AppTest { ArgumentCaptor<List<JavaCommand>> argument = ArgumentCaptor.forClass(listClass); verify(monitor).start(argument.capture()); - assertThat(argument.getValue()).onProperty("key").containsOnly("search"); + assertThat(argument.getValue()).extracting("key").containsOnly("search"); } @Test diff --git a/sonar-application/src/test/java/org/sonar/application/CommandLineParserTest.java b/sonar-application/src/test/java/org/sonar/application/CommandLineParserTest.java index bc40a48acc8..fa57d8d353d 100644 --- a/sonar-application/src/test/java/org/sonar/application/CommandLineParserTest.java +++ b/sonar-application/src/test/java/org/sonar/application/CommandLineParserTest.java @@ -23,8 +23,8 @@ import org.junit.Test; import java.util.Properties; -import static org.fest.assertions.Assertions.assertThat; -import static org.fest.assertions.Fail.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; public class CommandLineParserTest { diff --git a/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java b/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java index 317c6fd7f04..65825455863 100644 --- a/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java +++ b/sonar-application/src/test/java/org/sonar/application/DefaultSettingsTest.java @@ -25,7 +25,7 @@ import org.sonar.test.TestUtils; import java.util.Properties; -import static org.fest.assertions.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThat; public class DefaultSettingsTest { diff --git a/sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java b/sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java index c5f47749e80..e5dec849289 100644 --- a/sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java +++ b/sonar-application/src/test/java/org/sonar/application/JdbcSettingsTest.java @@ -30,8 +30,8 @@ import org.sonar.process.Props; import java.io.File; import java.util.Properties; -import static org.fest.assertions.Assertions.assertThat; -import static org.fest.assertions.Fail.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; public class JdbcSettingsTest { diff --git a/sonar-application/src/test/java/org/sonar/application/PropsBuilderTest.java b/sonar-application/src/test/java/org/sonar/application/PropsBuilderTest.java index 7c37363bb68..c54f8f4d2dc 100644 --- a/sonar-application/src/test/java/org/sonar/application/PropsBuilderTest.java +++ b/sonar-application/src/test/java/org/sonar/application/PropsBuilderTest.java @@ -30,8 +30,8 @@ import java.io.File; import java.io.IOException; import java.util.Properties; -import static org.fest.assertions.Assertions.assertThat; -import static org.fest.assertions.Fail.fail; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.fail; import static org.mockito.Mockito.mock; public class PropsBuilderTest { |