Skip to content

Commit f585310

Browse files
mehmet-karamanmehmet-karaman
authored
Merge branch 'eclipse-pde:master' into master
2 parents 750c681 + 4d59605 commit f585310

35 files changed

Lines changed: 634 additions & 545 deletions

File tree

‎README.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@ Project description:
77
--------------------
88

99
The PDE project the Eclipse tooling to develop plug-ins and OSGI bundles.
10-
Website: https://www.eclipse.org/pde/
11-
12-
- https://projects.eclipse.org/projects/eclipse.pde
10+
Website: https://projects.eclipse.org/projects/eclipse.pde
1311

1412
How to contribute:
1513
--------------------

‎build/org.eclipse.pde.build.tests/pom.xml‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,6 @@
1313
<version>1.4.900-SNAPSHOT</version>
1414
<packaging>eclipse-test-plugin</packaging>
1515

16-
<properties>
17-
<!-- This is used in the ibuilds where the tycho test execution is
18-
DISABLED and instead we rely on the test.xml! -->
19-
<skipTests>true</skipTests>
20-
</properties>
21-
2216
<profiles>
2317
<profile>
2418
<!-- Only enable this for individual bundles builds as otherhwise the ibuild repository is not aviable and we might run into problems -->
@@ -28,8 +22,6 @@
2822
<deltaPackDir>${project.build.directory}/deltapack/eclipse</deltaPackDir>
2923
<mirrorDir>${project.build.directory}/mirror-site</mirrorDir>
3024
<sdkProfile>SDKProfile</sdkProfile>
31-
<!-- now enable the test for this run if not suppressed by commandline -->
32-
<skipTests>false</skipTests>
3325
</properties>
3426
<build>
3527
<plugins>
@@ -59,7 +51,7 @@
5951
<version>${tycho.version}</version>
6052
<executions>
6153
<!-- provision an deltapack -->
62-
<execution>
54+
<execution>
6355
<id>mirror-deltapack</id>
6456
<goals>
6557
<goal>mirror</goal>
@@ -92,7 +84,6 @@
9284
<plugin>
9385
<groupId>org.eclipse.tycho</groupId>
9486
<artifactId>tycho-p2-repository-plugin</artifactId>
95-
<version>${tycho.version}</version>
9687
<executions>
9788
<execution>
9889
<id>repo-to-runnable</id>
@@ -107,20 +98,6 @@
10798
</execution>
10899
</executions>
109100
</plugin>
110-
<plugin>
111-
<groupId>org.eclipse.tycho</groupId>
112-
<artifactId>tycho-p2-publisher-plugin</artifactId>
113-
<version>${tycho.version}</version>
114-
<executions>
115-
<execution>
116-
<id>publish-products</id>
117-
<goals>
118-
<goal>publish-products</goal>
119-
</goals>
120-
<phase>pre-integration-test</phase>
121-
</execution>
122-
</executions>
123-
</plugin>
124101
<plugin>
125102
<groupId>org.eclipse.tycho</groupId>
126103
<artifactId>tycho-surefire-plugin</artifactId>
@@ -136,7 +113,27 @@
136113
</repositories>
137114
<install>
138115
<iu>
139-
<id>org.eclipse.sdk.test.ide</id>
116+
<id>org.eclipse.platform.ide</id>
117+
</iu>
118+
<iu>
119+
<id>org.eclipse.pde</id>
120+
<feature>true</feature>
121+
</iu>
122+
<iu>
123+
<id>org.eclipse.tips.feature</id>
124+
<feature>true</feature>
125+
</iu>
126+
<iu>
127+
<id>org.eclipse.test</id>
128+
<feature>true</feature>
129+
</iu>
130+
<!-- Needed by org.eclipse.pde.build.internal.tests.p2.PublishingTests.testBug329162() -->
131+
<iu>
132+
<id>org.eclipse.osgi.source</id>
133+
</iu>
134+
<!-- Needed by org.eclipse.pde.build.internal.tests.SourceTests.testBug290828() -->
135+
<iu>
136+
<id>org.eclipse.team.core.source</id>
140137
</iu>
141138
</install>
142139
</configuration>

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
package org.eclipse.pde.build.internal.tests;
1515

1616
import static org.junit.Assert.assertEquals;
17-
import static org.junit.Assert.assertNotNull;
1817

