Skip to content

Commit eebab16

Browse files
rubenporrasrubenporras
committed
build: upgrade to Xtext 2.38
- a dependency on draw2d can be removed by removing an unused method that is just a wrapper over another method in the same class. - For the UI tests to run: - mockito, hamcrest and junit needs to be updated. - the dependency of com.avaloq.tools.ddk.xtext.format.ui.test on com.avaloq.tools.ddk.xtext.format.ui.test - fix deprecations
1 parent 063b77a commit eebab16

File tree

9 files changed

+52
-78
lines changed

9 files changed

+52
-78
lines changed

‎com.avaloq.tools.ddk.test.ui/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Bundle-ActivationPolicy: lazy
1010
Require-Bundle: com.avaloq.tools.ddk.test.core,
1111
org.eclipse.core.runtime,
1212
org.eclipse.core.resources,
13-
org.eclipse.draw2d,
1413
org.eclipse.swt,
1514
org.eclipse.swtbot.eclipse.core,
1615
org.eclipse.swtbot.eclipse.finder;visibility:=reexport,

‎com.avaloq.tools.ddk.test.ui/src/com/avaloq/tools/ddk/test/ui/swtbot/util/DragAndDropUtil.java‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,24 +125,6 @@ public void dragAndDrop(final AbstractSWTBot<? extends Widget> source, final Abs
125125
dragAndDrop(source, dropTarget);
126126
}
127127

128-
/**
129-
* Performs a drag and drop operation from this widget to the given target
130-
* at the given location from target origin. The drag start location will be
131-
* chosen depending on this widget's default implementation.
132-
*
133-
* @param source
134-
* the source widget to drag
135-
* @param target
136-
* To perform the drop on
137-
* @param locationOnTarget
138-
* The target locations, from target origin, where the DND shall
139-
* finish.
140-
* @see #dragAndDrop(Point)
141-
*/
142-
public void dragAndDrop(final AbstractSWTBot<? extends Widget> source, final AbstractSWTBot<? extends Widget> target, final org.eclipse.draw2d.geometry.Point locationOnTarget) {
143-
dragAndDrop(source, target, new Point(locationOnTarget.x, locationOnTarget.y));
144-
}
145-
146128
/**
147129
* Performs a DND operation to an arbitrary location. The drag start
148130
* location will be chosen depending on this widget's default

‎com.avaloq.tools.ddk.xtext.format.ui.test/META-INF/MANIFEST.MF‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ Export-Package: com.avaloq.tools.ddk.xtext.format.ui;x-internal=true
99
Require-Bundle: org.eclipse.core.runtime,
1010
org.eclipse.ui.workbench;resolution:=optional,
1111
org.eclipse.xtext.testing,
12-
org.eclipse.xtext.xbase.junit,
1312
org.eclipse.xtext.xbase.testing,
1413
org.eclipse.xtext.ui.testing,
1514
org.eclipse.xtext.xbase.ui.testing

‎com.avaloq.tools.ddk.xtext.test.core/src/com/avaloq/tools/ddk/xtext/test/ui/quickfix/AbstractQuickFixTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
*******************************************************************************/
1111
package com.avaloq.tools.ddk.xtext.test.ui.quickfix;
1212

13-
import static org.hamcrest.Matchers.equalToIgnoringWhiteSpace;
1413
import static org.junit.Assert.assertEquals;
1514

1615
import java.util.ArrayList;
@@ -23,6 +22,7 @@
2322
import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionProvider;
2423
import org.eclipse.xtext.validation.Issue;
2524
import org.hamcrest.MatcherAssert;
25+
import org.hamcrest.text.IsEqualCompressingWhiteSpace;
2626
import org.junit.Assert;
2727

2828
import com.avaloq.tools.ddk.check.runtime.quickfix.ICoreModificationContext;
@@ -386,7 +386,7 @@ private void assertQuickFixProducesExpectedOutput(final String expectedContent,
386386
String expected = expectedContent.replaceAll(CR_LF, LF);
387387
String actual = actualContent.replaceAll(CR_LF, LF);
388388
if (ignoreFormatting) {
389-
MatcherAssert.assertThat(message, actual, equalToIgnoringWhiteSpace(expected));
389+
MatcherAssert.assertThat(message, actual, IsEqualCompressingWhiteSpace.equalToCompressingWhiteSpace(expected));
390390
} else {
391391
assertEquals(message, expected, actual);
392392
}

‎com.avaloq.tools.ddk.xtext.test/src/com/avaloq/tools/ddk/xtext/AllTests.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010
*******************************************************************************/
1111
package com.avaloq.tools.ddk.xtext;
1212

13-
import org.eclipse.xtext.ui.testing.util.TargetPlatformUtil;
14-
import org.junit.BeforeClass;
1513
import org.junit.runner.RunWith;
1614
import org.junit.runners.Suite;
1715

@@ -55,9 +53,4 @@
5553
})
5654
// @Format-On
5755
public class AllTests {
58-
@BeforeClass
59-
public static void setUp() throws Exception {
60-
// Make sure PDE can deal with plugin projects we may create in our tests.
61-
TargetPlatformUtil.setTargetPlatform(AllTests.class);
62-
}
6356
}

