Add small & nominal size git performances tests

Change-Id: Idf0a9b53a5bcf5f1596f823b06644160dd577c44
Signed-off-by: Axel Richard <axel.richard@obeo.fr>

30 files changed, 1403 insertions, 16 deletions

diff --git a/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF b/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
index 000a468db..788ca9f31 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
+++ b/performance/org.eclipse.emf.compare.tests.performance/META-INF/MANIFEST.MF
@@ -19,7 +19,10 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.compare.diagram;bundle-version="2.2.0",
  org.eclipse.emf.compare.uml2;bundle-version="2.2.0",
  fr.obeo.performance;bundle-version="1.0.0",
- org.eclipse.jface
+ org.eclipse.jface,
+ org.eclipse.egit.core,
+ org.eclipse.jgit,
+ org.eclipse.team.core
 Import-Package: com.google.common.base;version="[11.0.0,16.0.0)",
  com.google.common.collect;version="[11.0.0,16.0.0)",
  com.google.common.io;version="[11.0.0,16.0.0)"
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
new file mode 100644
index 000000000..8dc1870eb
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java
@@ -0,0 +1,244 @@
+/*******************************************************************************

+ * Copyright (c) 2015 Obeo.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Obeo - initial API and implementation

+ *******************************************************************************/

+package data.models;

+

+import static com.google.common.collect.Lists.newArrayList;

+import static org.junit.Assert.assertNotNull;

+

+import java.io.File;

+import java.io.IOException;

+import java.net.URL;

+import java.util.ArrayList;

+import java.util.List;

+

+import org.eclipse.compare.ITypedElement;

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.core.runtime.Platform;

+import org.eclipse.egit.core.Activator;

+import org.eclipse.egit.core.op.ConnectProviderOperation;

+import org.eclipse.emf.common.util.BasicMonitor;

+import org.eclipse.emf.common.util.EList;

+import org.eclipse.emf.common.util.TreeIterator;

+import org.eclipse.emf.compare.Comparison;

+import org.eclipse.emf.compare.EMFCompare;

+import org.eclipse.emf.compare.conflict.DefaultConflictDetector;

+import org.eclipse.emf.compare.conflict.IConflictDetector;

+import org.eclipse.emf.compare.diagram.internal.CompareDiagramPostProcessor;

+import org.eclipse.emf.compare.diff.DefaultDiffEngine;

+import org.eclipse.emf.compare.diff.DiffBuilder;

+import org.eclipse.emf.compare.diff.IDiffEngine;

+import org.eclipse.emf.compare.diff.IDiffProcessor;

+import org.eclipse.emf.compare.equi.DefaultEquiEngine;

+import org.eclipse.emf.compare.equi.IEquiEngine;

+import org.eclipse.emf.compare.ide.ui.internal.logical.ComparisonScopeBuilder;

+import org.eclipse.emf.compare.ide.ui.internal.logical.IdenticalResourceMinimizer;

+import org.eclipse.emf.compare.ide.ui.internal.logical.StorageTypedElement;

+import org.eclipse.emf.compare.ide.ui.internal.logical.SubscriberStorageAccessor;

+import org.eclipse.emf.compare.ide.ui.internal.logical.resolver.ThreadedModelResolver;

+import org.eclipse.emf.compare.ide.ui.logical.IStorageProvider;

+import org.eclipse.emf.compare.ide.ui.logical.IStorageProviderAccessor;

+import org.eclipse.emf.compare.match.DefaultMatchEngine;

+import org.eclipse.emf.compare.match.IMatchEngine;

+import org.eclipse.emf.compare.postprocessor.IPostProcessor;

+import org.eclipse.emf.compare.req.DefaultReqEngine;

+import org.eclipse.emf.compare.req.IReqEngine;

+import org.eclipse.emf.compare.scope.IComparisonScope;

+import org.eclipse.emf.compare.tests.performance.git.GitUtil;

+import org.eclipse.emf.compare.uml2.internal.postprocessor.UMLPostProcessor;

+import org.eclipse.emf.compare.utils.UseIdentifiers;

+import org.eclipse.emf.ecore.EObject;

+import org.eclipse.emf.ecore.resource.Resource;

+import org.eclipse.emf.ecore.resource.ResourceSet;

