Skip to content

Commit 3fe39fe

Browse files
axmanaladaxmanalad
authored
Merge branch 'eclipse-platform:master' into team-alex-shawn-chelsy
2 parents 2f5c7e0 + 0abe5a5 commit 3fe39fe

File tree

12 files changed

+603
-707
lines changed

12 files changed

+603
-707
lines changed

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,11 @@ For a complete guide, see the [CONTRIBUTING](https://github.com/eclipse-platform
3131
https://www.eclipse.org/setups/installer/?url=https://raw.githubusercontent.com/eclipse-platform/eclipse.platform/master/releng/org.eclipse.platform.setup/PlatformConfiguration.setup&show=true
3232
"Click to open Eclipse-Installer Auto Launch or drag into your running installer")
3333

34+
## Documentation
35+
36+
For additional documentation, please refer to the [docs directory](./docs) and [The Official Eclipse FAQs](./docs/FAQ/The_Official_Eclipse_FAQs.md).
37+
38+
3439
## Issue Tracking
3540

3641
This project uses Github to track ongoing development and issues. In case you have an issue, please read the information about Eclipse being a [community project](https://github.com/eclipse-platform#community) and bear in mind that this project is almost entirely developed by volunteers. So the contributors may not be able to look into every reported issue. You will also find the information about [how to find and report issues](https://github.com/eclipse-platform#reporting-issues) in repositories of the `eclipse-platform` organization there. Be sure to search for existing issues before you create another one.

‎docs/FAQ/The_Official_Eclipse_FAQs.md‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Contents
1616
* [2 Part II -- The Rich Client Platform](#Part-II----The-Rich-Client-Platform)
1717
* [2.1 All about Plug-ins](#All-about-Plug-ins)
1818
* [2.2 Runtime Facilities](#Runtime-Facilities)
19-
* [2.3 Standard Widget Toolkit (SWT)](#Standard-Widget-Toolkit-.28SWT.29)
19+
* [2.3 Standard Widget Toolkit (SWT)](#standard-widget-toolkit-swt)
2020
* [2.4 JFace](#JFace)
2121
* [2.5 Generic Workbench](#Generic-Workbench)
2222
* [2.6 Perspectives and Views](#Perspectives-and-Views)
@@ -34,7 +34,7 @@ Contents
3434
* [3.5.2 This is a DSL of your own](#This-is-a-DSL-of-your-own)
3535
* [3.5.3 Legacy](#Legacy)
3636
* [3.6 Java Development Tool API](#Java-Development-Tool-API)
37-
* [4 Where to buy the original book](#Where-to-buy-the-original-book)
37+
* [4 This content is based on](#This-content-is-based-on)
3838

3939
Part I -- The Eclipse Ecosystem
4040
-------------------------------
@@ -602,12 +602,10 @@ Finally, the JDT is a useful set of plug-ins in its own right, but it has also b
602602
* [FAQ How do I participate in a refactoring?](./FAQ_How_do_I_participate_in_a_refactoring.md "FAQ How do I participate in a refactoring?")
603603
* [FAQ What is LTK?](./FAQ_What_is_LTK.md "FAQ What is LTK?")
604604

605-
Where to buy the original book
606-
------------------------------
607605

608-
The initial contents for these FAQ pages has come from The Offical Eclipse 3.0 FAQs written by John Arthorne and Chris Laffra.
606+
### Acknowledgement
609607

610-
Permission to publish the FAQ book contents here has been graciously offered by Addison-Wesley, publishers of the official Eclipse Series which wouldn't be possible without the great help from Greg Doench.
608+
The initial contents for these FAQ pages has come from [The Offical Eclipse 3.0 FAQs](https://www.amazon.com/exec/obidos/ASIN/0321268385) written by John Arthorne and Chris Laffra.
611609

612-
The book can be purchased from [Amazon.com](http://www.amazon.com/exec/obidos/ASIN/0321268385)
610+
Permission to publish the FAQ book contents here has been graciously offered by Addison-Wesley, publishers of the official Eclipse Series which wouldn't be possible without the great help from Greg Doench.
613611

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

Lines changed: 37 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -14,21 +14,21 @@
1414
package org.eclipse.core.tests.resources.content;
1515

1616
import static org.eclipse.core.tests.resources.ResourceTestPluginConstants.PI_RESOURCES_TESTS;
17-
import static org.junit.Assert.assertEquals;
18-
import static org.junit.Assert.assertFalse;
19-
import static org.junit.Assert.assertNull;
20-
import static org.junit.Assert.assertTrue;
21-
import static org.junit.Assert.fail;
17+
import static org.junit.jupiter.api.Assertions.assertEquals;
18+
import static org.junit.jupiter.api.Assertions.assertFalse;
19+
import static org.junit.jupiter.api.Assertions.assertNull;
20+
import static org.junit.jupiter.api.Assertions.assertThrows;
21+
import static org.junit.jupiter.api.Assertions.assertTrue;
2222

2323
import org.eclipse.core.internal.content.ContentDescription;
2424
import org.eclipse.core.internal.content.ContentType;
2525
import org.eclipse.core.internal.content.ContentTypeHandler;
2626
import org.eclipse.core.runtime.Platform;
2727
import org.eclipse.core.runtime.QualifiedName;
2828
import org.eclipse.core.runtime.content.IContentDescription;
29-
import org.junit.Test;
29+
import org.junit.jupiter.api.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)