Merge 7155def into 281fabc

edelta.parent/edelta.target/edelta.target.target

@@ -20,10 +20,6 @@
 <repository location="https://download.eclipse.org/releases/2020-03"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.mockito" version="0.0.0"/>
-<repository location="https://download.eclipse.org/tools/orbit/downloads/2020-03"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.emf.mwe2.launcher.feature.group" version="0.0.0"/>
 <repository location="https://download.eclipse.org/modeling/emft/mwe/updates/releases/2.11.2/"/>
 </location>

edelta.parent/edelta.testing.libraries/.classpath

@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry exported="true" kind="lib" path="lib/assertj-core.jar" sourcepath="lib/assertj-core-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/mockito-core.jar" sourcepath="lib/mockito-core-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/byte-buddy-agent.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/byte-buddy.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/objenesis.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>

edelta.parent/edelta.testing.libraries/META-INF/MANIFEST.MF

@@ -6,7 +6,11 @@ Bundle-Version: 0.9.0.qualifier
 Bundle-Vendor: Lorenzo Bettini
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Automatic-Module-Name: edelta.lib
-Bundle-ClassPath: lib/assertj-core.jar
+Bundle-ClassPath: lib/assertj-core.jar,
+ lib/byte-buddy-agent.jar,
+ lib/byte-buddy.jar,
+ lib/mockito-core.jar,
+ lib/objenesis.jar
 Export-Package: org.assertj.core.annotations,
  org.assertj.core.api,
  org.assertj.core.api.exception,
@@ -23,47 +27,112 @@ Export-Package: org.assertj.core.annotations,
  org.assertj.core.error.uri,
  org.assertj.core.extractor,
  org.assertj.core.groups,
- org.assertj.core.internal;x-internal:=true,
- org.assertj.core.internal.bytebuddy;x-internal:=true,
- org.assertj.core.internal.bytebuddy.agent.builder;x-internal:=true,
- org.assertj.core.internal.bytebuddy.asm;x-internal:=true,
- org.assertj.core.internal.bytebuddy.build;x-internal:=true,
- org.assertj.core.internal.bytebuddy.description;x-internal:=true,
- org.assertj.core.internal.bytebuddy.description.annotation;x-internal:=true,
- org.assertj.core.internal.bytebuddy.description.enumeration;x-internal:=true,
- org.assertj.core.internal.bytebuddy.description.field;x-internal:=true,
- org.assertj.core.internal.bytebuddy.description.method;x-internal:=true,
- org.assertj.core.internal.bytebuddy.description.modifier;x-internal:=true,
- org.assertj.core.internal.bytebuddy.description.type;x-internal:=true,
- org.assertj.core.internal.bytebuddy.dynamic;x-internal:=true,
- org.assertj.core.internal.bytebuddy.dynamic.loading;x-internal:=true,
- org.assertj.core.internal.bytebuddy.dynamic.scaffold;x-internal:=true,
- org.assertj.core.internal.bytebuddy.dynamic.scaffold.inline;x-internal:=true,
- org.assertj.core.internal.bytebuddy.dynamic.scaffold.subclass;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.attribute;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.auxiliary;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bind;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bind.annotation;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bytecode;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bytecode.assign;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bytecode.assign.primitive;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bytecode.assign.reference;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bytecode.collection;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bytecode.constant;x-internal:=true,
- org.assertj.core.internal.bytebuddy.implementation.bytecode.member;x-internal:=true,
- org.assertj.core.internal.bytebuddy.jar.asm;x-internal:=true,
- org.assertj.core.internal.bytebuddy.jar.asm.commons;x-internal:=true,
- org.assertj.core.internal.bytebuddy.jar.asm.signature;x-internal:=true,
- org.assertj.core.internal.bytebuddy.matcher;x-internal:=true,
- org.assertj.core.internal.bytebuddy.pool;x-internal:=true,
- org.assertj.core.internal.bytebuddy.utility;x-internal:=true,
- org.assertj.core.internal.bytebuddy.utility.privilege;x-internal:=true,
- org.assertj.core.internal.bytebuddy.utility.visitor;x-internal:=true,
+ org.assertj.core.internal,
+ org.assertj.core.internal.bytebuddy,
+ org.assertj.core.internal.bytebuddy.agent.builder,
+ org.assertj.core.internal.bytebuddy.asm,
+ org.assertj.core.internal.bytebuddy.build,
+ org.assertj.core.internal.bytebuddy.description,
+ org.assertj.core.internal.bytebuddy.description.annotation,
+ org.assertj.core.internal.bytebuddy.description.enumeration,
+ org.assertj.core.internal.bytebuddy.description.field,
+ org.assertj.core.internal.bytebuddy.description.method,
+ org.assertj.core.internal.bytebuddy.description.modifier,
+ org.assertj.core.internal.bytebuddy.description.type,
+ org.assertj.core.internal.bytebuddy.dynamic,
+ org.assertj.core.internal.bytebuddy.dynamic.loading,
+ org.assertj.core.internal.bytebuddy.dynamic.scaffold,
+ org.assertj.core.internal.bytebuddy.dynamic.scaffold.inline,
+ org.assertj.core.internal.bytebuddy.dynamic.scaffold.subclass,
+ org.assertj.core.internal.bytebuddy.implementation,
+ org.assertj.core.internal.bytebuddy.implementation.attribute,
+ org.assertj.core.internal.bytebuddy.implementation.auxiliary,
+ org.assertj.core.internal.bytebuddy.implementation.bind,
+ org.assertj.core.internal.bytebuddy.implementation.bind.annotation,
+ org.assertj.core.internal.bytebuddy.implementation.bytecode,
+ org.assertj.core.internal.bytebuddy.implementation.bytecode.assign,
+ org.assertj.core.internal.bytebuddy.implementation.bytecode.assign.primitive,
+ org.assertj.core.internal.bytebuddy.implementation.bytecode.assign.reference,
+ org.assertj.core.internal.bytebuddy.implementation.bytecode.collection,
+ org.assertj.core.internal.bytebuddy.implementation.bytecode.constant,
+ org.assertj.core.internal.bytebuddy.implementation.bytecode.member,
+ org.assertj.core.internal.bytebuddy.jar.asm,
+ org.assertj.core.internal.bytebuddy.jar.asm.commons,
+ org.assertj.core.internal.bytebuddy.jar.asm.signature,
+ org.assertj.core.internal.bytebuddy.matcher,
+ org.assertj.core.internal.bytebuddy.pool,
+ org.assertj.core.internal.bytebuddy.utility,
+ org.assertj.core.internal.bytebuddy.utility.privilege,
+ org.assertj.core.internal.bytebuddy.utility.visitor,
  org.assertj.core.matcher,
  org.assertj.core.presentation,
  org.assertj.core.util,
  org.assertj.core.util.diff,
  org.assertj.core.util.diff.myers,
  org.assertj.core.util.introspection,
