aboutsummaryrefslogtreecommitdiffstats
path: root/server/sonar-process
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@sonarsource.com>2015-01-10 07:15:03 +0100
committerSimon Brandhof <simon.brandhof@sonarsource.com>2015-01-10 07:15:08 +0100
commit2faaf7e16a03e69c4ff5f9c53805a387211a0872 (patch)
treefed31d45904142eff2e4b501883f08d5f07f0ce8 /server/sonar-process
parent3167bed5685e9f4b87e3482cdde2ac95897c8cfd (diff)
downloadsonarqube-2faaf7e16a03e69c4ff5f9c53805a387211a0872.tar.gz
sonarqube-2faaf7e16a03e69c4ff5f9c53805a387211a0872.zip
Replace fest-assert by assertJ
Diffstat (limited to 'server/sonar-process')
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java4
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java4
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/LifecycleTest.java2
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/LoopbackAddressTest.java4
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java4
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java2
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/ProcessCommandsTest.java4
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java4
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java2
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/PropsTest.java4
-rw-r--r--server/sonar-process/src/test/java/org/sonar/process/SystemExitTest.java2
11 files changed, 18 insertions, 18 deletions
diff --git a/server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java b/server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java
index 8350eafaa3e..58e4d594fea 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/AesCipherTest.java
@@ -32,8 +32,8 @@ import java.io.File;
import java.security.InvalidKeyException;
import java.security.Key;
-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 AesCipherTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java b/server/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java
index cd92bbf4e7e..6ed9dc357cb 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/ConfigurationUtilsTest.java
@@ -30,8 +30,8 @@ import java.io.File;
import java.util.Map;
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 ConfigurationUtilsTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/LifecycleTest.java b/server/sonar-process/src/test/java/org/sonar/process/LifecycleTest.java
index 0ab9f3a29ba..11b267b3e77 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/LifecycleTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/LifecycleTest.java
@@ -21,7 +21,7 @@ package org.sonar.process;
import org.junit.Test;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.sonar.process.Lifecycle.State;
public class LifecycleTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/LoopbackAddressTest.java b/server/sonar-process/src/test/java/org/sonar/process/LoopbackAddressTest.java
index 8ccafff1f66..782923d9aee 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/LoopbackAddressTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/LoopbackAddressTest.java
@@ -27,8 +27,8 @@ import java.net.NetworkInterface;
import java.util.Collections;
import java.util.Enumeration;
-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 LoopbackAddressTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java b/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java
index 83841c79952..de339683db6 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/MinimumViableSystemTest.java
@@ -19,14 +19,14 @@
*/
package org.sonar.process;
-import org.fest.assertions.Assertions;
+import org.assertj.core.api.Assertions;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
import java.io.File;
-import static org.fest.assertions.Fail.fail;
+import static org.junit.Assert.fail;
public class MinimumViableSystemTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java b/server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java
index 052c67d94fe..c14aa4daa9b 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/NetworkUtilsTest.java
@@ -22,7 +22,7 @@ package org.sonar.process;
import org.junit.Test;
import org.sonar.test.TestUtils;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class NetworkUtilsTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/ProcessCommandsTest.java b/server/sonar-process/src/test/java/org/sonar/process/ProcessCommandsTest.java
index 984fbed74f7..0e163a8f1e3 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/ProcessCommandsTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/ProcessCommandsTest.java
@@ -26,8 +26,8 @@ import org.junit.rules.TemporaryFolder;
import java.io.File;
-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;
import static org.mockito.Mockito.when;
diff --git a/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java b/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java
index e24f51b62e1..1857b7cc93b 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/ProcessEntryPointTest.java
@@ -32,8 +32,8 @@ import org.sonar.process.test.StandardProcess;
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;
import static org.mockito.Mockito.mock;
public class ProcessEntryPointTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java b/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java
index 1a18d5983ae..fa97e2ae2f4 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/ProcessUtilsTest.java
@@ -22,7 +22,7 @@ package org.sonar.process;
import org.junit.Test;
import org.sonar.test.TestUtils;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class ProcessUtilsTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/PropsTest.java b/server/sonar-process/src/test/java/org/sonar/process/PropsTest.java
index 25feeef39b8..8af1e96c086 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/PropsTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/PropsTest.java
@@ -27,8 +27,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;
public class PropsTest {
diff --git a/server/sonar-process/src/test/java/org/sonar/process/SystemExitTest.java b/server/sonar-process/src/test/java/org/sonar/process/SystemExitTest.java
index e02b07cf555..d2bb4e495c5 100644
--- a/server/sonar-process/src/test/java/org/sonar/process/SystemExitTest.java
+++ b/server/sonar-process/src/test/java/org/sonar/process/SystemExitTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import java.util.concurrent.atomic.AtomicInteger;
-import static org.fest.assertions.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class SystemExitTest {