From 0efaa8f30c107beb904d37e2ad13913ae51f9e27 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Thu, 6 Dec 2018 11:43:10 +0000
Subject: [PATCH 2/2] Patch to use ASM 6 and Mockito 1
---
.../weaving/ClassfileTransformer.java | 4 +--
.../internal/builder/ReferenceExtractor.java | 10 +++---
.../internal/comparator/SignatureDecoder.java | 2 +-
.../internal/model/TypeStructureBuilder.java | 10 +++---
.../org.eclipse.sdk.tests/feature.xml | 2 +-
.../org.eclipse.test-feature/feature.xml | 2 +-
.../META-INF/MANIFEST.MF | 3 +-
.../META-INF/MANIFEST.MF | 3 +-
.../ThemeDefinitionChangedHandlerTest.java | 2 +-
.../themes/StylingPreferencesHandlerTest.java | 4 +--
.../WorkbenchThemeChangedHandlerTest.java | 32 +++++++++----------
.../org.eclipse.ui.tests/META-INF/MANIFEST.MF | 2 +-
12 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java
index 58657d1ec..6476bba63 100644
--- a/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java
+++ b/eclipse.jdt.debug/org.eclipse.jdt.launching.javaagent/src/main/java/org/eclipse/jdt/launching/internal/weaving/ClassfileTransformer.java
@@ -24,10 +24,10 @@ public class ClassfileTransformer {
private static final String STRATA_ID = "jdt"; //$NON-NLS-1$
/** max supported java class format major version, must match {@link #ASM_API} below **/
- public static final int MAX_CLASS_MAJOR = Opcodes.V11;
+ public static final int MAX_CLASS_MAJOR = Opcodes.V10;
/** supported ASM API version, must match {@link #MAX_CLASS_MAJOR} above */
- private static final int ASM_API = Opcodes.ASM7;
+ private static final int ASM_API = Opcodes.ASM6;
public byte[] transform(byte[] classfileBuffer, final String location) {
diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
index e4d50336a..2fe807ba9 100644
--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/builder/ReferenceExtractor.java
@@ -82,7 +82,7 @@ public class ReferenceExtractor extends ClassVisitor {
protected List<Reference> references;
public ClassFileSignatureVisitor() {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.references = new ArrayList<>();
}
@@ -250,7 +250,7 @@ public class ReferenceExtractor extends ClassVisitor {
* @param mv
*/
public ClassFileMethodVisitor(MethodVisitor mv, String name, int argumentcount) {
- super(Opcodes.ASM7, mv);
+ super(Opcodes.ASM6, mv);
this.argumentcount = argumentcount;
this.linePositionTracker = new LinePositionTracker();
this.lastLineNumber = -1;
@@ -634,7 +634,7 @@ public class ReferenceExtractor extends ClassVisitor {
class ClassFileFieldVisitor extends FieldVisitor {
ClassFileFieldVisitor() {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
}
@Override
@@ -990,7 +990,7 @@ public class ReferenceExtractor extends ClassVisitor {
* {@link ReferenceModifiers}
*/
public ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds) {
- super(Opcodes.ASM7, new ClassNode());
+ super(Opcodes.ASM6, new ClassNode());
fType = type;
this.collector = collector;
fReferenceKinds = referenceKinds;
@@ -1007,7 +1007,7 @@ public class ReferenceExtractor extends ClassVisitor {
* @param tracker
*/
protected ReferenceExtractor(IApiType type, Set<Reference> collector, int referenceKinds, FieldTracker tracker) {
- super(Opcodes.ASM7, new ClassNode());
+ super(Opcodes.ASM6, new ClassNode());
fType = type;
this.collector = collector;
fReferenceKinds = referenceKinds;
diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java
index e6e38604e..490598b7b 100644
--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java
+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/comparator/SignatureDecoder.java
@@ -32,7 +32,7 @@ final class SignatureDecoder extends SignatureVisitor {
SignatureDescriptor signatureDescriptor;
public SignatureDecoder(SignatureDescriptor signatureDescriptor) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.signatureDescriptor = signatureDescriptor;
}
diff --git a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
index 4ff1492e8..7dc03b6aa 100644
--- a/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
+++ b/eclipse.pde.ui/apitools/org.eclipse.pde.api.tools/src/org/eclipse/pde/api/tools/internal/model/TypeStructureBuilder.java
@@ -57,7 +57,7 @@ public class TypeStructureBuilder extends ClassVisitor {
* unknown
*/
TypeStructureBuilder(ClassVisitor cv, IApiComponent component, IApiTypeRoot file) {
- super(Opcodes.ASM7, cv);
+ super(Opcodes.ASM6, cv);
fComponent = component;
fFile = file;
}
@@ -154,7 +154,7 @@ public class TypeStructureBuilder extends ClassVisitor {
}
}
final ApiMethod method = fType.addMethod(name, desc, signature, laccess, names);
- return new MethodVisitor(Opcodes.ASM7,
+ return new MethodVisitor(Opcodes.ASM6,
super.visitMethod(laccess, name, desc, signature, exceptions)) {
@Override
public AnnotationVisitor visitAnnotation(String sig, boolean visible) {
@@ -190,7 +190,7 @@ public class TypeStructureBuilder extends ClassVisitor {
int traceCount = 0;
public AnnotationDefaultVisitor(ApiMethod method) {
- super(Opcodes.ASM7);
+ super(Opcodes.ASM6);
this.method = method;
}
@@ -308,7 +308,7 @@ public class TypeStructureBuilder extends ClassVisitor {
String typeName;
public EnclosingMethodSetter(ClassVisitor cv, String typeName) {
- super(Opcodes.ASM7, cv);
+ super(Opcodes.ASM6, cv);
this.typeName = typeName.replace('.', '/');
}
@@ -341,7 +341,7 @@ public class TypeStructureBuilder extends ClassVisitor {
protected EnclosingMethodSetter setter;
public TypeNameFinder(MethodVisitor mv, EnclosingMethodSetter enclosingMethodSetter) {
- super(Opcodes.ASM7, mv);
+ super(Opcodes.ASM6, mv);
this.setter = enclosingMethodSetter;
}
diff --git a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
index f0dab84a3..ecef382ab 100644
--- a/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.sdk.tests/feature.xml
@@ -24,7 +24,7 @@
<import plugin="org.apache.commons.io" />
<import plugin="org.hamcrest.core" />
<import plugin="org.hamcrest.library" />
- <import plugin="org.mockito" />
+ <import plugin="org.mockito.mockito-core" />
<import plugin="org.objenesis" />
</requires>
diff --git a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
index 2a4871027..620359803 100644
--- a/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
+++ b/eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml
@@ -24,7 +24,7 @@
<import plugin="org.easymock" />
<import plugin="org.hamcrest.core" />
<import plugin="org.hamcrest.library" />
- <import plugin="org.mockito" />
+ <import plugin="org.mockito.mockito-core" />
</requires>
<plugin
diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF
index 38dec46b6..97e10cd96 100644
--- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF
+++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests.css.swt/META-INF/MANIFEST.MF
@@ -10,8 +10,9 @@ Require-Bundle: org.junit,
org.w3c.css.sac,
org.eclipse.e4.ui.css.swt.theme;bundle-version="0.9.1",
org.eclipse.ui;bundle-version="3.106.0",
+ org.hamcrest.core;bundle-version="1.3.0",
org.hamcrest.library;bundle-version="1.3.0",
- org.mockito;bundle-version="2.13.0",
+ org.mockito.mockito-core,
org.eclipse.equinox.preferences;bundle-version="3.5.200",
org.eclipse.ui.forms,
org.eclipse.ui.views.properties.tabbed
diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
index 1fa85bf05..4649e94c8 100644
--- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
+++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/META-INF/MANIFEST.MF
@@ -31,8 +31,9 @@ Require-Bundle: org.eclipse.emf.ecore.xmi;bundle-version="2.4.0",
org.eclipse.core.expressions;bundle-version="3.4.200",
org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
org.eclipse.e4.ui.css.swt;bundle-version="0.11.0",
+ org.hamcrest.core;bundle-version="1.3.0",
org.hamcrest.library;bundle-version="1.3.0",
- org.mockito;bundle-version="2.13.0",
+ org.mockito.mockito-core,
org.eclipse.e4.ui.css.core;bundle-version="0.10.100",
org.eclipse.test.performance;bundle-version="3.13.0"
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
index 6d98e184d..7def31d02 100644
--- a/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
+++ b/eclipse.platform.ui/tests/org.eclipse.e4.ui.tests/src/org/eclipse/e4/ui/workbench/renderers/swt/ThemeDefinitionChangedHandlerTest.java
@@ -16,7 +16,7 @@ package org.eclipse.e4.ui.workbench.renderers.swt;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Matchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java
index a6790cad6..69a1d6e8e 100644
--- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java
+++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/StylingPreferencesHandlerTest.java
@@ -1,7 +1,7 @@
package org.eclipse.ui.tests.themes;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.ArgumentMatchers.anyObject;
+import static org.mockito.Matchers.anyBoolean;
+import static org.mockito.Matchers.anyObject;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java
index 5c6d765a7..fa59d1418 100644
--- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java
+++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/Eclipse UI Tests/org/eclipse/ui/tests/themes/WorkbenchThemeChangedHandlerTest.java
@@ -15,10 +15,10 @@
package org.eclipse.ui.tests.themes;
import static org.eclipse.ui.internal.themes.WorkbenchThemeManager.EMPTY_COLOR_VALUE;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyObject;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.isNull;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.anyObject;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -102,11 +102,11 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase {
verify(colorRegistry, times(1)).put(eq("colorDefinition"), any(RGB.class));
verify(colorRegistry, times(1)).put(eq("colorDefinition"), eq(EMPTY_COLOR_VALUE));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class),
eq(fontRegistry), eq(fontDefinition1), any(IPreferenceStore.class));
verify(handler, never()).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class),
eq(fontRegistry), eq(fontDefinition2), any(IPreferenceStore.class));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class),
eq(colorRegistry), eq(colorDefinition), any(IPreferenceStore.class));
verify(stylingEngine, times(1)).style(fontDefinition2);
@@ -165,22 +165,22 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase {
//then
verify(stylingEngine, times(1)).style(fontDefinition1);
verify(fontRegistry, times(1)).put("fontDefinition1", null);
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition1),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition1),
any(IPreferenceStore.class));
verify(stylingEngine, times(1)).style(fontDefinition2);
verify(fontRegistry, never()).put(eq("fontDefinition2"), any(FontData[].class));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition2),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition2),
any(IPreferenceStore.class));
verify(stylingEngine, times(1)).style(colorDefinition1);
verify(colorRegistry, never()).put(eq("colorDefinition1"), any(RGB.class));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition1),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition1),
any(IPreferenceStore.class));
verify(stylingEngine, times(1)).style(colorDefinition2);
verify(colorRegistry, times(1)).put("colorDefinition2", null);
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition2),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition2),
any(IPreferenceStore.class));
}
@@ -227,9 +227,9 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase {
verify(colorRegistry, times(1)).put("colorDefinition", null);
assertEquals(1, themeRegistry.getColors().length);
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition),
any(IPreferenceStore.class));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition),
any(IPreferenceStore.class));
verify(handler, times(1)).resetThemeRegistries(themeRegistry, fontRegistry, colorRegistry);
@@ -297,13 +297,13 @@ public class WorkbenchThemeChangedHandlerTest extends TestCase {
verify(colorRegistry, times(1)).put(eq("colorDefinition2"), any(RGB.class));
verify(colorRegistry, times(1)).put(eq("colorDefinition2"), eq(EMPTY_COLOR_VALUE));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition1),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition1),
any(IPreferenceStore.class));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(fontRegistry), eq(fontDefinition2),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(fontRegistry), eq(fontDefinition2),
any(IPreferenceStore.class));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition1),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition1),
any(IPreferenceStore.class));
- verify(handler, times(1)).populateDefinition(isNull(), isNull(), eq(colorRegistry), eq(colorDefinition2),
+ verify(handler, times(1)).populateDefinition(any(ITheme.class), any(org.eclipse.ui.themes.ITheme.class), eq(colorRegistry), eq(colorDefinition2),
any(IPreferenceStore.class));
verify(handler, times(1)).resetThemeRegistries(themeRegistry, fontRegistry, colorRegistry);
diff --git a/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF b/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
index 9e99458fe..d4bf26410 100644
--- a/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
+++ b/eclipse.platform.ui/tests/org.eclipse.ui.tests/META-INF/MANIFEST.MF
@@ -44,7 +44,7 @@ Require-Bundle: org.eclipse.core.resources,
org.eclipse.osgi.services;bundle-version="3.3.100",
org.hamcrest.core;bundle-version="1.3.0",
org.hamcrest.library;bundle-version="1.3.0",
- org.mockito;bundle-version="2.13.0"
+ org.mockito.mockito-core
Import-Package: javax.annotation
Eclipse-AutoStart: true
Export-Package: org.eclipse.ui.tests.api,
--
2.19.1