Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-01-26 12:33:58 -0500
committerAxel Richard2015-01-26 12:35:10 -0500
commitfcf564b30b564fa35ca655fbcb950bbde1cb73e5 (patch)
tree26c85e8bb4c38c2f5a1f682ed273cd4134b0e728 /performance
parent7583c40b6713eeca198f5bd9b44485efb974ae41 (diff)
downloadorg.eclipse.emf.compare-fcf564b30b564fa35ca655fbcb950bbde1cb73e5.tar.gz
org.eclipse.emf.compare-fcf564b30b564fa35ca655fbcb950bbde1cb73e5.tar.xz
org.eclipse.emf.compare-fcf564b30b564fa35ca655fbcb950bbde1cb73e5.zip
Add small split uml models to git performances tests
Change-Id: I47bab87506f6ec352a1b3e16116bcbe6d8a58a48 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Diffstat (limited to 'performance')
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java29
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java22
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_small_split_repo.zipbin0 -> 707641 bytes
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java77
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java14
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java15
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java16
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java14
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java14
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java19
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java20
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java15
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java16
14 files changed, 273 insertions, 16 deletions
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
index 8dc1870eb..d3277e05f 100644
--- 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
@@ -17,18 +17,19 @@ import java.io.File;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
+import java.util.Collection;
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.resources.ResourcesPlugin;
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;
@@ -68,6 +69,8 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.team.core.subscribers.Subscriber;
import org.osgi.framework.Bundle;
+import com.google.common.base.Throwables;
+
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
*
@@ -87,14 +90,14 @@ public class DataGit {
private Comparison comparison;
- private IProject project;
+ private IProject rootProject;
private File repoFile;
private Repository repository;
- public DataGit(String zippedRepoLocation, String repoName, String projectName, String modelName) {
+ public DataGit(String zippedRepoLocation, String repoName, String rootProjectName, String modelName) {
try {
this.disposers = new ArrayList<Runnable>();
String systemTmpDir = System.getProperty("java.io.tmpdir");
@@ -108,15 +111,17 @@ public class DataGit {
// Unzip repository to temp directory
GitUtil.unzipRepo(entry, systemTmpDir, new NullProgressMonitor());
- project = GitUtil.importProjectFromRepo(repoFile, projectName + File.separator + ".project");
+ // Import projects into workspace from the repository
+ Collection<IProject> importedProjects = GitUtil.importProjectsFromRepo(repoFile);
- // Connect eclipse project to egit repository
+ // Connect eclipse projects 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);
+ GitUtil.connectProjectsToRepo(repository, importedProjects);
+
+ rootProject = ResourcesPlugin.getWorkspace().getRoot().getProject(rootProjectName);
- final IFile model = project.getFile(new Path(modelName));
+ final IFile model = rootProject.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);
@@ -144,9 +149,9 @@ public class DataGit {
resourceSets.add((ResourceSet)scope.getOrigin());
} catch (IOException e) {
- e.printStackTrace();
+ Throwables.propagate(e);
} catch (CoreException e) {
- e.printStackTrace();
+ Throwables.propagate(e);
}
}
@@ -223,8 +228,8 @@ public class DataGit {
try {
// Close & delete project from workspace
- project.close(new NullProgressMonitor());
- project.delete(false, new NullProgressMonitor());
+ rootProject.close(new NullProgressMonitor());
+ rootProject.delete(false, new NullProgressMonitor());
} catch (CoreException e) {
System.out.println(e);
}
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java
new file mode 100644
index 000000000..ca1a413cd
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.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 SmallSplitGitInputData extends DataGit {
+
+ public SmallSplitGitInputData() {
+ super("src/data/models/git/model_size_small_split_repo.zip", "model_size_small_split_repo", "model_small_size_split_git_model", "model.uml");
+ }
+} \ No newline at end of file
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_small_split_repo.zip b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_small_split_repo.zip
new file mode 100644
index 000000000..d1d070dc9
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_small_split_repo.zip
Binary files differ
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
index 72eecf762..149fc0ce7 100644
--- 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
@@ -15,6 +15,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URL;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
@@ -35,7 +37,7 @@ 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.op.ConnectProviderOperation;
import org.eclipse.egit.core.synchronize.GitResourceVariantTreeSubscriber;
import org.eclipse.egit.core.synchronize.GitSubscriberMergeContext;
import org.eclipse.egit.core.synchronize.GitSubscriberResourceMappingContext;
@@ -45,6 +47,8 @@ import org.eclipse.jgit.lib.Repository;
import org.eclipse.team.core.subscribers.Subscriber;
import org.eclipse.team.core.subscribers.SubscriberScopeManager;
+import com.google.common.base.Throwables;
+
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
*
@@ -109,7 +113,7 @@ public final class GitUtil {
zipEntry = zipFileStream.getNextEntry();
}
} catch (final IOException e) {
- System.out.println(e);
+ Throwables.propagate(e);
}
}
@@ -150,14 +154,79 @@ public final class GitUtil {
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);
+ Throwables.propagate(e);
}
return null;
}
/**
+ * Import all projects contain in the given repository.
+ *
+ * @param repository
+ * the given repository.
+ */
+ public static Collection<IProject> importProjectsFromRepo(File repository) {
+ Collection<IProject> projects = new ArrayList<IProject>();
+ try {
+ Collection<File> projectsFromRepo = getProjectsFromRepo(repository);
+ for (File file : projectsFromRepo) {
+ IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(file.getPath()));
+ IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName());
+ project.create(description, new NullProgressMonitor());
+ project.open(new NullProgressMonitor());
+ projects.add(project);
+ }
+ } catch (CoreException e) {
+ Throwables.propagate(e);
+ }
+ return projects;
+ }
+
+ /**
+ * Get the ".projects" files from the given repository.
+ * @param repository
+ * the given repository.
+ * @return the ".projects" files from the given repository.
+ */
+ public static Collection<File> getProjectsFromRepo(File repository) {
+ List<File> projects = new ArrayList<File>();
+ if (repository.exists()) {
+ File[] files = repository.listFiles();
+ if (null != files) {
+ for (int i=0; i < files.length; i++) {
+ if (files[i].isDirectory()) {
+ projects.addAll(getProjectsFromRepo(files[i]));
+ } else if (files[i].getName().endsWith(IProjectDescription.DESCRIPTION_FILE_NAME)) {
+ projects.add(files[i]);
+ }
+ }
+ }
+ }
+ return projects;
+ }
+
+ /**
+ * Connect given projects to the given repository.
+ * @param repository
+ * the given repository.
+ * @param projects
+ * the given projects.
+ */
+ public static void connectProjectsToRepo(Repository repository, Collection<IProject> projects) {
+ for (IProject project : projects) {
+ try {
+ ConnectProviderOperation op = new ConnectProviderOperation(project, repository.getDirectory());
+ op.execute(new NullProgressMonitor());
+ } catch (CoreException e) {
+ Throwables.propagate(e);
+ }
+ }
+ }
+
+ /**
* Simulate a comparison between the two given references and returns back the subscriber that can provide
* all computed synchronization information.
*
@@ -217,7 +286,7 @@ public final class GitUtil {
}
}
} catch (CoreException e) {
- Activator.logError(e.getMessage(), e);
+ Throwables.propagate(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
index 796e22f51..32f988020 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -62,4 +63,17 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+ public void run() {
+ data.compare();
+ }
+ });
+ 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
index a7f9d0379..3bd852da3 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -70,4 +71,21 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index 87a209208..a622fb899 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -64,4 +65,18 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index 6ed91cf22..3b92d7751 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -66,4 +67,19 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index 019fe8f6f..902dedcef 100644
--- 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
@@ -20,6 +20,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -63,4 +64,17 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index 718c04edb..1d1d50148 100644
--- 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
@@ -20,6 +20,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -63,4 +64,17 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index 1241e562b..43259e2e1 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -72,4 +73,22 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index 71c65d59b..8f9f0077d 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -74,4 +75,23 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index e47779df5..7a2b7b5cd 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -64,4 +65,18 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ 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
index 624786391..946061659 100644
--- 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
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.NominalGitInputData;
import data.models.SmallGitInputData;
+import data.models.SmallSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -66,4 +67,19 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void c_matchIdUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmallSplit");
+
+ final DataGit data = new SmallSplitGitInputData();
+ data.match();
+ data.diff();
+ monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+ public void run() {
+ data.req();
+ }
+ });
+ data.dispose();
+ }
}

Back to the top