+import org.eclipse.emf.ecore.util.EcoreUtil;

+import org.eclipse.jgit.lib.Constants;

+import org.eclipse.jgit.lib.Repository;

+import org.eclipse.team.core.subscribers.Subscriber;

+import org.osgi.framework.Bundle;

+

+/**

+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>

+ *

+ */

+@SuppressWarnings("restriction")

+public class DataGit {

+

+	private static final String MASTER = Constants.R_HEADS + Constants.MASTER;

+

+	private static final String MODIFIED = Constants.R_HEADS + "modified";

+	

+	private List<Runnable> disposers;

+	

+	private List<ResourceSet> resourceSets = newArrayList();

+	

+	private IComparisonScope scope;

+

+	private Comparison comparison;

+

+	private IProject project;

+

+	private File repoFile;

+

+	private Repository repository;

+

+	

+	public DataGit(String zippedRepoLocation, String repoName, String projectName, String modelName) {

+		try {

+			this.disposers = new ArrayList<Runnable>();

+			String systemTmpDir = System.getProperty("java.io.tmpdir");

+			Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance");

+			URL entry = bundle.getEntry(zippedRepoLocation);

+			repoFile = new File(systemTmpDir + File.separator + repoName);

+			

+			// Delete repo if it already exists

+			GitUtil.deleteRepo(repoFile);

+			

+			// Unzip repository to temp directory

+			GitUtil.unzipRepo(entry, systemTmpDir, new NullProgressMonitor());

+			

+			project = GitUtil.importProjectFromRepo(repoFile, projectName + File.separator + ".project");

+			

+			// Connect eclipse project to egit repository

+			File gitDir = new File(repoFile, Constants.DOT_GIT);

+			repository = Activator.getDefault().getRepositoryCache().lookupRepository(gitDir);

+			ConnectProviderOperation op = new ConnectProviderOperation(project, repository.getDirectory());

+			op.execute(null);

+			

+			final IFile model = project.getFile(new Path(modelName));

+			final String fullPath = model.getFullPath().toString();

+			final Subscriber subscriber = GitUtil.createSubscriberForComparison(repository, MASTER, MODIFIED, model, disposers);

+			final IStorageProviderAccessor accessor = new SubscriberStorageAccessor(subscriber);

+			final IStorageProvider sourceProvider = accessor.getStorageProvider(model,

+					IStorageProviderAccessor.DiffSide.SOURCE);

+			final IStorageProvider remoteProvider = accessor.getStorageProvider(model,

+					IStorageProviderAccessor.DiffSide.REMOTE);

+			final IStorageProvider ancestorProvider = accessor.getStorageProvider(model,

+					IStorageProviderAccessor.DiffSide.ORIGIN);

+			assertNotNull(sourceProvider);

+			assertNotNull(remoteProvider);

+			assertNotNull(ancestorProvider);

+

+			final IProgressMonitor m = new NullProgressMonitor();

+			final IStorageProviderAccessor storageAccessor = new SubscriberStorageAccessor(subscriber);

+			final ITypedElement left = new StorageTypedElement(sourceProvider.getStorage(m), fullPath);

+			final ITypedElement right = new StorageTypedElement(remoteProvider.getStorage(m), fullPath);

+			final ITypedElement origin = new StorageTypedElement(ancestorProvider.getStorage(m), fullPath);

+			final ComparisonScopeBuilder scopeBuilder = new ComparisonScopeBuilder(new ThreadedModelResolver(),

+					new IdenticalResourceMinimizer(), storageAccessor);

+			scope = scopeBuilder.build(left, right, origin, m);

+

+			resourceSets.add((ResourceSet)scope.getLeft());

+			resourceSets.add((ResourceSet)scope.getRight());

+			resourceSets.add((ResourceSet)scope.getOrigin());

+			

+		} catch (IOException e) {

+			e.printStackTrace();

+		} catch (CoreException e) {

+			e.printStackTrace();

+		}

+	}

+	

+	public Comparison match() {

+		return match(UseIdentifiers.ONLY);

+	}

+	

+	public Comparison match(UseIdentifiers useIDs) {

+		final IMatchEngine matchEngine = DefaultMatchEngine.create(useIDs);

+		comparison = matchEngine.match(scope, new BasicMonitor());

+		return comparison;

+	}

+	

+	public Comparison diff() {

+		final IDiffProcessor diffBuilder = new DiffBuilder();

+		final IDiffEngine diffEngine = new DefaultDiffEngine(diffBuilder);

+		diffEngine.diff(comparison,  new BasicMonitor());

+		return comparison;

+	}

+	

+	public void req() {

+		final IReqEngine reqEngine = new DefaultReqEngine();

+		reqEngine.computeRequirements(comparison, new BasicMonitor());

+	}

+	

+	public void equi() {

+		final IEquiEngine equiEngine = new DefaultEquiEngine();

+		equiEngine.computeEquivalences(comparison, new BasicMonitor());

+	}

+	

+	public void conflict() {

+		final IConflictDetector conflictDetector = new DefaultConflictDetector();

+		conflictDetector.detect(comparison, new BasicMonitor());

+	}

+	

+	public void compare() {

+		EMFCompare.builder().build().compare(scope);

+	}

+	

+	public void postComparisonGMF() {

+		final IPostProcessor postProcessor = new CompareDiagramPostProcessor();

+		postProcessor.postComparison(comparison, new BasicMonitor());

+	}

+	

+	public void postMatchUML() {

+		final IPostProcessor postProcessor = new UMLPostProcessor();

+		postProcessor.postMatch(comparison, new BasicMonitor());

+	}

+	

+	public void postComparisonUML() {

+		final IPostProcessor postProcessor = new UMLPostProcessor();

+		postProcessor.postComparison(comparison, new BasicMonitor());

+	}

+	

+	public void dispose() {

+		comparison = null;

+		for (ResourceSet rs : resourceSets) {

+			EList<Resource> resources = rs.getResources();

+			for (Resource resource : resources) {

+				TreeIterator<EObject> allContents = EcoreUtil.getAllProperContents(resource, false);

+				while (allContents.hasNext()) {

+					final EObject next = allContents.next();

+					next.eAdapters().clear();

+				}

+				resource.eAdapters().clear();

+			}

+			

+			rs.getResources().clear();

+			rs.eAdapters().clear();

+		}

+		

+		

+		resourceSets = null;

+		

+		try {

+			// Close & delete project from workspace

+			project.close(new NullProgressMonitor());

+			project.delete(false, new NullProgressMonitor());

+		} catch (CoreException e) {

+			System.out.println(e);

+		}

+

+		if (repository != null) {

+			repository.close();

+			repository = null;

+		}

+		for (Runnable disposer : disposers) {

+			disposer.run();

+		}

+		disposers.clear();

+		

+		// Delete repository from temp directory

+		GitUtil.deleteRepo(repoFile);

+	}

+}

diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java
new file mode 100644
index 000000000..83bc0ca25
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package data.models;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+public class NominalGitInputData extends DataGit {
+
+	public NominalGitInputData() {
+		super("src/data/models/git/model_size_nominal_repo.zip", "model_size_nominal_repo", "model_size_nominal_git", "model.uml");
+	}
+}
\ No newline at end of file
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java
new file mode 100644
index 000000000..2cfd0a134
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package data.models;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+public class SmallGitInputData extends DataGit {
+
+	public SmallGitInputData() {
+		super("src/data/models/git/model_size_small_repo.zip", "model_size_small_repo", "model_small_size_git", "model.uml");
+	}
+}
\ No newline at end of file
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_nominal_repo.zip b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_nominal_repo.zip
new file mode 100644
index 000000000..1e735e2da
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_nominal_repo.zip
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_small_repo.zip b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_small_repo.zip
new file mode 100644
index 000000000..18f9d3224
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_small_repo.zip
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
index 575ec6830..5e2f71424 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java
@@ -22,6 +22,7 @@ import java.text.NumberFormat;
 import java.text.SimpleDateFormat;
 import java.util.Collection;
 import java.util.Date;
+import java.util.Formatter;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map.Entry;
@@ -38,6 +39,7 @@ import org.junit.BeforeClass;
 
 import com.google.common.base.Function;
 import com.google.common.base.Joiner;
+import com.google.common.base.Strings;
 import com.google.common.base.Throwables;
 import com.google.common.collect.ImmutableListMultimap;
 import com.google.common.collect.Iterables;
