Skip to content

Commit 30240f7

Browse files
HeikoKlareHeikoKlare
committed
Simplify resources content tests #903
Simplifies the tests in org.eclipse.core.tests.resources.content: * Removes obsolete ContentTypeTest superclass for test classes, uses existing utility functionality instead * Removes obsolete numbering of assertions * Replaces try/catch/fail with assertThrows or making test framework handle the exception Contributes to #903
1 parent 4712d12 commit 30240f7

File tree

9 files changed

+492
-595
lines changed

9 files changed

+492
-595
lines changed

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/ContentDescriptionTest.java

Lines changed: 32 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
import static org.junit.Assert.assertEquals;
1818
import static org.junit.Assert.assertFalse;
1919
import static org.junit.Assert.assertNull;
20+
import static org.junit.Assert.assertThrows;
2021
import static org.junit.Assert.assertTrue;
21-
import static org.junit.Assert.fail;
2222

2323
import org.eclipse.core.internal.content.ContentDescription;
2424
import org.eclipse.core.internal.content.ContentType;
@@ -28,7 +28,7 @@
2828
import org.eclipse.core.runtime.content.IContentDescription;
2929
import org.junit.Test;
3030

31-
public class ContentDescriptionTest extends ContentTypeTest {
31+
public class ContentDescriptionTest {
3232
private static final String CT_VOID = PI_RESOURCES_TESTS + '.' + "void";
3333
private static final QualifiedName ZOO_PROPERTY = new QualifiedName(PI_RESOURCES_TESTS, "zoo");
3434
private static final QualifiedName BAR_PROPERTY = new QualifiedName(PI_RESOURCES_TESTS, "bar");
@@ -42,89 +42,69 @@ private ContentType getContentType() {
4242
@Test
4343
public void testAllProperties() {
4444
ContentDescription description = new ContentDescription(IContentDescription.ALL, getContentType());
45-
assertTrue("1.0", description.isRequested(FOO_PROPERTY));
46-
assertNull("1.1", description.getProperty(FOO_PROPERTY));
45+
assertTrue(description.isRequested(FOO_PROPERTY));
46+
assertNull(description.getProperty(FOO_PROPERTY));
4747
description.setProperty(FOO_PROPERTY, "value1");
48-
assertEquals("1.2", "value1", description.getProperty(FOO_PROPERTY));
48+
assertEquals("value1", description.getProperty(FOO_PROPERTY));
4949
description.setProperty(FOO_PROPERTY, "value1b");
50-
assertEquals("1.3", "value1b", description.getProperty(FOO_PROPERTY));
51-
assertTrue("2.0", description.isRequested(BAR_PROPERTY));
50+
assertEquals("value1b", description.getProperty(FOO_PROPERTY));
51+
assertTrue(description.isRequested(BAR_PROPERTY));
5252
description.setProperty(BAR_PROPERTY, "value2");
53-
assertEquals("2.1", "value2", description.getProperty(BAR_PROPERTY));
53+
assertEquals("value2", description.getProperty(BAR_PROPERTY));
5454
description.setProperty(ZOO_PROPERTY, "value3");
55-
assertEquals("2.2", "value3", description.getProperty(ZOO_PROPERTY));
55+
assertEquals("value3", description.getProperty(ZOO_PROPERTY));
5656
description.markImmutable();
57-
try {
58-
description.setProperty(FOO_PROPERTY, "value1c");
59-
fail("3.0 - should have failed");
60-
} catch (IllegalStateException e) {
61-
// success - the object was marked as immutable
62-
}
57+
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1c"));
6358
}
6459

6560
@Test
6661
public void testOneProperty() {
6762
ContentDescription description = new ContentDescription(new QualifiedName[] {FOO_PROPERTY}, getContentType());
68-
assertTrue("1.0", description.isRequested(FOO_PROPERTY));
69-
assertNull("1.1", description.getProperty(FOO_PROPERTY));
63+
assertTrue(description.isRequested(FOO_PROPERTY));
64+
assertNull(description.getProperty(FOO_PROPERTY));
7065
description.setProperty(FOO_PROPERTY, "value1");
71-
assertEquals("1.2", "value1", description.getProperty(FOO_PROPERTY));
66+
assertEquals("value1", description.getProperty(FOO_PROPERTY));
7267
description.setProperty(FOO_PROPERTY, "value1b");
73-
assertEquals("1.3", "value1b", description.getProperty(FOO_PROPERTY));
68+
assertEquals("value1b", description.getProperty(FOO_PROPERTY));
7469
description.setProperty(BAR_PROPERTY, "value2");
75-
assertFalse("2.0", description.isRequested(BAR_PROPERTY));
70+
assertFalse(description.isRequested(BAR_PROPERTY));
7671
description.setProperty(BAR_PROPERTY, "value2");
77-
assertNull("2.1", description.getProperty(BAR_PROPERTY));
72+
assertNull(description.getProperty(BAR_PROPERTY));
7873
description.markImmutable();
79-
try {
80-
description.setProperty(FOO_PROPERTY, "value1c");
81-
fail("3.0 - should have failed");
82-
} catch (IllegalStateException e) {
83-
// success - the object was marked as immutable
84-
}
74+
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1c"));
8575
}
8676

8777
@Test
8878
public void testZeroProperties() {
8979
ContentDescription description = new ContentDescription(new QualifiedName[0], getContentType());
90-
assertFalse("1.0", description.isRequested(FOO_PROPERTY));
91-
assertNull("1.1", description.getProperty(FOO_PROPERTY));
80+
assertFalse(description.isRequested(FOO_PROPERTY));
81+
assertNull(description.getProperty(FOO_PROPERTY));
9282
description.setProperty(FOO_PROPERTY, "value1");
93-
assertNull("1.2", description.getProperty(FOO_PROPERTY));
83+
assertNull(description.getProperty(FOO_PROPERTY));
9484
description.markImmutable();
95-
try {
96-
description.setProperty(FOO_PROPERTY, "value1b");
97-
fail("2.0 - should have failed");
98-
} catch (IllegalStateException e) {
99-
// success - the object was marked as immutable
100-
}
85+
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1b"));
10186
}
10287

10388
@Test
10489
public void testMultipleProperties() {
10590
ContentDescription description = new ContentDescription(new QualifiedName[] {FOO_PROPERTY, BAR_PROPERTY, ZOO_PROPERTY}, getContentType());
106-
assertTrue("1.0", description.isRequested(FOO_PROPERTY));
107-
assertNull("1.1", description.getProperty(FOO_PROPERTY));
91+
assertTrue(description.isRequested(FOO_PROPERTY));
92+
assertNull(description.getProperty(FOO_PROPERTY));
10893
description.setProperty(FOO_PROPERTY, "value1");
109-
assertEquals("1.2", "value1", description.getProperty(FOO_PROPERTY));
94+
assertEquals("value1", description.getProperty(FOO_PROPERTY));
11095
description.setProperty(FOO_PROPERTY, "value1b");
111-
assertEquals("1.3", "value1b", description.getProperty(FOO_PROPERTY));
96+
assertEquals("value1b", description.getProperty(FOO_PROPERTY));
11297
description.setProperty(BAR_PROPERTY, "value2");
113-
assertTrue("2.0", description.isRequested(BAR_PROPERTY));
98+
assertTrue(description.isRequested(BAR_PROPERTY));
11499
description.setProperty(BAR_PROPERTY, "value2");
115-
assertEquals("2.1", "value2", description.getProperty(BAR_PROPERTY));
116-
assertTrue("2.2", description.isRequested(ZOO_PROPERTY));
100+
assertEquals("value2", description.getProperty(BAR_PROPERTY));
101+
assertTrue(description.isRequested(ZOO_PROPERTY));
117102
description.setProperty(ZOO_PROPERTY, "value3");
118-
assertEquals("2.3", "value3", description.getProperty(ZOO_PROPERTY));
119-
assertFalse("3.0", description.isRequested(FRED_PROPERTY));
103+
assertEquals("value3", description.getProperty(ZOO_PROPERTY));
104+
assertFalse(description.isRequested(FRED_PROPERTY));
120105
description.setProperty(FRED_PROPERTY, "value3");
121-
assertNull("3.1", description.getProperty(FRED_PROPERTY));
106+
assertNull(description.getProperty(FRED_PROPERTY));
122107
description.markImmutable();
123-
try {
124-
description.setProperty(FOO_PROPERTY, "value1c");
125-
fail("4.0 - should have failed");
126-
} catch (IllegalStateException e) {
127-
// success - the object was marked as immutable
128-
}
108+
assertThrows(IllegalStateException.class, () -> description.setProperty(FOO_PROPERTY, "value1c"));
129109
}
130110
}

‎resources/tests/org.eclipse.core.tests.resources/src/org/eclipse/core/tests/resources/content/ContentTypeTest.java

Lines changed: 0 additions & 71 deletions
This file was deleted.

0 commit comments

Comments
 (0)