Move attribute-related methods from ResourceTest to utility class ecl…

…ipse-platform#903 This change moves all methods related to attribute access, such as the read-only state of a file in the ResourceTest class to the dedicated ResourceTestUtil utility class. It prepares for removing the inheritance hierarchy of ResourceTest to migrate to JUnit 4. Contributes to eclipse-platform#903
lathapatil · Dec 6, 2023 · bc4f23b · bc4f23b
1 parent b92af67
commit bc4f23b
Show file tree

Hide file tree

Showing 16 changed files with 63 additions and 31 deletions.
diff --git a/...org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/FileStoreTest.java b/...org.eclipse.core.tests.resources/src/org/eclipse/core/tests/filesystem/FileStoreTest.java
@@ -15,6 +15,9 @@
 
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isAttributeSupported;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.setReadOnly;
 import static org.junit.Assert.assertThrows;
 
 import java.io.File;

diff --git a/...ts/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java b/...ts/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IFolderTest.java
@@ -17,6 +17,7 @@
 import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
 import static org.junit.Assert.assertThrows;
 
 import org.eclipse.core.resources.IFile;

diff --git a/.../org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java b/.../org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IResourceTest.java
@@ -21,6 +21,7 @@
 import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.waitForBuild;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.empty;

diff --git a/...org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java b/...org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/IWorkspaceTest.java
@@ -32,6 +32,7 @@
 import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertThrows;
 

diff --git a/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceAttributeTest.java b/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceAttributeTest.java
@@ -18,6 +18,8 @@
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isAttributeSupported;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.setReadOnly;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.waitForRefresh;
 
 import java.io.File;

diff --git a/...s/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java b/...s/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTest.java
@@ -50,7 +50,6 @@
 import org.eclipse.core.resources.IWorkspace;
 import org.eclipse.core.resources.IWorkspaceDescription;
 import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourceAttributes;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
@@ -528,36 +527,6 @@ protected void deleteOnTearDown(IFileStore store) {
 
 	}
 
-	/**
-	 * Checks whether the local file system supports accessing and modifying
-	 * the given attribute.
-	 */
-	protected boolean isAttributeSupported(int attribute) {
-		return (EFS.getLocalFileSystem().attributes() & attribute) != 0;
-	}
-
-	/**
-	 * Checks whether the local file system supports accessing and modifying
-	 * the read-only flag.
-	 */
-	protected boolean isReadOnlySupported() {
-		return isAttributeSupported(EFS.ATTRIBUTE_READ_ONLY);
-	}
-
-	protected void setReadOnly(IFileStore target, boolean value) throws CoreException {
-		assertThat("Setting read only is not supported by local file system", isReadOnlySupported());
-		IFileInfo fileInfo = target.fetchInfo();
-		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, value);
-		target.putInfo(fileInfo, EFS.SET_ATTRIBUTES, null);
-	}
-
-	protected void setReadOnly(IResource target, boolean value) throws CoreException {
-		ResourceAttributes attributes = target.getResourceAttributes();
-		assertNotNull("tried to set read only for null attributes", attributes);
-		attributes.setReadOnly(value);
-		target.setResourceAttributes(attributes);
-	}
-
 	/**
 	 * The environment should be set-up in the main method.
 	 */

diff --git a/...g.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java b/...g.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/ResourceTestUtil.java
@@ -12,17 +12,24 @@
 package org.eclipse.core.tests.resources;
 
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
+import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 
 import java.util.concurrent.atomic.AtomicBoolean;
+import org.eclipse.core.filesystem.EFS;
+import org.eclipse.core.filesystem.IFileInfo;
+import org.eclipse.core.filesystem.IFileStore;
 import org.eclipse.core.internal.resources.CharsetDeltaJob;
 import org.eclipse.core.internal.resources.ValidateProjectEncoding;
 import org.eclipse.core.internal.resources.Workspace;
 import org.eclipse.core.internal.utils.UniversalUniqueIdentifier;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.ResourceAttributes;
 import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