@@ -53,7 +55,6 @@ import fr.obeo.performance.PerformancePackage;
 import fr.obeo.performance.Scenario;
 import fr.obeo.performance.TestResult;
 import fr.obeo.performance.api.Performance;
-
 import static com.google.common.collect.Iterables.concat;
 import static com.google.common.collect.Iterables.getFirst;
 import static com.google.common.collect.Iterables.transform;
@@ -171,9 +172,15 @@ public abstract class AbstractEMFComparePerformanceTest {
 			try {
 				writer = new PrintWriter(new BufferedWriter(new FileWriter(output, true), 16384));
 				BufferedReader br = new BufferedReader(new FileReader(output));
-				if (br.readLine() == null) {
+				String readLine = br.readLine();
+				final int columns;
+				if (readLine == null) {
 					br.close();
-					writer.println("Date, Large UML, Large Split UML");
+					writer.println("Date, Small UML, Nominal UML, Small Split UML, Nominal Split UML");
+					columns = 4;
+				} else {
+					//Get number of columns that contains measures
+					columns = readLine.split(",").length - 1;
 				}
 				writer.print(timestamp + ",");
 				Collection<Measure> measures = entry.getValue();
@@ -202,12 +209,13 @@ public abstract class AbstractEMFComparePerformanceTest {
 												return "";
 											}
 										});
-	
+									
 									String ret = Joiner.on(';').join(transform2);
 									return ret;
 								}
 							})
 						);
