Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
chore(lib-test): move from org.fest to assertj
- update mockito from 2.21 to 5.18
- update objenesis from 2.6 to 3.4
  • Loading branch information
xael-fry committed Aug 4, 2025
commit ae3cc0a7f8890866eaa6739646f383c95f84c29d
Binary file added framework/lib-test/assertj-core-3.27.3.jar
Binary file not shown.
Binary file added framework/lib-test/byte-buddy-agent-1.17.6.jar
Binary file not shown.
Binary file removed framework/lib-test/fest-assert-1.4.jar
Binary file not shown.
Binary file removed framework/lib-test/fest-util-1.1.6.jar
Binary file not shown.
Binary file removed framework/lib-test/mockito-core-2.21.0.jar
Binary file not shown.
Binary file added framework/lib-test/mockito-core-5.18.0.jar
Binary file not shown.
Binary file removed framework/lib-test/objenesis-2.6.jar
Binary file not shown.
Binary file added framework/lib-test/objenesis-3.4.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion framework/test-src/play/cache/EhCacheImplTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package play.cache;

import org.junit.Test;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class EhCacheImplTest {

Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/data/binding/BeanWrapperTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import java.util.HashMap;
import java.util.Map;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class BeanWrapperTest {

Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/data/binding/BinderTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import java.util.*;

import static java.math.BigDecimal.TEN;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import java.util.Properties;

import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;

public class ValidationTest {
Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/i18n/LangTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package play.i18n;

import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

import java.util.Arrays;
import java.util.Locale;
Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/mvc/CookieDataCodecTest.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package play.mvc;

import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static play.mvc.CookieDataCodec.decode;
import static play.mvc.CookieDataCodec.encode;

Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/mvc/HttpResponseTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package play.mvc;

import org.junit.Test;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

public class HttpResponseTest {

Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/mvc/RouterTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import java.util.Properties;

import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.*;

public class RouterTest {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import java.util.List;
import java.util.Properties;

import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

/**
* Created by IntelliJ IDEA.
Expand Down Expand Up @@ -48,7 +48,7 @@ private void internalTest(Properties config, PluginCollection pc, List<? extends
ConfigurablePluginDisablingPlugin plugin = new ConfigurablePluginDisablingPlugin();
plugin.onConfigurationRead();

assertThat(pc.getEnabledPlugins()).containsOnly(correctPluginListAfter.toArray());
assertThat(pc.getEnabledPlugins()).containsOnly(correctPluginListAfter.toArray(new PlayPlugin[0]));
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions framework/test-src/play/plugins/PluginCollectionTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package play.plugins;

import static java.util.Arrays.asList;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;

Expand Down Expand Up @@ -145,7 +145,7 @@ public void verifyUpdatePlayPluginsList() {
PluginCollection pc = new PluginCollection();
pc.loadPlugins();

assertThat(Play.plugins).containsExactly(pc.getEnabledPlugins().toArray());
assertThat(Play.plugins).containsExactly(pc.getEnabledPlugins().toArray(new PlayPlugin[0]));

}

Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/templates/GroovyTemplateTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.util.HashMap;
import java.util.Map;

import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertEquals;

public class GroovyTemplateTest {
Expand Down
4 changes: 2 additions & 2 deletions framework/test-src/play/templates/JavaExtensionsTest.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package play.templates;

import static org.junit.Assert.*;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;

import java.util.ArrayList;
import java.util.List;
Expand Down Expand Up @@ -46,7 +46,7 @@ public void testContains() {
@Test
public void testAdd() {
final String[] items = JavaExtensions.add(new String[]{"a", "b"}, "c");
assertThat(items).hasSize(3).contains((Object[]) new String[] {"a", "b", "c"});
assertThat(items).hasSize(3).contains(new String[] {"a", "b", "c"});

}

Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/utils/HTTPTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import java.util.Date;

import static org.apache.commons.lang3.time.DateUtils.addDays;
import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;

Expand Down
2 changes: 1 addition & 1 deletion framework/test-src/play/utils/OrderSafePropertiesTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import java.util.*;
import java.util.Properties;

import static org.fest.assertions.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThat;


public class OrderSafePropertiesTest {
Expand Down
Loading