diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java index abb1ca5d3393..f07e350bb700 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/vfs/VfsUtilTest.java @@ -49,7 +49,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Consumer; -import static com.intellij.testFramework.UsefulTestCase.*; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.*; public class VfsUtilTest extends BareTestFixtureTestCase { @Rule public TempDirectory myTempDir = new TempDirectory(); @@ -108,7 +109,7 @@ public class VfsUtilTest extends BareTestFixtureTestCase { VirtualFile child = vDir.findChild(" "); assertNull(child); - assertEmpty(vDir.getChildren()); + assertThat(vDir.getChildren()).isEmpty(); } @Test @@ -382,13 +383,13 @@ public class VfsUtilTest extends BareTestFixtureTestCase { assertTrue(dir2.mkdirs()); VirtualFile vDir = VfsUtil.findFileByIoFile(tempDir, true); - assertSize(2, vDir.getChildren()); + assertThat(vDir.getChildren()).hasSize(2); VirtualFile vDir1 = vDir.getChildren()[0]; VirtualFile vDir2 = vDir.getChildren()[1]; assertEquals(dir1.getName(), vDir1.getName()); - assertEmpty(vDir1.getChildren()); - assertEmpty(vDir2.getChildren()); + assertThat(vDir1.getChildren()).isEmpty(); + assertThat(vDir2.getChildren()).isEmpty(); assertTrue(new File(dir1, "a.txt").createNewFile()); assertTrue(new File(dir2, "a.txt").createNewFile()); @@ -409,7 +410,7 @@ public class VfsUtilTest extends BareTestFixtureTestCase { assertFalse(ApplicationManager.getApplication().isDispatchThread()); vDir2.refresh(false, true, () -> log.add("modal finished")); - assertSize(1, vDir2.getChildren()); + assertThat(vDir2.getChildren()).hasSize(1); } })); @@ -418,9 +419,9 @@ public class VfsUtilTest extends BareTestFixtureTestCase { UIUtil.dispatchAllInvocationEvents(); } - assertSize(1, vDir1.getChildren()); - assertSize(1, vDir2.getChildren()); - assertOrderedEquals(log, "modal finished", "non-modal finished"); + assertThat(vDir1.getChildren()).hasSize(1); + assertThat(vDir2.getChildren()).hasSize(1); + assertThat(log).containsExactly("modal finished", "non-modal finished"); }); } } \ No newline at end of file