Skip to content

Commit 53288cd

Browse files
committed
[SAFRAN-1264] Manual migration of Compare automatic tests plug-in
GenerateGenerator has been generated and updated to match the existing Acceleo 3 class. The DatabaseEvolutionScriptGenerationTest suite is entirely failing, but it was already the case before.
1 parent 9168699 commit 53288cd

6 files changed

Lines changed: 629 additions & 458 deletions

File tree

reversers/database-synchroniser/plugins/org.obeonetwork.dsl.database.compare.tests/META-INF/MANIFEST.MF

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: Database Compare Tests
44
Bundle-SymbolicName: org.obeonetwork.dsl.database.compare.tests
55
Bundle-Version: 6.0.0.qualifier
6+
Bundle-Vendor: Obeo Network
7+
Export-Package: org.obeonetwork.dsl.database.compare.tests.gen.files,
8+
org.obeonetwork.dsl.database.compare.tests.gen.main,
9+
org.obeonetwork.dsl.database.compare.tests.gen.services
610
Require-Bundle: org.eclipse.core.runtime,
711
org.eclipse.emf,
812
org.eclipse.emf.ecore,
@@ -11,14 +15,15 @@ Require-Bundle: org.eclipse.core.runtime,
1115
org.obeonetwork.dsl.database,
1216
org.junit,
1317
org.obeonetwork.dsl.database.compare,
14-
org.eclipse.acceleo.engine,
1518
org.eclipse.emf.compare.edit,
1619
org.obeonetwork.dsl.database.compare.edit,
1720
org.obeonetwork.dsl.database.sqlgen,
18-
org.obeonetwork.dsl.is
21+
org.obeonetwork.dsl.is,
22+
org.eclipse.acceleo.query;bundle-version="[8.1.2,9.0.0)",
23+
org.eclipse.acceleo.aql;bundle-version="[4.2.2,5.0.0)",
24+
org.eclipse.acceleo.aql.profiler;bundle-version="[4.2.2,5.0.0)",
25+
org.antlr.antlr4-runtime;bundle-version="[4.13.2,4.13.3)",
26+
org.eclipse.emf.compare,
27+
org.obeonetwork.database.ui;bundle-version="6.0.0"
1928
Bundle-RequiredExecutionEnvironment: JavaSE-17
20-
Export-Package: org.obeonetwork.dsl.database.compare.tests.gen.files,
21-
org.obeonetwork.dsl.database.compare.tests.gen.main,
22-
org.obeonetwork.dsl.database.compare.tests.gen.services
23-
Bundle-Vendor: Obeo Network
2429
Import-Package: org.apache.log4j;version="1.2.15"

reversers/database-synchroniser/plugins/org.obeonetwork.dsl.database.compare.tests/src/org/obeonetwork/dsl/database/compare/tests/AbstractDatabaseCompareTest.java

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,8 @@
1010
*******************************************************************************/
1111
package org.obeonetwork.dsl.database.compare.tests;
1212

13-
import java.io.File;
1413
import java.io.IOException;
1514
import java.io.StringWriter;
16-
import java.util.ArrayList;
1715
import java.util.HashMap;
1816
import java.util.Iterator;
1917
import java.util.Map;
@@ -31,7 +29,7 @@
3129
import org.junit.Assert;
3230
import org.obeonetwork.dsl.database.TableContainer;
3331
import org.obeonetwork.dsl.database.compare.extensions.services.DatabaseCompareService;
34-
import org.obeonetwork.dsl.database.compare.tests.gen.main.Generate;
32+
import org.obeonetwork.dsl.database.compare.tests.gen.main.GenerateGenerator;
3533

3634
public class AbstractDatabaseCompareTest {
3735

@@ -56,13 +54,8 @@ public void testDatabaseCompare(String folder) {
5654
// assertEquals(expectedSnapshot.getDiff().getOwnedElements().get(0), actualSnapshot.getDifferences()getOwnedElements().get(0));
5755
//assertEquals(expectedSnapshot, actualSnapshot);
5856

59-
try {
60-
Generate generate = new Generate(actualSnapshot, new File("models/" + folder), new ArrayList<Object>());
61-
generate.doGenerate(new BasicMonitor());
62-
} catch (IOException e) {
63-
// TODO Auto-generated catch block
64-
e.printStackTrace();
65-
}
57+
GenerateGenerator generate = new GenerateGenerator(actualSnapshot, "models/" + folder);
58+
generate.generate(new BasicMonitor());
6659

6760
}
6861

0 commit comments

Comments
 (0)