+				joinedMeasure = fillEmptyColumns(joinedMeasure, columns);
 				writer.println(joinedMeasure);
 				
 			} catch (IOException e) {
@@ -223,6 +231,14 @@ public abstract class AbstractEMFComparePerformanceTest {
 		performance = null;
 	}
 	
+	private static String fillEmptyColumns(String joinedMeasure, int columns) {
+		final int filled = joinedMeasure.split(",").length;
+		for (int i = 0; i < columns - filled; i++) {
+			joinedMeasure += ",";
+		}
+		return joinedMeasure;
+	}
+
 	@After
 	public void after() {
 		// try to minimize difference between runs
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java
new file mode 100644
index 000000000..f7528ffe4
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2015 Obeo. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse
+ * Public License v1.0 which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors: Obeo - initial API and implementation
+ */
+package org.eclipse.emf.compare.tests.performance;
+
+import org.eclipse.emf.compare.tests.performance.git.TestGitCompare;
+import org.eclipse.emf.compare.tests.performance.git.TestGitConflict;
+import org.eclipse.emf.compare.tests.performance.git.TestGitDiff;
+import org.eclipse.emf.compare.tests.performance.git.TestGitEqui;
+import org.eclipse.emf.compare.tests.performance.git.TestGitMatchContent;
+import org.eclipse.emf.compare.tests.performance.git.TestGitMatchId;
+import org.eclipse.emf.compare.tests.performance.git.TestGitPostComparisonUML;
+import org.eclipse.emf.compare.tests.performance.git.TestGitPostMatchUML;
+import org.eclipse.emf.compare.tests.performance.git.TestGitReq;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+	TestGitMatchId.class,
+	TestGitMatchContent.class,
+	TestGitDiff.class,
+	TestGitReq.class,
+	TestGitEqui.class,
+	TestGitConflict.class,
+	TestGitCompare.class,
+	TestGitPostMatchUML.class,
+	TestGitPostComparisonUML.class,
+})
+public class PerformanceGitSuite {
+   
+
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java
new file mode 100644
index 000000000..72eecf762
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java
@@ -0,0 +1,225 @@
+/*******************************************************************************

+ * Copyright (c) 2015 Obeo.

+ * All rights reserved. This program and the accompanying materials

+ * are made available under the terms of the Eclipse Public License v1.0

+ * which accompanies this distribution, and is available at

+ * http://www.eclipse.org/legal/epl-v10.html

+ * 

+ * Contributors:

+ *     Obeo - initial API and implementation

+ *******************************************************************************/

+package org.eclipse.emf.compare.tests.performance.git;

+

+import java.io.File;

+import java.io.FileOutputStream;

+import java.io.IOException;

+import java.io.OutputStream;

+import java.net.URL;

+import java.util.LinkedHashSet;

+import java.util.List;

+import java.util.Set;

+import java.util.zip.ZipEntry;

+import java.util.zip.ZipInputStream;

+

+import org.eclipse.core.resources.IFile;

+import org.eclipse.core.resources.IProject;

+import org.eclipse.core.resources.IProjectDescription;

+import org.eclipse.core.resources.IResource;

+import org.eclipse.core.resources.ResourcesPlugin;

+import org.eclipse.core.resources.mapping.IModelProviderDescriptor;

+import org.eclipse.core.resources.mapping.ModelProvider;

+import org.eclipse.core.resources.mapping.RemoteResourceMappingContext;

+import org.eclipse.core.resources.mapping.ResourceMapping;

+import org.eclipse.core.resources.mapping.ResourceMappingContext;

+import org.eclipse.core.runtime.CoreException;

+import org.eclipse.core.runtime.IProgressMonitor;

+import org.eclipse.core.runtime.NullProgressMonitor;

+import org.eclipse.core.runtime.Path;

+import org.eclipse.egit.core.Activator;

+import org.eclipse.egit.core.synchronize.GitResourceVariantTreeSubscriber;

+import org.eclipse.egit.core.synchronize.GitSubscriberMergeContext;

+import org.eclipse.egit.core.synchronize.GitSubscriberResourceMappingContext;

+import org.eclipse.egit.core.synchronize.dto.GitSynchronizeData;

+import org.eclipse.egit.core.synchronize.dto.GitSynchronizeDataSet;

+import org.eclipse.jgit.lib.Repository;

+import org.eclipse.team.core.subscribers.Subscriber;

+import org.eclipse.team.core.subscribers.SubscriberScopeManager;

+

+/**

+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>

+ *

+ */

+@SuppressWarnings("restriction")

+public final class GitUtil {

+

+	/**

+	 * This will unzip the repository contained in the given zip location in the given destination.

+	 * 

+	 * @param zipLocation

+	 *            the zip (that contains the repository) location.

+	 * @param destination

+	 *            the destination

+	 * @param monitor

+	 *            {@link IProgressMonitor} that will be used to monitor the operation.

+	 */

+	public static void unzipRepo(URL zipLocation, String destination, IProgressMonitor monitor) {

+

+		try {

+			final ZipInputStream zipFileStream = new ZipInputStream(zipLocation.openStream());

+			ZipEntry zipEntry = zipFileStream.getNextEntry();

+

+			while (zipEntry != null) {

+				// We will construct the new file but we will strip off the project

+				// directory from the beginning of the path because we have already

+				// created the destination project for this zip.

+				final File file = new File(destination, zipEntry.getName());

+

+				if (!zipEntry.isDirectory()) {

+

+					/*

+					 * Copy files (and make sure parent directory exist)

+					 */

+					final File parentFile = file.getParentFile();

+					if (null != parentFile && !parentFile.exists()) {

+						parentFile.mkdirs();

+					}

+

+					OutputStream os = null;

+

+					try {

+						os = new FileOutputStream(file);

+

+						final int bufferSize = 102400;

+						final byte[] buffer = new byte[bufferSize];

+						while (true) {

+							final int len = zipFileStream.read(buffer);

+							if (zipFileStream.available() == 0) {

+								break;

+							}

+							os.write(buffer, 0, len);

+						}

+					} finally {

+						if (null != os) {

+							os.close();

+						}

+					}

+				}

+

+				zipFileStream.closeEntry();

+				zipEntry = zipFileStream.getNextEntry();

+			}

+		} catch (final IOException e) {

+			System.out.println(e);

+		}

+	}

+	

+	/**

+	 * Delete the repository (and all files contained in).

+	 * 

+	 * @param repository

+	 *             the File representing the repository.

+	 */

+	public static void deleteRepo(File repository) {

+		if (repository.exists()) {

+			File[] files = repository.listFiles();

+			if (null != files) {

+				for (int i=0; i < files.length; i++) {

+					if (files[i].isDirectory()) {

+						deleteRepo(files[i]);

+					} else {

+						files[i].delete();

+					}

+				}

+			}

+			repository.delete();

+		}

+	}

+	

+	/**

+	 * Import the project from the given repository.

+	 * 

+	 * @param repository

+	 *            the given repository.

+	 * @param projectFilePath

+	 *            the path containing the project in the repository.

+	 * @return the imported project, or null if import step fails.

+	 */

+	public static IProject importProjectFromRepo(File repository, String projectFilePath) {

+		try {

+			IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(repository.getPath() + File.separator + projectFilePath));

+			IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());

+			project.create(description, new NullProgressMonitor());

+			project.open(new NullProgressMonitor());

+			return project;

+		} catch (CoreException e) {

+			System.out.println(e);

+		}

+		return null;

+	}

