Skip to content

Simplify and migrate resources content tests to JUnit 5 #903 #1605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
HeikoKlare merged 3 commits into from
Nov 7, 2024
Merged

Simplify and migrate resources content tests to JUnit 5 #903 #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
53a2431
Simplify resources content tests #903
HeikoKlare Nov 3, 2024
ff02919
Migrate resources content tests to JUnit 5 #903
HeikoKlare Nov 3, 2024
0511cbc
Version bump(s) for 4.34 stream
eclipse-platform-bot Nov 3, 2024
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
94 changes: 37 additions & 57 deletions ....tests.resources/src/org/eclipse/core/tests/resources/content/ContentDescriptionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@
package org.eclipse.core.tests.resources.content;

import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;

import org.eclipse.core.internal.content.ContentDescription;
import org.eclipse.core.internal.content.ContentType;
import org.eclipse.core.internal.content.ContentTypeHandler;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.QualifiedName;
import org.eclipse.core.runtime.content.IContentDescription;
import org.junit.Test;
import org.junit.jupiter.api.Test;

public class ContentDescriptionTest extends ContentTypeTest {
public class ContentDescriptionTest {
private static final String CT_VOID = PI_RESOURCES_TESTS + '.' + "void";
private static final QualifiedName ZOO_PROPERTY = new QualifiedName(PI_RESOURCES_TESTS, "zoo");
private static final QualifiedName BAR_PROPERTY = new QualifiedName(PI_RESOURCES_TESTS, "bar");
Expand All @@ -42,89 +42,69 @@ private ContentType getContentType() {
@Test
public void testAllProperties() {
ContentDescription description = new ContentDescription(IContentDescription.ALL, getContentType());
assertTrue("1.0", description.isRequested(FOO_PROPERTY));
assertNull("1.1", description.getProperty(FOO_PROPERTY));
assertTrue(description.isRequested(FOO_PROPERTY));
assertNull(description.getProperty(FOO_PROPERTY));
description.setProperty(FOO_PROPERTY, "value1");
assertEquals("1.2", "value1", description.getProperty(FOO_PROPERTY));
assertEquals("value1", description.getProperty(FOO_PROPERTY));
description.setProperty(FOO_PROPERTY, "value1b");
assertEquals("1.3", "value1b", description.getProperty(FOO_PROPERTY));
assertTrue("2.0", description.isRequested(BAR_PROPERTY));
assertEquals("value1b", description.getProperty(FOO_PROPERTY));
assertTrue(description.isRequested(BAR_PROPERTY));
description.setProperty(BAR_PROPERTY, "value2");
assertEquals("2.1", "value2", description.getProperty(BAR_PROPERTY));
assertEquals("value2", description.getProperty(BAR_PROPERTY));
description.setProperty(ZOO_PROPERTY, "value3");
assertEquals("2.2", "value3", description.getProperty(ZOO_PROPERTY));
assertEquals("value3", description.getProperty(ZOO_PROPERTY));
description.markImmutable();
try {
description.setProperty(FOO_PROPERTY, "value1c");
fail("3.0 - should have failed");
} catch (IllegalStateException e) {
// success - the object was marked as immutable
}
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1c"));
}

@Test
public void testOneProperty() {
ContentDescription description = new ContentDescription(new QualifiedName[] {FOO_PROPERTY}, getContentType());
assertTrue("1.0", description.isRequested(FOO_PROPERTY));
assertNull("1.1", description.getProperty(FOO_PROPERTY));
assertTrue(description.isRequested(FOO_PROPERTY));
assertNull(description.getProperty(FOO_PROPERTY));
description.setProperty(FOO_PROPERTY, "value1");
assertEquals("1.2", "value1", description.getProperty(FOO_PROPERTY));
assertEquals("value1", description.getProperty(FOO_PROPERTY));
description.setProperty(FOO_PROPERTY, "value1b");
assertEquals("1.3", "value1b", description.getProperty(FOO_PROPERTY));
assertEquals("value1b", description.getProperty(FOO_PROPERTY));
description.setProperty(BAR_PROPERTY, "value2");
assertFalse("2.0", description.isRequested(BAR_PROPERTY));
assertFalse(description.isRequested(BAR_PROPERTY));
description.setProperty(BAR_PROPERTY, "value2");
assertNull("2.1", description.getProperty(BAR_PROPERTY));
assertNull(description.getProperty(BAR_PROPERTY));
description.markImmutable();
try {
description.setProperty(FOO_PROPERTY, "value1c");
fail("3.0 - should have failed");
} catch (IllegalStateException e) {
// success - the object was marked as immutable
}
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1c"));
}

@Test
public void testZeroProperties() {
ContentDescription description = new ContentDescription(new QualifiedName[0], getContentType());
assertFalse("1.0", description.isRequested(FOO_PROPERTY));
assertNull("1.1", description.getProperty(FOO_PROPERTY));
assertFalse(description.isRequested(FOO_PROPERTY));
assertNull(description.getProperty(FOO_PROPERTY));
description.setProperty(FOO_PROPERTY, "value1");
assertNull("1.2", description.getProperty(FOO_PROPERTY));
assertNull(description.getProperty(FOO_PROPERTY));
description.markImmutable();
try {
description.setProperty(FOO_PROPERTY, "value1b");
fail("2.0 - should have failed");
} catch (IllegalStateException e) {
// success - the object was marked as immutable
}
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1b"));
}

@Test
public void testMultipleProperties() {
ContentDescription description = new ContentDescription(new QualifiedName[] {FOO_PROPERTY, BAR_PROPERTY, ZOO_PROPERTY}, getContentType());
assertTrue("1.0", description.isRequested(FOO_PROPERTY));
assertNull("1.1", description.getProperty(FOO_PROPERTY));
assertTrue(description.isRequested(FOO_PROPERTY));
assertNull(description.getProperty(FOO_PROPERTY));
description.setProperty(FOO_PROPERTY, "value1");
assertEquals("1.2", "value1", description.getProperty(FOO_PROPERTY));
assertEquals("value1", description.getProperty(FOO_PROPERTY));
description.setProperty(FOO_PROPERTY, "value1b");
assertEquals("1.3", "value1b", description.getProperty(FOO_PROPERTY));
assertEquals("value1b", description.getProperty(FOO_PROPERTY));
description.setProperty(BAR_PROPERTY, "value2");
assertTrue("2.0", description.isRequested(BAR_PROPERTY));
assertTrue(description.isRequested(BAR_PROPERTY));
description.setProperty(BAR_PROPERTY, "value2");
assertEquals("2.1", "value2", description.getProperty(BAR_PROPERTY));
assertTrue("2.2", description.isRequested(ZOO_PROPERTY));
assertEquals("value2", description.getProperty(BAR_PROPERTY));
assertTrue(description.isRequested(ZOO_PROPERTY));
description.setProperty(ZOO_PROPERTY, "value3");
assertEquals("2.3", "value3", description.getProperty(ZOO_PROPERTY));
assertFalse("3.0", description.isRequested(FRED_PROPERTY));
assertEquals("value3", description.getProperty(ZOO_PROPERTY));
assertFalse(description.isRequested(FRED_PROPERTY));
description.setProperty(FRED_PROPERTY, "value3");
assertNull("3.1", description.getProperty(FRED_PROPERTY));
assertNull(description.getProperty(FRED_PROPERTY));
description.markImmutable();
try {
description.setProperty(FOO_PROPERTY, "value1c");
fail("4.0 - should have failed");
} catch (IllegalStateException e) {
// success - the object was marked as immutable
}
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1c"));
}
}
71 changes: 0 additions & 71 deletions ...se.core.tests.resources/src/org/eclipse/core/tests/resources/content/ContentTypeTest.java
View file
Open in desktop

This file was deleted.

Loading
Loading