Permalink
Browse files

switch to assertj

  • Loading branch information...
1 parent 0719a7f commit 990521c87677903cd18841a5454d52bc37bc2985 @adriancole adriancole committed Mar 6, 2014
Showing with 37 additions and 37 deletions.
  1. +4 −4 pom.xml
  2. +2 −2 retrofit-converters/jackson/pom.xml
  3. +1 −1 retrofit-converters/jackson/src/test/java/retrofit/converter/JacksonConverterTest.java
  4. +2 −2 retrofit-converters/protobuf/pom.xml
  5. +1 −1 retrofit-converters/protobuf/src/test/java/retrofit/converter/ProtoConverterTest.java
  6. +2 −2 retrofit-converters/simplexml/pom.xml
  7. +1 −1 retrofit-converters/simplexml/src/test/java/retrofit/converter/SimpleXMLConverterTest.java
  8. +2 −2 retrofit-converters/wire/pom.xml
  9. +1 −1 retrofit-converters/wire/src/test/java/retrofit/converter/WireConverterTest.java
  10. +2 −2 retrofit-mock/pom.xml
  11. +1 −1 retrofit-mock/src/test/java/retrofit/MockRestAdapterTest.java
  12. +2 −2 retrofit/pom.xml
  13. +1 −1 retrofit/src/test/java/retrofit/ErrorHandlerTest.java
  14. +2 −2 retrofit/src/test/java/retrofit/RequestBuilderTest.java
  15. +2 −2 retrofit/src/test/java/retrofit/RestAdapterTest.java
  16. +1 −1 retrofit/src/test/java/retrofit/RestMethodInfoTest.java
  17. +1 −1 retrofit/src/test/java/retrofit/TestingUtils.java
  18. +1 −1 retrofit/src/test/java/retrofit/appengine/UrlFetchClientTest.java
  19. +1 −1 retrofit/src/test/java/retrofit/client/ApacheClientTest.java
  20. +1 −1 retrofit/src/test/java/retrofit/client/UrlConnectionClientTest.java
  21. +1 −1 retrofit/src/test/java/retrofit/mime/FormUrlEncodingTypedOutputTest.java
  22. +1 −1 retrofit/src/test/java/retrofit/mime/MimeHelper.java
  23. +1 −1 retrofit/src/test/java/retrofit/mime/MimeUtilTest.java
  24. +1 −1 retrofit/src/test/java/retrofit/mime/MultipartTypedOutputTest.java
  25. +1 −1 retrofit/src/test/java/retrofit/mime/TypedByteArrayTest.java
  26. +1 −1 retrofit/src/test/java/retrofit/mime/TypedFileTest.java
View
@@ -62,7 +62,7 @@
<!-- Test Dependencies -->
<junit.version>4.10</junit.version>
- <fest.version>2.0M10</fest.version>
+ <assertj.version>1.5.0</assertj.version>
<mockito.version>1.9.5</mockito.version>
<guava.version>16.0</guava.version>
</properties>
@@ -145,9 +145,9 @@
<version>${junit.version}</version>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
- <version>${fest.version}</version>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
@@ -30,8 +30,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -7,7 +7,7 @@
import retrofit.mime.TypedInput;
import retrofit.mime.TypedOutput;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class JacksonConverterTest {
private static final String MIME_TYPE = "application/json; charset=UTF-8";
@@ -30,8 +30,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -11,7 +11,7 @@
import retrofit.mime.TypedByteArray;
import retrofit.mime.TypedOutput;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static retrofit.converter.PhoneProtos.Phone;
@@ -30,8 +30,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -1,6 +1,6 @@
package retrofit.converter;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import java.io.ByteArrayOutputStream;
@@ -34,8 +34,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -11,7 +11,7 @@
import retrofit.mime.TypedByteArray;
import retrofit.mime.TypedOutput;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
public final class WireConverterTest {
@@ -38,8 +38,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -16,7 +16,7 @@
import rx.Observable;
import rx.util.functions.Action1;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.atLeastOnce;
View
@@ -46,8 +46,8 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easytesting</groupId>
- <artifactId>fest-assert-core</artifactId>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -11,7 +11,7 @@
import retrofit.client.Response;
import retrofit.http.GET;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
@@ -21,8 +21,8 @@
import retrofit.mime.TypedOutput;
import retrofit.mime.TypedString;
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.fest.assertions.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
import static retrofit.RestMethodInfo.ParamUsage;
import static retrofit.RestMethodInfo.ParamUsage.BODY;
import static retrofit.RestMethodInfo.ParamUsage.ENCODED_PATH;
@@ -30,8 +30,8 @@
import rx.Observable;
import rx.util.functions.Action1;
-import static org.fest.assertions.api.Assertions.assertThat;
-import static org.fest.assertions.api.Assertions.fail;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.fail;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyString;
@@ -37,7 +37,7 @@
import static java.lang.annotation.ElementType.METHOD;
import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.fail;
import static retrofit.RestMethodInfo.ParamUsage.BODY;
import static retrofit.RestMethodInfo.ParamUsage.ENCODED_PATH;
@@ -7,7 +7,7 @@
import retrofit.mime.MultipartTypedOutput;
import retrofit.mime.TypedOutput;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public abstract class TestingUtils {
public static Method getMethod(Class c, String name) {
@@ -22,7 +22,7 @@
import static com.google.appengine.api.urlfetch.HTTPMethod.GET;
import static com.google.appengine.api.urlfetch.HTTPMethod.POST;
import static java.util.Arrays.asList;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static retrofit.TestingUtils.assertBytes;
@@ -21,7 +21,7 @@
import retrofit.mime.TypedOutput;
import retrofit.mime.TypedString;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static retrofit.TestingUtils.assertBytes;
import static retrofit.client.ApacheClient.TypedOutputEntity;
@@ -14,7 +14,7 @@
import retrofit.mime.TypedOutput;
import retrofit.mime.TypedString;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static retrofit.TestingUtils.assertBytes;
public class UrlConnectionClientTest {
@@ -4,7 +4,7 @@
import java.io.ByteArrayOutputStream;
import org.junit.Test;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class FormUrlEncodingTypedOutputTest {
@Test public void urlEncoding() throws Exception {
@@ -11,4 +11,4 @@
throw new RuntimeException(e);
}
}
-}
+}
@@ -3,7 +3,7 @@
import org.junit.Test;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
import static retrofit.mime.MimeUtil.parseCharset;
public class MimeUtilTest {
@@ -4,7 +4,7 @@
import java.io.ByteArrayOutputStream;
import org.junit.Test;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class MultipartTypedOutputTest {
@Test public void singlePart() throws Exception {
@@ -3,7 +3,7 @@
import org.junit.Test;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class TypedByteArrayTest {
private static final String GIF = "image/gif";
@@ -6,7 +6,7 @@
import java.io.IOException;
import org.junit.Test;
-import static org.fest.assertions.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThat;
public class TypedFileTest {
private static final String PNG = "image/png";

0 comments on commit 990521c

Please sign in to comment.