Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Richard2015-01-27 10:49:03 +0000
committerAxel Richard2015-01-27 10:49:03 +0000
commit9edffec1035f2701c13e60abdf1348360f66a256 (patch)
tree6dafe76655e62be25027fa33d8ea6b3a49a5deee
parentd75ea0d5c7b192ddffbd2c80b38abf05abc47141 (diff)
downloadorg.eclipse.emf.compare-9edffec1035f2701c13e60abdf1348360f66a256.tar.gz
org.eclipse.emf.compare-9edffec1035f2701c13e60abdf1348360f66a256.tar.xz
org.eclipse.emf.compare-9edffec1035f2701c13e60abdf1348360f66a256.zip
Add large split git uml models to performances tests
Change-Id: I3e62ec1c30b413f33ea63b46eabcd785b0fac0c8 Signed-off-by: Axel Richard <axel.richard@obeo.fr>
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java22
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_large_split_repo.zipbin0 -> 11291951 bytes
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java16
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java20
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java17
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java18
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java16
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java14
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java21
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java22
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java17
-rw-r--r--performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java18
12 files changed, 192 insertions, 9 deletions
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java
new file mode 100644
index 000000000..fb5db4ce5
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.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 LargeSplitGitInputData extends DataGit {
+
+ public LargeSplitGitInputData() {
+ super("src/data/models/git/model_size_large_split_repo.zip", "model_size_large_split_repo", "model_size_large_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_large_split_repo.zip b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_large_split_repo.zip
new file mode 100644
index 000000000..f24beeebd
--- /dev/null
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/git/model_size_large_split_repo.zip
Binary files differ
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java
index 6c9770053..2c8ba7e1a 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest {
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_compareUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -48,4 +49,17 @@ public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void b_compareUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java
index d943b2d1a..3b662f33b 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest {
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_conflictUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -52,4 +53,21 @@ public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void b_conflictUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java
index 0388a0aba..365c1fd10 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest {
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_diffUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -49,4 +50,18 @@ public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void b_diffUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java
index 3efcec6c4..1badf86bd 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest {
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_equiUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -50,4 +51,19 @@ public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void b_equiUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java
index afbc25df1..4ed79e3d9 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -38,7 +39,7 @@ public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_matchContentUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -49,4 +50,17 @@ public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
+
+ @Test
+ public void b_matchContentUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java
index 6ada10f57..ded41c2dd 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java
@@ -19,6 +19,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -49,4 +50,17 @@ public class TestLargeGitMatchId extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void b_matchIdUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java
index 0bcf97c82..9055efc03 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformance
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_pcGMFUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -53,4 +54,22 @@ public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformance
});
data.dispose();
}
+
+ @Test
+ public void b_pcGMFUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java
index bf1e7dde6..c0642a0d4 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformance
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_pcUMLUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -54,4 +55,23 @@ public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformance
});
data.dispose();
}
+
+ @Test
+ public void b_pcUMLUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java
index 9115d41c8..c3f5ee4de 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_pmUMLUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -49,4 +50,18 @@ public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest
});
data.dispose();
}
+
+ @Test
+ public void b_pmUMLUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ 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/large/TestLargeGitReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java
index 0e1b0716c..e44937358 100644
--- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java
+++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java
@@ -18,6 +18,7 @@ import org.junit.runners.MethodSorters;
import data.models.DataGit;
import data.models.LargeGitInputData;
+import data.models.LargeSplitGitInputData;
import fr.obeo.performance.api.PerformanceMonitor;
/**
@@ -37,7 +38,7 @@ public class TestLargeGitReq extends AbstractEMFComparePerformanceTest {
}
@Test
- public void a_matchIdUMLLarge() {
+ public void a_reqUMLLarge() {
PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLarge");
final DataGit data = new LargeGitInputData();
@@ -50,4 +51,19 @@ public class TestLargeGitReq extends AbstractEMFComparePerformanceTest {
});
data.dispose();
}
+
+ @Test
+ public void b_reqUMLLargeSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLargeSplit");
+
+ final DataGit data = new LargeSplitGitInputData();
+ data.match();
+ data.diff();
+ monitor.measure(warmup(), getStepsNumber(), new Runnable() {
+ public void run() {
+ data.req();
+ }
+ });
+ data.dispose();
+ }
}

Back to the top