1918
import java.io.File;
2019
import java.util.HashSet;
@@ -33,7 +32,6 @@ public void testCustomAssembly() throws Exception {
3332
IFolder buildFolder = newTest("customAssembly");
3433

3534
File executable = Utils.findExecutable();
36-
assertNotNull(executable);
3735

3836
Utils.generateFeature(buildFolder, "sdk", null, new String[] { "org.eclipse.swt;unpack=\"false\"",
3937
"org.eclipse.swt.win32.win32.x86_64;unpack=\"false\";os=\"win32\";ws=\"win32\";arch=\"x86_64\"" });
@@ -63,7 +61,6 @@ public void testBug179612_default() throws Exception {
6361
IFolder buildFolder = newTest("179612");
6462

6563
File executable = Utils.findExecutable();
66-
assertNotNull(executable);
6764

6865
Utils.generateFeature(buildFolder, "sdk", null,
6966
new String[] { "org.eclipse.swt;unpack=\"false\"",
@@ -92,7 +89,6 @@ public void testBug179612_custom() throws Exception {
9289
IFolder buildFolder = newTest("179612_custom");
9390

9491
File executable = Utils.findExecutable();
95-
assertNotNull(executable);
9692

9793
Utils.generateFeature(buildFolder, "sdk", null,
9894
new String[] { "org.eclipse.swt;unpack=\"false\"",
@@ -131,7 +127,6 @@ public void testBug196754() throws Exception {
131127
"org.eclipse.equinox.launcher.win32.win32.x86_64;unpack=\"false\"" });
132128

133129
File executable = Utils.findExecutable();
134-
assertNotNull(executable);
135130

136131
Properties buildProperties = BuildConfiguration.getBuilderProperties(buildFolder);
137132
buildProperties.put("archivesFormat", "*, *, * - folder");
@@ -156,7 +151,6 @@ public void testBug211605() throws Exception {
156151
IFolder buildFolder = newTest("211605");
157152

158153
File executable = Utils.findExecutable();
159-
assertNotNull(executable);
160154

161155
Utils.generateFeature(buildFolder, "sdk", null,
162156
new String[] { "org.eclipse.swt;unpack=\"false\"",

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
import static org.junit.Assert.assertEquals;
1717
import static org.junit.Assert.assertNotNull;
1818
import static org.junit.Assert.assertTrue;
19+
import static org.junit.Assume.assumeTrue;
1920

2021
import java.io.BufferedInputStream;
2122
import java.io.File;
@@ -24,6 +25,7 @@
2425
import java.io.FilenameFilter;
2526
import java.io.PrintStream;
2627
import java.net.URL;
28+
import java.nio.file.Files;
2729
import java.util.HashMap;
2830
import java.util.HashSet;
2931
import java.util.Iterator;
@@ -67,7 +69,6 @@ public void offBug192127() throws Exception {
6769
IFolder containerFeature = Utils.createFolder(buildFolder, "features/org.eclipse.pde.build.container.feature");
6870

6971
File executable = Utils.findExecutable();
70-
assertNotNull(executable);
7172

7273
// Exporting from the UI gives the container feature some /Eclipse.App root
7374
// files
@@ -112,7 +113,6 @@ public void test218878() throws Exception {
112113
IFolder buildFolder = newTest("218878");
113114

114115
File executable = Utils.findExecutable();
115-
assertNotNull(executable);
116116

117117
Properties properties = BuildConfiguration.getBuilderProperties(buildFolder);
118118
properties.put("product", "acme.product");
@@ -148,7 +148,6 @@ public void test234032() throws Exception {
148148
IFolder buildFolder = newTest("234032");
149149

150150
File executable = Utils.findExecutable();
151-
assertNotNull(executable);
152151

153152
Properties properties = BuildConfiguration.getBuilderProperties(buildFolder);
154153
properties.put("product", "test.product");
@@ -162,6 +161,9 @@ public void test234032() throws Exception {
162161
runProductBuild(buildFolder);
163162

164163
IFile iniFile = buildFolder.getFile("tmp/eclipse/test.app/Contents/MacOS/test.ini");
164+
// In verification builds this file is currently not created. TODO: Fix this!
165+
assumeTrue(Files.exists(iniFile.getLocation().toPath()));
166+
165167
assertLogContainsLine(iniFile, "-Dfoo=bar");
166168
// bug 313940
167169
assertLogContainsLine(iniFile, "-Dschemes1=archive zip jar");
@@ -172,8 +174,7 @@ public void test234032() throws Exception {
172174
public void test237922() throws Exception {
173175
IFolder buildFolder = newTest("237922");
174176

175-
File executable = Utils.findExecutable();
176-
assertNotNull(executable);
177+
Utils.findExecutable();
177178

178179
Utils.generateFeature(buildFolder, "F", null, new String[] { "rcp" });
179180
Properties featureProperties = new Properties();
@@ -252,7 +253,6 @@ public void test237747() throws Exception {
252253
IFolder buildFolder = newTest("237747");
253254

254255
File executable = Utils.findExecutable();
255-
assertNotNull(executable);
256256

257257
IFolder fooFolder = Utils.createFolder(buildFolder, "plugins/foo");
258258
Utils.generateBundle(fooFolder, "foo");
@@ -278,7 +278,6 @@ public void testBug238001() throws Exception {
278278
IFolder buildFolder = newTest("238001");
279279

280280
File executable = Utils.findExecutable();
281-
assertNotNull(executable);
282281

283282
FilenameFilter filter = (dir, name) -> name.startsWith("org.eclipse.equinox.executable");
284283
File[] files = new File(executable, "features").listFiles(filter);
@@ -361,7 +360,6 @@ public void testBug252246() throws Exception {
361360
IFolder buildFolder = newTest("252246");
362361

363362
File executable = Utils.findExecutable();
364-
assertNotNull(executable);
365363

366364
IFile product = buildFolder.getFile("foo.product");
367365
Utils.generateProduct(product, null, "1.0.0", null, new String[] { "A",
@@ -618,7 +616,6 @@ public void testBug269540() throws Exception {
618616
IFolder buildFolder = newTest("269540");
619617

620618
File executable = Utils.findExecutable();
621-
assertNotNull(executable);
622619

623620
IFolder a = Utils.createFolder(buildFolder, "plugins/A");
624621
Utils.generateBundle(a, "A");

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/Utils.java‎

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
*******************************************************************************/
1414
package org.eclipse.pde.build.internal.tests;
1515

16-
import static org.junit.Assume.assumeTrue;
16+
import static org.junit.Assert.assertNotNull;
1717

1818
import java.io.BufferedInputStream;
1919
import java.io.BufferedOutputStream;
@@ -383,18 +383,29 @@ public static File findExecutable() throws IOException {
383383
}
384384
}
385385
}
386-
387386
if (Platform.OS_MACOSX.equals(Platform.getOS())) {
388387
// After https://bugs.eclipse.org/431116 and related changes, the install
389388
// location on the Mac
390389
// moved down two directories (from <folder-containing-Eclipse.app> to
391390
// Eclipse.app/Contents/Eclipse).
392391
baseLocation = baseLocation.getParentFile().getParentFile();
393392
}
394-
File fallback = new File(baseLocation.getParent(), "deltapack/eclipse");
395-
executableLocation = findExecutable(fallback);
396-
assumeTrue("All attempts to find the executable failed including fallback to " + fallback.getAbsolutePath(),
397-
executableLocation != null);
393+
File fallback1 = new File(baseLocation.getParentFile(), "deltapack/eclipse");
394+
executableLocation = findExecutable(fallback1);
395+
if (executableLocation != null) {
396+
return executableLocation;
397+
}
398+
if (Platform.OS.isMac()) {
399+
// After https://bugs.eclipse.org/431116 and related changes, the install
400+
// location on the Mac
401+
// moved down two directories (from <folder-containing-Eclipse.app> to
402+
// Eclipse.app/Contents/Eclipse).
403+
baseLocation = baseLocation.getParentFile();
404+
}
405+
File fallback2 = new File(baseLocation.getParentFile().getParentFile(), "deltapack/eclipse");
406+
executableLocation = findExecutable(fallback2);
407+
assertNotNull("All attempts to find the executable failed including fallback to " + fallback1.getAbsolutePath()
408+
+ " or to " + fallback2.getAbsolutePath(), executableLocation);
398409
return executableLocation;
399410
}
400411

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/P2Tests.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ public void offP2SimpleProduct() throws Exception {
5959
IFolder repo = Utils.createFolder(buildFolder, "repo");
6060

6161
File executable = Utils.findExecutable();
62-
assertNotNull(executable);
6362

6463
String os = Platform.getOS();
6564
String ws = Platform.getWS();
@@ -215,7 +214,6 @@ public void testBug242346() throws Exception {
215214
false);
216215

217216
File executable = Utils.findExecutable();
218-
assertNotNull(executable);
219217

220218
Properties properties = BuildConfiguration.getBuilderProperties(buildFolder);
221219
String repoLocation = "file:" + repo.getLocation().toOSString();
@@ -333,7 +331,6 @@ public void offBug237662() throws Exception {
333331
IFile productFile = buildFolder.getFile("rcp.product");
334332

335333
File executable = Utils.findExecutable();
336-
assertNotNull(executable);
337334

338335
Utils.generateProduct(productFile, "rcp.product", "1.0.0",
339336
new String[] { OSGI, CORE_RUNTIME, SIMPLE_CONFIGURATOR, EQUINOX_PREFERENCES }, false);
@@ -412,7 +409,6 @@ public void testBug258126() throws Exception {
412409
IFolder buildFolder = newTest("258126");
413410

414411
File executable = Utils.findExecutable();
415-
assertNotNull(executable);
416412

417413
IFolder repo = Utils.createFolder(buildFolder, "repo");
418414

@@ -891,7 +887,6 @@ public void testBug263272_2() throws Exception {
891887
public void testBug267461() throws Exception {
892888
IFolder buildFolder = newTest("267461");
893889
File executable = Utils.findExecutable();
894-
assertNotNull(executable);
895890

896891
IFile productFile = buildFolder.getFile("rcp.product");
897892
IFolder repo = Utils.createFolder(buildFolder, "repo");

‎build/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java‎

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,6 @@ public void testPublishFeature_ExecutableFeature() throws Exception {
482482

483483
IFolder buildFolder = newTest("PublishFeature_Executable");
484484
File executableLocation = Utils.findExecutable();
485-
assertNotNull(executableLocation);
486485

487486
File originalExecutable = findExecutableFeature(executableLocation);
488487

@@ -681,7 +680,6 @@ public void testPublish_Brand_1() throws Exception {
681680
IFolder rcp = Utils.createFolder(buildFolder, "rcp");
682681

683682
File executableLocation = Utils.findExecutable();
684-
assertNotNull(executableLocation);
685683

686684
File executable = findExecutableFeature(executableLocation);
687685
String executableVersion = executable.getName().substring(executable.getName().indexOf('_') + 1);
@@ -858,7 +856,6 @@ public void testPublishAndRunSimpleProduct() throws Exception {
858856
IFolder buildFolder = newTest("PublishAndRunSimpleProduct");
859857

860858
File executable = Utils.findExecutable();
861-
assertNotNull(executable);
862859

863860
// headless rcp hello world
864861
IFolder headless = Utils.createFolder(buildFolder, "plugins/headless");
@@ -1206,7 +1203,6 @@ public void testShape_267506() throws Exception {
12061203
public void testBug267461_2() throws Exception {
12071204
IFolder buildFolder = newTest("267461_2");
12081205
File executable = Utils.findExecutable();
1209-
assertNotNull(executable);
12101206

12111207
IFile productFile = buildFolder.getFile("rcp.product");
12121208
Utils.generateProduct(productFile, "uid.product", "rcp.product", "1.0.0.qualifier", "my.app", null,
@@ -1253,7 +1249,6 @@ public void testBug267461_2() throws Exception {
12531249
public void testBug267972() throws Exception {
12541250
IFolder buildFolder = newTest("267972");
12551251
File executable = Utils.findExecutable();
1256-
assertNotNull(executable);
12571252

12581253
IFile productFile = buildFolder.getFile("rcp.product");
12591254
Utils.generateProduct(productFile, "rcp.product", "1.0.0.qualifier", new String[] { OSGI, EQUINOX_COMMON,
@@ -1573,7 +1568,6 @@ public void testPublish_FeatureBasedProduct() throws Exception {
15731568
IFolder finalRepo = Utils.createFolder(buildFolder, "final");
15741569

15751570
File executable = Utils.findExecutable();
1576-
assertNotNull(executable);
15771571

15781572
Utils.generateFeature(buildFolder, "f", null, new String[] { OSGI, EQUINOX_COMMON });
15791573
Utils.writeBuffer(buildFolder.getFile("features/f/important.txt"), new StringBuffer("boo-urns"));
@@ -1640,7 +1634,6 @@ public void testPublish_FeatureBasedProduct() throws Exception {
16401634
public void testDirectorLogging() throws Exception {
16411635
IFolder buildFolder = newTest("directorLogging");
16421636
File executable = Utils.findExecutable();
1643-
assertNotNull(executable);
16441637

16451638
IFile productFile = buildFolder.getFile("rcp.product");
16461639
Utils.generateProduct(productFile, "uid.product", "rcp.product", "1.0.0.qualifier", "my.app", null,
@@ -1738,7 +1731,6 @@ public void testBug268498() throws Exception {
17381731
IFolder rcp = Utils.createFolder(buildFolder, "rcp");
17391732

17401733
File executable = Utils.findExecutable();
1741-
assertNotNull(executable);
17421734

17431735
IFile product = rcp.getFile("rcp.product");
17441736
StringBuffer extra = new StringBuffer();
@@ -1824,8 +1816,7 @@ public void testPublish_P2InfConfigProperty() throws Exception {
18241816
IFolder buildFolder = newTest("infConfig");
18251817
IFolder rcp = Utils.createFolder(buildFolder, "rcp");
18261818

1827-
File executable = Utils.findExecutable();
1828-
assertNotNull(executable);
1819+
Utils.findExecutable();
18291820

18301821
IFile product = rcp.getFile("rcp.product");
18311822
Utils.generateProduct(product, "org.example.rcp", "1.0.0", null, new String[] { OSGI }, false, null);

0 commit comments

Comments
 (0)