@@ -211,4 +218,40 @@ public static void waitForEncodingRelatedJobs(String testName) {
 		TestUtil.waitForJobs(testName, 10, 5_000, CharsetDeltaJob.FAMILY_CHARSET_DELTA);
 	}
 
+	/**
+	 * Checks whether the local file system supports accessing and modifying
+	 * the given attribute.
+	 */
+	public static boolean isAttributeSupported(int attribute) {
+		return (EFS.getLocalFileSystem().attributes() & attribute) != 0;
+	}
+
+	/**
+	 * Checks whether the local file system supports accessing and modifying
+	 * the read-only flag.
+	 */
+	public static boolean isReadOnlySupported() {
+		return isAttributeSupported(EFS.ATTRIBUTE_READ_ONLY);
+	}
+
+	/**
+	 * Sets the read-only state of the given file store to {@code value}.
+	 */
+	public static void setReadOnly(IFileStore target, boolean value) throws CoreException {
+		assertThat("Setting read only is not supported by local file system", isReadOnlySupported());
+		IFileInfo fileInfo = target.fetchInfo();
+		fileInfo.setAttribute(EFS.ATTRIBUTE_READ_ONLY, value);
+		target.putInfo(fileInfo, EFS.SET_ATTRIBUTES, null);
+	}
+
+	/**
+	 * Sets the read-only state of the given resource to {@code value}.
+	 */
+	public static void setReadOnly(IResource target, boolean value) throws CoreException {
+		ResourceAttributes attributes = target.getResourceAttributes();
+		assertNotNull("tried to set read only for null attributes", attributes);
+		attributes.setReadOnly(value);
+		target.setResourceAttributes(attributes);
+	}
+
 }
diff --git a/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java b/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_025457.java
@@ -15,6 +15,7 @@
 
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
 import static org.junit.Assert.assertThrows;
 
 import java.io.ByteArrayInputStream;

diff --git a/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java b/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_026294.java
@@ -20,6 +20,8 @@
 import static org.eclipse.core.tests.resources.ResourceTestUtil.assertExistsInWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.setReadOnly;
 import static org.junit.Assert.assertThrows;
 
 import java.io.InputStream;

diff --git a/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java b/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_032076.java
@@ -16,6 +16,8 @@
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.setReadOnly;
 import static org.junit.Assert.assertThrows;
 
 import java.io.InputStream;

diff --git a/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_264182.java b/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_264182.java
@@ -16,6 +16,7 @@
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.assertDoesNotExistInWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.setReadOnly;
 import static org.junit.Assert.assertThrows;
 
 import org.eclipse.core.filesystem.IFileStore;

diff --git a/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_329836.java b/...ipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/Bug_329836.java
@@ -16,6 +16,7 @@
 
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createUniqueString;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isAttributeSupported;
 
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileInfo;

diff --git a/...lipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java b/...lipse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFileTest.java
@@ -15,6 +15,7 @@
 
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
 import static org.junit.Assert.assertThrows;
 
 import org.eclipse.core.resources.IFile;

diff --git a/...pse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFolderTest.java b/...pse.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IFolderTest.java
@@ -15,6 +15,7 @@
 
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isReadOnlySupported;
 import static org.junit.Assert.assertThrows;
 
 import org.eclipse.core.filesystem.EFS;

diff --git a/...e.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java b/...e.core.tests.resources/src/org/eclipse/core/tests/resources/regression/IResourceTest.java
@@ -16,6 +16,7 @@
 
 import static org.eclipse.core.resources.ResourcesPlugin.getWorkspace;
 import static org.eclipse.core.tests.resources.ResourceTestUtil.createTestMonitor;
+import static org.eclipse.core.tests.resources.ResourceTestUtil.isAttributeSupported;
 import static org.junit.Assert.assertThrows;
 
 import java.io.InputStream;

diff --git a/...ts/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/Bug_217673.java b/...ts/org.eclipse.team.tests.core/src/org/eclipse/team/tests/core/regression/Bug_217673.java
@@ -16,6 +16,8 @@
 import junit.framework.Test;
 import junit.framework.TestSuite;
 
+import static org.eclipse.core.tests.resources.ResourceTestUtil.setReadOnly;
+
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IWorkspace;