+	

+	/**

+	 * Simulate a comparison between the two given references and returns back the subscriber that can provide

+	 * all computed synchronization information.

+	 * 

+	 * @param sourceRef

+	 *            Source reference (i.e. "left" side of the comparison).

+	 * @param targetRef

+	 *            Target reference (i.e. "right" side of the comparison).

+	 * @param comparedFile

+	 *            The file we are comparing (that would be the file right-clicked into the workspace).

+	 * @return The created subscriber.

+	 */

+	public static Subscriber createSubscriberForComparison(Repository repository, String sourceRef, String targetRef, IFile comparedFile, List<Runnable> disposers)

+			throws IOException {

+		final GitSynchronizeData data = new GitSynchronizeData(repository, sourceRef, targetRef, false);

+		final GitSynchronizeDataSet dataSet = new GitSynchronizeDataSet(data);

+		final ResourceMapping[] mappings = getResourceMappings(comparedFile);

+		final GitResourceVariantTreeSubscriber subscriber = new GitResourceVariantTreeSubscriber(dataSet);

+		subscriber.init(new NullProgressMonitor());

+

+		final RemoteResourceMappingContext remoteContext = new GitSubscriberResourceMappingContext(

+				subscriber, dataSet);

+		final SubscriberScopeManager manager = new SubscriberScopeManager(subscriber.getName(), mappings,

+				subscriber, remoteContext, true);

+		final GitSubscriberMergeContext context = new GitSubscriberMergeContext(subscriber, manager, dataSet);

+		disposers.add(new Runnable() {

+			public void run() {

+				manager.dispose();

+				context.dispose();

+				subscriber.dispose();

+			}

+		});

+		return context.getSubscriber();

+	}

+	

+	/**

+	 * This will query all model providers for those that are enabled on the given file and list all mappings

+	 * available for that file.

+	 * 

+	 * @param file

+	 *            The file for which we need the associated resource mappings.

+	 * @return All mappings available for that file.

+	 */

+	private static ResourceMapping[] getResourceMappings(IFile file) {

+		final IModelProviderDescriptor[] modelDescriptors = ModelProvider.getModelProviderDescriptors();

+

+		final Set<ResourceMapping> mappings = new LinkedHashSet<ResourceMapping>();

+		for (IModelProviderDescriptor candidate : modelDescriptors) {

+			try {

+				final IResource[] resources = candidate.getMatchingResources(new IResource[] {file, });

+				if (resources.length > 0) {

+					// get mappings from model provider if there are matching resources

+					final ModelProvider model = candidate.getModelProvider();

+					final ResourceMapping[] modelMappings = model.getMappings(file,

+							ResourceMappingContext.LOCAL_CONTEXT, null);

+					for (ResourceMapping mapping : modelMappings) {

+						mappings.add(mapping);

+					}

+				}

+			} catch (CoreException e) {

+				Activator.logError(e.getMessage(), e);

+			}

+		}

+		return mappings.toArray(new ResourceMapping[mappings.size()]);

+	}

+}

diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java
new file mode 100644
index 000000000..54479f5d2
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestCompare;
+import org.eclipse.emf.compare.utils.UseIdentifiers;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitCompare extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestCompare.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.match(UseIdentifiers.NEVER);
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.match(UseIdentifiers.NEVER);
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java
new file mode 100644
index 000000000..71df7df68
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestConflict;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitConflict extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestConflict.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		data.match();
+		data.diff();
+		data.req();
+		data.equi();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.conflict();
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		data.match();
+		data.diff();
+		data.req();
+		data.equi();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.conflict();
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java
new file mode 100644
index 000000000..934be8b15
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestDiff;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitDiff extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestDiff.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		data.match();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.diff();
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		data.match();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.diff();
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java
new file mode 100644
index 000000000..44c22ec29
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestEqui;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitEqui extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestEqui.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		data.match();
+		data.diff();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.equi();
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		data.match();
+		data.diff();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.equi();
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java
new file mode 100644
index 000000000..89efaeb4d
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestMatchContent;
+import org.eclipse.emf.compare.utils.UseIdentifiers;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitMatchContent extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestMatchContent.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.match(UseIdentifiers.NEVER);
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.match(UseIdentifiers.NEVER);
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java
new file mode 100644
index 000000000..799fe7a13
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestMatchId;
+import org.eclipse.emf.compare.utils.UseIdentifiers;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitMatchId extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestMatchId.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.match(UseIdentifiers.ONLY);
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.match(UseIdentifiers.ONLY);
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java
new file mode 100644
index 000000000..1a4f58b86
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java
@@ -0,0 +1,86 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestPostComparisonGMF;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestPostComparisonGMF.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		data.match();
+		data.diff();
+		data.req();
+		data.equi();
+		data.conflict();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.postComparisonGMF();
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		data.match();
+		data.diff();
+		data.req();
+		data.equi();
+		data.conflict();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.postComparisonGMF();
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java
new file mode 100644
index 000000000..eeacc5021
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestPostComparisonUML;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestPostComparisonUML.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		data.match();
+		data.postMatchUML();
+		data.diff();
+		data.req();
+		data.equi();
+		data.conflict();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.postComparisonUML();
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		data.match();
+		data.postMatchUML();
+		data.diff();
+		data.req();
+		data.equi();
+		data.conflict();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.postComparisonUML();
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java
new file mode 100644
index 000000000..1dedad97b
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java
@@ -0,0 +1,78 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestPostComparisonGMF;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestPostComparisonGMF.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		data.match();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.postMatchUML();
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		data.match();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.postMatchUML();
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java
new file mode 100644
index 000000000..5269b3a8f
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2015 Obeo.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ * 
+ * Contributors:
+ *     Obeo - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.emf.compare.tests.performance.git;
+
+import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestReq;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.intro.IIntroManager;
+import org.eclipse.ui.intro.IIntroPart;
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import data.models.DataGit;
+import data.models.NominalGitInputData;
+import data.models.SmallGitInputData;
+import fr.obeo.performance.api.PerformanceMonitor;
+
+/**
+ * @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
+ *
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGitReq extends AbstractEMFComparePerformanceTest {
+
+	/** 
+	 * {@inheritDoc}
+	 * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName()
+	 */
+	@Override
+	protected void setSUTName() {
+		getPerformance().getSystemUnderTest().setName(TestReq.class.getSimpleName());
+	}
+
+	@Test
+	public void a_matchIdUMLSmall() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmall");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new SmallGitInputData();
+		data.match();
+		data.diff();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.req();
+			}
+		});
+		data.dispose();
+	}
+	
+	@Test
+	public void b_matchIdUMLNominal() {
+		PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominal");
+		
+		final IIntroManager introManager = PlatformUI.getWorkbench().getIntroManager();
+		IIntroPart part = introManager.getIntro();
+		introManager.closeIntro(part);
+		
+		final DataGit data = new NominalGitInputData();
+		data.match();
+		data.diff();
+		monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+			public void run() {
+				data.req();
+			}
+		});
+		data.dispose();
+	}
+}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java
index 3a77a7ddd..19c8a2e71 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;
 
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestCompare;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -34,7 +35,7 @@ public class TestLargeCompare extends AbstractEMFComparePerformanceTest {
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargeCompare.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestCompare.class.getSimpleName());
 	}
 	
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java
index 37a61ab3f..9c1ec5f0f 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;

 

 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;

+import org.eclipse.emf.compare.tests.performance.TestConflict;

 import org.junit.FixMethodOrder;

 import org.junit.Test;

 import org.junit.runners.MethodSorters;