‎com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/modelinference/DefaultInferredElementFragmentProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
package com.avaloq.tools.ddk.xtext.modelinference;
1313

14+
import java.nio.charset.StandardCharsets;
1415
import java.util.Map;
1516
import java.util.Set;
1617

@@ -20,7 +21,6 @@
2021
import org.eclipse.xtext.naming.IQualifiedNameProvider;
2122
import org.eclipse.xtext.naming.QualifiedName;
2223

23-
import com.google.common.base.Charsets;
2424
import com.google.common.collect.Maps;
2525
import com.google.common.hash.HashCode;
2626
import com.google.common.hash.HashFunction;
@@ -97,7 +97,7 @@ protected IQualifiedNameProvider getQualifiedNameProvider() {
9797
protected HashCode computeHash(final EClass eClass, final QualifiedName name) {
9898
byte[] eClassUriBytes = eClassToUriBytesMap.get(eClass);
9999
if (eClassUriBytes == null) {
100-
eClassUriBytes = EcoreUtil.getURI(eClass).toString().getBytes(Charsets.UTF_8);
100+
eClassUriBytes = EcoreUtil.getURI(eClass).toString().getBytes(StandardCharsets.UTF_8);
101101
eClassToUriBytesMap.put(eClass, eClassUriBytes);
102102
}
103103

‎com.avaloq.tools.ddk.xtext/src/com/avaloq/tools/ddk/xtext/resource/AbstractFingerprintComputer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*******************************************************************************/
1111
package com.avaloq.tools.ddk.xtext.resource;
1212

13+
import java.nio.charset.StandardCharsets;
1314
import java.security.MessageDigest;
1415
import java.security.NoSuchAlgorithmException;
1516
import java.util.Collections;
@@ -28,7 +29,6 @@
2829
import org.eclipse.emf.ecore.util.InternalEList;
2930
import org.eclipse.xtext.linking.lazy.LazyLinkingResource;
3031

31-
import com.google.common.base.Charsets;
3232
import com.google.common.collect.Iterables;
3333
import com.google.common.collect.Lists;
3434
import com.google.common.collect.Ordering;
@@ -194,7 +194,7 @@ protected String computeFingerprint(final Iterable<? extends EObject> objects) {
194194
protected final CharSequence encodeFingerprint(final ExportItem export) {
195195
try {
196196
final MessageDigest md5 = MessageDigest.getInstance("MD5"); //$NON-NLS-1$
197-
final byte[] digest = md5.digest(export.getKeyAsString().getBytes(Charsets.UTF_8));
197+
final byte[] digest = md5.digest(export.getKeyAsString().getBytes(StandardCharsets.UTF_8));
198198
/* Now encode it as a string. */
199199
final StringBuilder result = new StringBuilder();
200200
for (byte element : digest) {

‎ddk-target/ddk-antlr.target‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target name="DDK Target - ANTLR" sequenceNumber="4">
3+
<target name="DDK Target - ANTLR" sequenceNumber="5">
44
<locations>
55
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
66
<repository location="https://download.itemis.com/updates/releases/2.1.1/" />
@@ -9,12 +9,12 @@
99
<location type="Target" uri="file:${project_loc:/ddk-target}/ddk.target" />
1010
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
1111
<repository location="http://download.eclipse.org/technology/swtbot/releases/4.0.0/" />
12+
<repository location="https://download.eclipse.org/eclipse/updates/4.34/" />
1213
<repository location="https://download.eclipse.org/releases/2022-12/202212071000/" />
1314
<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/" />
14-
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/" />
15-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.37.0/" />
15+
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.21.0/" />
16+
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.38.0/" />
1617
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/" />
17-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository" />
1818
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository" />
1919
</location>
2020
</locations>

‎ddk-target/ddk.target‎

Lines changed: 42 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,57 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
22
<?pde version="3.8"?>
3-
<target name="DDK Target" sequenceNumber="22">
3+
<target name="DDK Target" sequenceNumber="23">
44
<locations>
5-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6-
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
7-
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
8-
<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
9-
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
10-
<repository location="http://download.eclipse.org/technology/swtbot/releases/4.1.0/"/>
11-
</location>
12-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
13-
<unit id="org.eclipse.pde.source.feature.group" version="3.14.1400.v20221123-1800"/>
14-
<unit id="org.eclipse.jdt.source.feature.group" version="3.18.1400.v20221123-1800"/>
15-
<unit id="org.eclipse.platform.feature.group" version="4.26.0.v20221123-2302"/>
16-
<unit id="org.eclipse.platform.source.feature.group" version="4.26.0.v20221123-2302"/>
17-
<unit id="org.eclipse.emf.codegen.ecore.ui.feature.group" version="2.32.0.v20220925-1245"/>
18-
<repository location="https://download.eclipse.org/releases/2022-12/202212071000/"/>
19-
</location>
20-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
21-
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
22-
<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
23-
</location>
24-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
25-
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
26-
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
27-
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.20.0/"/>
28-
</location>
29-
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
30-
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
31-
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
32-
<unit id="org.eclipse.xtext.xtext.generator" version="0.0.0"/>
33-
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.37.0/"/>
34-
</location>
5+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
6+
<unit id="org.eclipse.swtbot.eclipse.feature.group" version="0.0.0"/>
7+
<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
8+
<unit id="org.eclipse.swtbot.ide.feature.group" version="0.0.0"/>
9+
<unit id="org.eclipse.swtbot.eclipse.test.junit.feature.group" version="0.0.0"/>
10+
<repository location="http://download.eclipse.org/technology/swtbot/releases/4.2.1/"/>
11+
</location>
12+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
13+
<unit id="org.eclipse.pde.source.feature.group" version="0.0.0"/>
14+
<unit id="org.eclipse.jdt.source.feature.group" version="0.0.0"/>
15+
<unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
16+
<unit id="org.eclipse.platform.source.feature.group" version="0.0.0"/>
17+
<repository location="https://download.eclipse.org/eclipse/updates/4.34/"/>
18+
</location>
3519
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
36-
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/"/>
37-
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
20+
<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
21+
<repository location="https://download.eclipse.org/modeling/emf/emf/builds/release/2.39.0/"/>
3822
</location>
3923
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
40-
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20200529191137/repository"/>
41-
<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
42-
<unit id="org.hamcrest.core.source" version="1.3.0.v20180420-1519"/>
43-
<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
44-
<unit id="org.hamcrest.library.source" version="1.3.0.v20180524-2246"/>
45-
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
46-
<unit id="org.mockito.source" version="2.23.0.v20200310-1642"/>
47-
<unit id="org.slf4j.ext" version="1.7.30.v20200204-2150"/>
24+
<unit id="org.eclipse.uml2.sdk.feature.group" version="0.0.0"/>
25+
<repository location="https://download.eclipse.org/releases/2022-12/202212071000/"/>
26+
</location>
27+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
28+
<unit id="org.eclipse.xpand.sdk.feature.group" version="0.0.0"/>
29+
<repository location="https://download.eclipse.org/modeling/m2t/xpand/updates/releases/R201605260315/"/>
30+
</location>
31+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
32+
<unit id="org.eclipse.emf.mwe2.runtime.sdk.feature.group" version="0.0.0"/>
33+
<unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
34+
<repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.21.0/"/>
35+
</location>
36+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
37+
<unit id="org.eclipse.xtend.sdk.feature.group" version="0.0.0"/>
38+
<unit id="org.eclipse.xtext.sdk.feature.group" version="0.0.0"/>
39+
<unit id="org.eclipse.xtext.xtext.generator" version="0.0.0"/>
40+
<repository location="https://download.eclipse.org/modeling/tmf/xtext/updates/releases/2.38.0/"/>
41+
</location>
42+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
43+
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.23.1/"/>
44+
<unit id="org.eclipse.lsp4j.sdk.feature.group" version="0.0.0"/>
4845
</location>
4946
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
5047
<repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
5148
<unit id="org.apache.logging.log4j" version="2.17.1.v20220106-2156"/>
5249
<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
5350
<unit id="org.apache.log4j" version="1.2.15.v201012070815"/>
51+
<unit id="org.slf4j.ext" version="1.7.30.v20200204-2150"/>
52+
<unit id="org.mockito" version="2.23.0.v20200310-1642"/>
53+
<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
54+
<unit id="org.junit" version="4.13.2.v20211018-1956"/>
5455
</location>
5556
</locations>
5657
</target>

0 commit comments

Comments
 (0)