diff options
author | Axel Richard | 2015-01-19 10:16:16 +0000 |
---|---|---|
committer | Axel Richard | 2015-01-19 10:16:16 +0000 |
commit | 28ae980395ca30ee65cba808e1d917c585745b32 (patch) | |
tree | 0644c8a356f1f238388af6ed536d2d924953f1b0 /performance | |
parent | c061425477ee4575665b7cc3e869a89a8937d41e (diff) | |
download | org.eclipse.emf.compare-28ae980395ca30ee65cba808e1d917c585745b32.tar.gz org.eclipse.emf.compare-28ae980395ca30ee65cba808e1d917c585745b32.tar.xz org.eclipse.emf.compare-28ae980395ca30ee65cba808e1d917c585745b32.zip |
Deactivate Large UML Models for performances tests
Change-Id: Ib48f9e4491418384ca901f5868d9c48c28ffdc06
Signed-off-by: Axel Richard <axel.richard@obeo.fr>
Diffstat (limited to 'performance')
12 files changed, 108 insertions, 108 deletions
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 f528c6de0..6f1a1029d 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 @@ -173,7 +173,7 @@ public abstract class AbstractEMFComparePerformanceTest { BufferedReader br = new BufferedReader(new FileReader(output)); if (br.readLine() == null) { br.close(); - writer.println("Date, Small UML, Nominal UML, Large UML, Small Split UML"); + writer.println("Date, Small UML, Nominal UML, Small Split UML, Nominal Split UML, Large UML, Large Split UML"); } writer.print(timestamp + ","); Collection<Measure> measures = entry.getValue(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java index cac62a881..72af4b8d3 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java @@ -64,9 +64,9 @@ public class TestCompare extends AbstractEMFComparePerformanceTest { } @Test - public void c_compareUMLLarge() throws IOException { - PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLarge"); - final Data data = new LargeInputData(); + public void c_compareUMLSmallSplit() { + PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmallSplit"); + final Data data = new SmallSplitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { data.compare(); @@ -75,10 +75,10 @@ public class TestCompare extends AbstractEMFComparePerformanceTest { data.dispose(); } - @Test - public void d_compareUMLSmallSplit() { - PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmallSplit"); - final Data data = new SmallSplitInputData(); +// @Test + public void d_compareUMLLarge() throws IOException { + PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLarge"); + final Data data = new LargeInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { data.compare(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java index 770c8ecac..8d9879466 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java @@ -72,9 +72,9 @@ public class TestConflict extends AbstractEMFComparePerformanceTest { }
@Test
- public void c_conflictUMLLarge() throws IOException {
- PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLarge");
- final Data data = new LargeInputData();
+ public void c_conflictUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmallSplit");
+ final Data data = new SmallSplitInputData();
data.match();
data.diff();
data.req();
@@ -86,11 +86,11 @@ public class TestConflict extends AbstractEMFComparePerformanceTest { });
data.dispose();
}
-
- @Test
- public void d_conflictUMLSmallSplit() {
- PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmallSplit");
- final Data data = new SmallSplitInputData();
+
+// @Test
+ public void d_conflictUMLLarge() throws IOException {
+ PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLarge");
+ final Data data = new LargeInputData();
data.match();
data.diff();
data.req();
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java index fdef99d37..6f29ffea9 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java @@ -67,9 +67,9 @@ public class TestDiff extends AbstractEMFComparePerformanceTest { } @Test - public void c_diffUMLLarge() throws IOException { - PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLarge"); - final Data data = new LargeInputData(); + public void c_diffUMLSmallSplit() { + PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmallSplit"); + final Data data = new SmallSplitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -79,10 +79,10 @@ public class TestDiff extends AbstractEMFComparePerformanceTest { data.dispose(); } - @Test - public void d_diffUMLSmallSplit() { - PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmallSplit"); - final Data data = new SmallSplitInputData(); +// @Test + public void d_diffUMLLarge() throws IOException { + PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLarge"); + final Data data = new LargeInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java index 06a7f8ebb..6fccd92aa 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java @@ -68,9 +68,9 @@ public class TestEqui extends AbstractEMFComparePerformanceTest { }
@Test
- public void c_equiUMLLarge() throws IOException {
- PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLarge");
- final Data data = new LargeInputData();
+ public void c_equiUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmallSplit");
+ final Data data = new SmallSplitInputData();
data.match();
data.diff();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -80,11 +80,11 @@ public class TestEqui extends AbstractEMFComparePerformanceTest { });
data.dispose();
}
-
- @Test
- public void d_equiUMLSmallSplit() {
- PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmallSplit");
- final Data data = new SmallSplitInputData();
+
+// @Test
+ public void d_equiUMLLarge() throws IOException {
+ PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLarge");
+ final Data data = new LargeInputData();
data.match();
data.diff();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java index b57a1a606..9462a89a0 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java @@ -125,41 +125,9 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest { } } - @Test - public void c_logicalModelUMLLarge() { - try { - PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLLarge"); - final Data data = new SmallInputData(); - - Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); - URL entry = bundle.getEntry("src/data/models/model_size_large/.project"); - URL fileURL = FileLocator.toFileURL(entry); - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath())); - IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); - project.create(description, new NullProgressMonitor()); - project.open(new NullProgressMonitor()); - final IFile leftFile = project.getFile(new Path("original/model.uml")); - final IFile rightFile = project.getFile(new Path("modified/model.uml")); - final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); - final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); - - monitor.measure(false, getStepsNumber(), new Runnable() { - public void run() { - data.logicalModel(leftTypedElement, rightTypedElement); - } - }); - data.dispose(); - project.close(new NullProgressMonitor()); - project.delete(false, new NullProgressMonitor()); - } catch (Exception e) { - e.printStackTrace(); - Assert.fail(); - } - } - @SuppressWarnings("restriction") @Test - public void d_logicalModelUMLSmallSplit() { + public void c_logicalModelUMLSmallSplit() { try { PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLSmallSplit"); final Data data = new SmallSplitInputData(); @@ -200,7 +168,39 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest { Assert.fail(); } } - + +// @Test + public void d_logicalModelUMLLarge() { + try { + PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLLarge"); + final Data data = new SmallInputData(); + + Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); + URL entry = bundle.getEntry("src/data/models/model_size_large/.project"); + URL fileURL = FileLocator.toFileURL(entry); + IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath())); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); + project.create(description, new NullProgressMonitor()); + project.open(new NullProgressMonitor()); + final IFile leftFile = project.getFile(new Path("original/model.uml")); + final IFile rightFile = project.getFile(new Path("modified/model.uml")); + final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); + final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); + + monitor.measure(false, getStepsNumber(), new Runnable() { + public void run() { + data.logicalModel(leftTypedElement, rightTypedElement); + } + }); + data.dispose(); + project.close(new NullProgressMonitor()); + project.delete(false, new NullProgressMonitor()); + } catch (Exception e) { + e.printStackTrace(); + Assert.fail(); + } + } + private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet, String sourceProjectName, String projectName, final List<IProject> projects) throws IOException, CoreException { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java index 4f68ac696..f54768444 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java @@ -65,21 +65,21 @@ public class TestMatchContent extends AbstractEMFComparePerformanceTest { } @Test - public void c_matchContentUMLLarge() throws IOException { - PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLarge"); - final Data data = new LargeInputData(); + public void d_matchContentUMLSmallSplit() { + PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmallSplit"); + final Data data = new SmallSplitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { - //data.match(UseIdentifiers.NEVER); + data.match(UseIdentifiers.NEVER); } }); data.dispose(); } - @Test - public void d_matchContentUMLSmallSplit() { - PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmallSplit"); - final Data data = new SmallSplitInputData(); +// @Test + public void c_matchContentUMLLarge() throws IOException { + PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLarge"); + final Data data = new LargeInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { data.match(UseIdentifiers.NEVER); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java index f92c2354f..47f273d3d 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java @@ -63,9 +63,9 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest { } @Test - public void c_matchIdUMLLarge() { - PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLarge"); - final Data data = new LargeInputData(); + public void c_matchIdUMLSmallSplit() { + PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmallSplit"); + final Data data = new SmallSplitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { data.match(UseIdentifiers.ONLY); @@ -74,10 +74,10 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest { data.dispose(); } - @Test - public void d_matchIdUMLSmallSplit() { - PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmallSplit"); - final Data data = new SmallSplitInputData(); +// @Test + public void d_matchIdUMLLarge() { + PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLarge"); + final Data data = new LargeInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { data.match(UseIdentifiers.ONLY); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java index 11b8755f9..ce2ddf84e 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java @@ -74,9 +74,9 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest { } @Test - public void c_pcGMFUMLLarge() throws IOException { - PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLarge"); - final Data data = new LargeInputData(); + public void c_pcGMFUMLSmallSplit() { + PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmallSplit"); + final Data data = new SmallSplitInputData(); data.match(); data.diff(); data.req(); @@ -91,9 +91,9 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest { } @Test - public void d_pcGMFUMLSmallSplit() { - PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmallSplit"); - final Data data = new SmallSplitInputData(); + public void d_pcGMFUMLLarge() throws IOException { + PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLarge"); + final Data data = new LargeInputData(); data.match(); data.diff(); data.req(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java index 2c333498a..5e8e1d23a 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java @@ -76,9 +76,9 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest { } @Test - public void c_pcUMLUMLLarge() throws IOException { - PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLarge"); - final Data data = new LargeInputData(); + public void c_pcUMLUMLSmallSplit() { + PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmallSplit"); + final Data data = new SmallSplitInputData(); data.match(); data.postMatchUML(); data.diff(); @@ -93,10 +93,10 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest { data.dispose(); } - @Test - public void d_pcUMLUMLSmallSplit() { - PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmallSplit"); - final Data data = new SmallSplitInputData(); +// @Test + public void d_pcUMLUMLLarge() throws IOException { + PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLarge"); + final Data data = new LargeInputData(); data.match(); data.postMatchUML(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java index 9a879bfc2..da0933914 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java @@ -66,9 +66,9 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest { } @Test - public void c_pmUMLUMLLarge() throws IOException { - PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLarge"); - final Data data = new LargeInputData(); + public void c_pmUMLUMLSmallSplit() { + PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmallSplit"); + final Data data = new SmallSplitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -78,10 +78,10 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest { data.dispose(); } - @Test - public void d_pmUMLUMLSmallSplit() { - PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmallSplit"); - final Data data = new SmallSplitInputData(); +// @Test + public void d_pmUMLUMLLarge() throws IOException { + PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLarge"); + final Data data = new LargeInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java index 91142215d..ccbffb889 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java @@ -68,9 +68,9 @@ public class TestReq extends AbstractEMFComparePerformanceTest { }
@Test
- public void c_reqUMLLarge() throws IOException {
- PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLarge");
- final Data data = new LargeInputData();
+ public void c_reqUMLSmallSplit() {
+ PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmallSplit");
+ final Data data = new SmallSplitInputData();
data.match();
data.diff();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
@@ -80,11 +80,11 @@ public class TestReq extends AbstractEMFComparePerformanceTest { });
data.dispose();
}
-
- @Test
- public void d_reqUMLSmallSplit() {
- PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmallSplit");
- final Data data = new SmallSplitInputData();
+
+// @Test
+ public void d_reqUMLLarge() throws IOException {
+ PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLarge");
+ final Data data = new LargeInputData();
data.match();
data.diff();
monitor.measure(warmup(), getStepsNumber(), new Runnable() {
|