@@ -34,7 +35,7 @@ public class TestLargeConflict extends AbstractEMFComparePerformanceTest {
 	 */

 	@Override

 	protected void setSUTName() {

-		getPerformance().getSystemUnderTest().setName(TestLargeConflict.class.getSimpleName());

+		getPerformance().getSystemUnderTest().setName(TestConflict.class.getSimpleName());

 	}

 	

 	@Test

diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java
index 0bddf6eba..b3bf00e1f 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;
 
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestDiff;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -35,7 +36,7 @@ public class TestLargeDiff extends AbstractEMFComparePerformanceTest {
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargeDiff.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestDiff.class.getSimpleName());
 	}
 	
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java
index f015b49dc..575f3b99b 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;

 

 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;

+import org.eclipse.emf.compare.tests.performance.TestEqui;

 import org.junit.FixMethodOrder;

 import org.junit.Test;

 import org.junit.runners.MethodSorters;

@@ -34,7 +35,7 @@ public class TestLargeEqui extends AbstractEMFComparePerformanceTest {
 	 */

 	@Override

 	protected void setSUTName() {

-		getPerformance().getSystemUnderTest().setName(TestLargeEqui.class.getSimpleName());

+		getPerformance().getSystemUnderTest().setName(TestEqui.class.getSimpleName());

 	}

 	

 	@Test

diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java
index 3de1085f0..db6f6a011 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java
@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestLogicalModel;
 import org.eclipse.emf.ecore.resource.Resource;
 import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.junit.Assert;
@@ -51,7 +52,7 @@ public class TestLargeLogicalModel extends AbstractEMFComparePerformanceTest {
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargeLogicalModel.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestLogicalModel.class.getSimpleName());
 	}
 	
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java
index c3e57d8d0..8d04ebd2e 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;
 
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestMatchContent;
 import org.eclipse.emf.compare.utils.UseIdentifiers;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -35,7 +36,7 @@ public class TestLargeMatchContent extends AbstractEMFComparePerformanceTest {
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargeMatchContent.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestMatchContent.class.getSimpleName());
 	}
 
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java
index 442265b04..cf36a20e8 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java
@@ -11,6 +11,7 @@
 package org.eclipse.emf.compare.tests.performance.large;
 
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestMatchId;
 import org.eclipse.emf.compare.utils.UseIdentifiers;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
@@ -33,7 +34,7 @@ public class TestLargeMatchId extends AbstractEMFComparePerformanceTest {
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargeMatchId.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestMatchId.class.getSimpleName());
 	}
 	
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java
index d3cdba19c..0dee65fad 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;
 
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestPostComparisonGMF;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -34,7 +35,7 @@ public class TestLargePostComparisonGMF extends AbstractEMFComparePerformanceTes
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargePostComparisonGMF.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestPostComparisonGMF.class.getSimpleName());
 	}
 
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java
index 4de401ec0..795594478 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;
 
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestPostComparisonUML;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -34,7 +35,7 @@ public class TestLargePostComparisonUML extends AbstractEMFComparePerformanceTes
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargePostComparisonUML.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestPostComparisonUML.class.getSimpleName());
 	}
 	
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java
index c884eec7e..4ddc6d526 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;
 
 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;
+import org.eclipse.emf.compare.tests.performance.TestPostMatchUML;
 import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
@@ -34,7 +35,7 @@ public class TestLargePostMatchUML extends AbstractEMFComparePerformanceTest {
 	 */
 	@Override
 	protected void setSUTName() {
-		getPerformance().getSystemUnderTest().setName(TestLargePostMatchUML.class.getSimpleName());
+		getPerformance().getSystemUnderTest().setName(TestPostMatchUML.class.getSimpleName());
 	}
 	
 	@Test
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java
index b7a17728b..f731c8ef0 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java
@@ -13,6 +13,7 @@ package org.eclipse.emf.compare.tests.performance.large;
 import java.io.IOException;

 

 import org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest;

+import org.eclipse.emf.compare.tests.performance.TestReq;

 import org.junit.FixMethodOrder;

 import org.junit.Test;

 import org.junit.runners.MethodSorters;

@@ -34,7 +35,7 @@ public class TestLargeReq extends AbstractEMFComparePerformanceTest {
 	 */

 	@Override

 	protected void setSUTName() {

-		getPerformance().getSystemUnderTest().setName(TestLargeReq.class.getSimpleName());

+		getPerformance().getSystemUnderTest().setName(TestReq.class.getSimpleName());

 	}

 	

 	@Test