Skip to content

Commit ee4a54b

Browse files
committed
[tests] Migrate off fest-assert to assertj
fest-assert 2 once was assertj. The authors differed in direction and the framework split. fest-assert itself is long dead. Version 2 never made release as a result and the migration as it were is incredibly easy as seen here and at least in one test set makes more logical sense.
1 parent bf3f222 commit ee4a54b

17 files changed

+28
-28
lines changed

maven/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<junit.version>4.13.1</junit.version>
3636
<mockito.version>3.1.0</mockito.version>
3737

38-
<fest-assert.version>1.4</fest-assert.version>
38+
<assertj.version>3.14.0</assertj.version>
3939
</properties>
4040

4141
<dependencies>
@@ -78,9 +78,9 @@
7878
</dependency>
7979

8080
<dependency>
81-
<groupId>org.easytesting</groupId>
82-
<artifactId>fest-assert</artifactId>
83-
<version>${fest-assert.version}</version>
81+
<groupId>org.assertj</groupId>
82+
<artifactId>assertj-core</artifactId>
83+
<version>${assertj.version}</version>
8484
<scope>test</scope>
8585
</dependency>
8686

maven/src/test/java/pl/project13/core/GitDataProviderTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import java.util.Properties;
2424

25-
import static org.fest.assertions.Assertions.assertThat;
25+
import static org.assertj.core.api.Assertions.assertThat;
2626
import static org.mockito.Mockito.mock;
2727
import static org.mockito.Mockito.spy;
2828

maven/src/test/java/pl/project13/core/jgit/DescribeCommandAbbrevIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import javax.annotation.Nonnull;
2828
import java.util.Optional;
2929

30-
import static org.fest.assertions.Assertions.assertThat;
30+
import static org.assertj.core.api.Assertions.assertThat;
3131

3232
public class DescribeCommandAbbrevIntegrationTest extends GitIntegrationTest {
3333

maven/src/test/java/pl/project13/core/jgit/DescribeCommandIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import java.util.Optional;
3333

3434
import static java.util.Collections.singletonList;
35-
import static org.fest.assertions.Assertions.assertThat;
35+
import static org.assertj.core.api.Assertions.assertThat;
3636
import static org.mockito.ArgumentMatchers.any;
3737
import static org.mockito.Mockito.doReturn;
3838
import static org.mockito.Mockito.spy;

maven/src/test/java/pl/project13/core/jgit/DescribeCommandTagsIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import java.util.Optional;
3030

31-
import static org.fest.assertions.Assertions.assertThat;
31+
import static org.assertj.core.api.Assertions.assertThat;
3232

3333
public class DescribeCommandTagsIntegrationTest extends GitIntegrationTest {
3434

maven/src/test/java/pl/project13/core/jgit/DescribeResultTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
import java.util.Optional;
3030

31-
import static org.fest.assertions.Assertions.assertThat;
31+
import static org.assertj.core.api.Assertions.assertThat;
3232

3333
public class DescribeResultTest extends GitIntegrationTest {
3434

maven/src/test/java/pl/project13/core/jgit/JGitCommonIntegrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import pl.project13.core.log.StdOutLoggerBridge;
2222
import pl.project13.maven.git.GitIntegrationTest;
2323

24-
import static org.fest.assertions.Assertions.assertThat;
24+
import static org.assertj.core.api.Assertions.assertThat;
2525

2626
public class JGitCommonIntegrationTest extends GitIntegrationTest {
2727

maven/src/test/java/pl/project13/maven/git/BigDiffTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import java.nio.file.Paths;
3030
import java.util.Properties;
3131

32-
import static org.fest.assertions.Assertions.assertThat;
32+
import static org.assertj.core.api.Assertions.assertThat;
3333

3434
/**
3535
* Run this to simulate hanging native-git-process for repo-state with lots of changes.

maven/src/test/java/pl/project13/maven/git/ContainsKeyCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package pl.project13.maven.git;
1919

20-
import org.fest.assertions.Condition;
20+
import org.assertj.core.api.Condition;
2121

2222
import javax.annotation.Nonnull;
2323
import java.util.Map;

maven/src/test/java/pl/project13/maven/git/DoesNotContainKeyCondition.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
package pl.project13.maven.git;
1919

20-
import org.fest.assertions.Condition;
20+
import org.assertj.core.api.Condition;
2121

2222
import javax.annotation.Nonnull;
2323
import java.util.Map;

0 commit comments

Comments
 (0)