Skip to content

Commit

Permalink
Move assert methods from ResourceTest to dedicated utility class ecli…
Browse files Browse the repository at this point in the history 
…pse-platform#903

This changes moves all assert* utility methods defined in ResourceTest
to a dedicated ResourceTestUtil test class. It prepares for removing the
JUnit 3 test inheritances hierarchy to migrate to JUnit 4.

Contributes to
eclipse-platform#903
  • Loading branch information
@HeikoKlare
HeikoKlare committed Dec 1, 2023
1 parent c75e9a1 commit efd8a26
Show file tree
Hide file tree
Showing 42 changed files with 384 additions and 256 deletions.
2 changes: 2 additions & 0 deletions ...aveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager1Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import org.eclipse.core.tests.resources.saveparticipant3.SaveParticipant3Plugin;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;

/**
* This class needs to be used with SaveManager2Test. Basically this
Expand Down
3 changes: 3 additions & 0 deletions ...aveparticipant/src/org/eclipse/core/tests/resources/saveparticipant/SaveManager2Test.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@

import junit.framework.Test;
import junit.framework.TestSuite;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem;

/**
* @see SaveManager1Test
Expand Down
3 changes: 3 additions & 0 deletions ...clipse.core.tests.resources/src/org/eclipse/core/tests/internal/alias/BasicAliasTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@
*******************************************************************************/
package org.eclipse.core.tests.internal.alias;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThrows;

Expand Down
4 changes: 4 additions & 0 deletions ...se.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/LocalSyncTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
*******************************************************************************/
package org.eclipse.core.tests.internal.localstore;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import org.eclipse.core.internal.resources.ICoreConstants;
Expand Down
4 changes: 4 additions & 0 deletions ...eclipse.core.tests.resources/src/org/eclipse/core/tests/internal/localstore/MoveTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
*******************************************************************************/
package org.eclipse.core.tests.internal.localstore;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import org.eclipse.core.internal.resources.File;
Expand Down
2 changes: 2 additions & 0 deletions ...ore.tests.resources/src/org/eclipse/core/tests/internal/mapping/ChangeValidationTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
*******************************************************************************/
package org.eclipse.core.tests.internal.mapping;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;

import java.util.ArrayList;
import java.util.List;
import org.eclipse.core.resources.IFile;
Expand Down
6 changes: 5 additions & 1 deletion ...core.tests.resources/src/org/eclipse/core/tests/internal/mapping/TestProjectDeletion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@
*******************************************************************************/
package org.eclipse.core.tests.internal.mapping;

import org.eclipse.core.resources.*;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;

import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.mapping.IResourceChangeDescriptionFactory;
import org.eclipse.core.resources.mapping.ResourceChangeValidator;
import org.eclipse.core.tests.resources.ResourceTest;
Expand Down
6 changes: 4 additions & 2 deletions ...ts/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/CharsetTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*******************************************************************************/
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import java.io.ByteArrayInputStream;
Expand Down Expand Up @@ -187,7 +189,7 @@ public void _testBug67606() throws CoreException {
assertEquals("1.0", "BAR", file.getCharset());
file.move(project.getFullPath().append("file2.txt"), IResource.NONE, monitor);
IFile file2 = project.getFile("file2.txt");
assertExistsInWorkspace(file2, false);
assertExistsInWorkspace(file2);
assertEquals("2.0", "BAR", file.getCharset());
}, null);
} finally {
Expand All @@ -208,7 +210,7 @@ public void testCharsetMoveOnFileMove() throws CoreException {
assertEquals("Setting up file's explicit charset was successful", "BAR", file.getCharset());
file.move(project.getFullPath().append("file2.txt"), IResource.NONE, getMonitor());
IFile file2 = project.getFile("file2.txt");
assertExistsInWorkspace(file2, false);
assertExistsInWorkspace(file2);
assertEquals("The file's charset was correctly copied while coying the file", "BAR", file2.getCharset());
} finally {
ensureDoesNotExistInWorkspace(project);
Expand Down
13 changes: 12 additions & 1 deletion ...eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/HiddenResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,20 @@
*******************************************************************************/
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import org.eclipse.core.resources.*;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IProjectDescription;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.IResourceDelta;
import org.eclipse.core.resources.IResourceVisitor;
import org.eclipse.core.resources.IWorkspaceRoot;
import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.runtime.CoreException;

public class HiddenResourceTest extends ResourceTest {
Expand Down
4 changes: 4 additions & 0 deletions ...ests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFileTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
*******************************************************************************/
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import java.io.ByteArrayInputStream;
Expand Down
2 changes: 2 additions & 0 deletions ...ts/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import org.eclipse.core.resources.IFile;
Expand Down
2 changes: 2 additions & 0 deletions ...s/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IProjectTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.NATURE_EARTH;
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.NATURE_MISSING;
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.NATURE_SIMPLE;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import java.io.ByteArrayInputStream;
Expand Down
1 change: 1 addition & 0 deletions ...ore.tests.resources/src/org/eclipse/core/tests/resources/IResourceChangeListenerTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.NATURE_SIMPLE;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;

import java.io.ByteArrayInputStream;
import java.io.IOException;
Expand Down
4 changes: 4 additions & 0 deletions .../org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,10 @@
*******************************************************************************/
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.is;
Expand Down
3 changes: 3 additions & 0 deletions ...org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.SET_STATE;
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.getInvalidNatureSets;
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.getValidNatureSets;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThrows;

Expand Down
2 changes: 2 additions & 0 deletions ...sts.resources/src/org/eclipse/core/tests/resources/LinkedResourceSyncMoveAndCopyTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
*******************************************************************************/
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import java.io.ByteArrayInputStream;
Expand Down
2 changes: 2 additions & 0 deletions ...eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/LinkedResourceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.NATURE_SIMPLE;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
import static org.junit.Assert.assertThrows;

import java.io.BufferedInputStream;
Expand Down
5 changes: 5 additions & 0 deletions ...ts.resources/src/org/eclipse/core/tests/resources/LinkedResourceWithPathVariableTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,11 @@

package org.eclipse.core.tests.resources;

import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInFileSystem;
import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
Expand Down
Loading

0 comments on commit efd8a26

Please sign in to comment.