- org.assertj.core.util.xml
+ org.assertj.core.util.xml,
+ org.mockito,
+ org.mockito.codegen,
+ org.mockito.configuration,
+ org.mockito.creation.instance,
+ org.mockito.exceptions.base,
+ org.mockito.exceptions.misusing,
+ org.mockito.exceptions.stacktrace,
+ org.mockito.exceptions.verification,
+ org.mockito.exceptions.verification.junit,
+ org.mockito.exceptions.verification.opentest4j,
+ org.mockito.hamcrest,
+ org.mockito.internal,
+ org.mockito.internal.configuration,
+ org.mockito.internal.configuration.injection,
+ org.mockito.internal.configuration.injection.filter,
+ org.mockito.internal.configuration.injection.scanner,
+ org.mockito.internal.configuration.plugins,
+ org.mockito.internal.creation,
+ org.mockito.internal.creation.bytebuddy,
+ org.mockito.internal.creation.instance,
+ org.mockito.internal.creation.settings,
+ org.mockito.internal.creation.util,
+ org.mockito.internal.debugging,
+ org.mockito.internal.exceptions,
+ org.mockito.internal.exceptions.stacktrace,
+ org.mockito.internal.exceptions.util,
+ org.mockito.internal.framework,
+ org.mockito.internal.hamcrest,
+ org.mockito.internal.handler,
+ org.mockito.internal.invocation,
+ org.mockito.internal.invocation.finder,
+ org.mockito.internal.invocation.mockref,
+ org.mockito.internal.junit,
+ org.mockito.internal.junit.util,
+ org.mockito.internal.listeners,
+ org.mockito.internal.matchers,
+ org.mockito.internal.matchers.apachecommons,
+ org.mockito.internal.matchers.text,
+ org.mockito.internal.progress,
+ org.mockito.internal.reporting,
+ org.mockito.internal.runners,
+ org.mockito.internal.runners.util,
+ org.mockito.internal.session,
+ org.mockito.internal.stubbing,
+ org.mockito.internal.stubbing.answers,
+ org.mockito.internal.stubbing.defaultanswers,
+ org.mockito.internal.util,
+ org.mockito.internal.util.collections,
+ org.mockito.internal.util.concurrent,
+ org.mockito.internal.util.io,
+ org.mockito.internal.util.reflection,
+ org.mockito.internal.verification,
+ org.mockito.internal.verification.api,
+ org.mockito.internal.verification.argumentmatching,
+ org.mockito.internal.verification.checkers,
+ org.mockito.invocation,
+ org.mockito.junit,
+ org.mockito.listeners,
+ org.mockito.mock,
+ org.mockito.plugins,
+ org.mockito.quality,
+ org.mockito.runners,
+ org.mockito.session,
+ org.mockito.stubbing,
+ org.mockito.verification

edelta.parent/edelta.testing.libraries/build.properties

@@ -1,3 +1,7 @@
 bin.includes = META-INF/,\
                .,\
-               lib/assertj-core.jar
+               lib/assertj-core.jar,\
+               lib/byte-buddy-agent.jar,\
+               lib/byte-buddy.jar,\
+               lib/mockito-core.jar,\
+               lib/objenesis.jar

edelta.parent/edelta.testing.libraries/pom.xml

@@ -22,6 +22,17 @@
       <version>${assertj-version}</version>
       <classifier>sources</classifier>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito-version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <version>${mockito-version}</version>
+      <classifier>sources</classifier>
+    </dependency>
   </dependencies>
 
   <build>

edelta.parent/edelta.tests/META-INF/MANIFEST.MF

@@ -15,11 +15,8 @@ Require-Bundle: edelta,
  org.eclipse.xtext.testing,
  org.eclipse.xtext.xbase.testing,
  edelta.refactorings.lib,
- org.mockito;bundle-version="2.23.0",
- net.bytebuddy.byte-buddy;bundle-version="1.9.0",
- org.objenesis;bundle-version="2.6.0",
  org.eclipse.emf.mwe.core;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
- edelta.testing.libraries;bundle-version="0.7.1"
+ edelta.testing.libraries;bundle-version="0.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Export-Package: edelta.tests;x-internal=true
 Import-Package: org.hamcrest.core,