1 files changed, 6 insertions, 55 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
index 820dd354..7019f162 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
@@ -1,9 +1,9 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

+import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

-import com.google.common.collect.Iterables;

-import functionalarchitecture.FunctionalarchitecturePackage;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

@@ -17,27 +17,11 @@ import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;
 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

-import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;

-import java.util.Collections;

-import java.util.List;

-import java.util.Map;

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

-import org.eclipse.emf.ecore.EAttribute;

-import org.eclipse.emf.ecore.EClass;

-import org.eclipse.emf.ecore.EEnum;

-import org.eclipse.emf.ecore.EEnumLiteral;

 import org.eclipse.emf.ecore.EObject;

-import org.eclipse.emf.ecore.EReference;

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

-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

 import org.eclipse.xtend2.lib.StringConcatenation;

-import org.eclipse.xtext.xbase.lib.CollectionLiterals;

 import org.eclipse.xtext.xbase.lib.Exceptions;

-import org.eclipse.xtext.xbase.lib.Functions.Function1;

 import org.eclipse.xtext.xbase.lib.InputOutput;

-import org.eclipse.xtext.xbase.lib.IterableExtensions;

-import org.eclipse.xtext.xbase.lib.IteratorExtensions;

-import org.eclipse.xtext.xbase.lib.ListExtensions;

 import org.eclipse.xtext.xbase.lib.ObjectExtensions;

 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

 

@@ -49,12 +33,13 @@ public class EcoreTest {
       _builder.append("initialModels/");

       final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

       StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/FAMTest/");

+      _builder_1.append("output/FEcoreTest/");

       final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

       workspace.initAndClear();

       InputOutput.<String>println("Input and output workspaces are created");

-      final EcoreMetamodelDescriptor metamodel = EcoreTest.loadMetamodel();

-      final List<EObject> partialModel = EcoreTest.loadPartialModel(inputs);

+      final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

+      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

+      final Object queries = null;

       InputOutput.<String>println("DSL loaded");

       final Ecore2Logic ecore2Logic = new Ecore2Logic();

       final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic);

@@ -80,38 +65,4 @@ public class EcoreTest {
       throw Exceptions.sneakyThrow(_e);

     }

   }

-  

-  private static EcoreMetamodelDescriptor loadMetamodel() {

-    final FunctionalarchitecturePackage pckg = FunctionalarchitecturePackage.eINSTANCE;

-    final List<EClass> classes = IterableExtensions.<EClass>toList(Iterables.<EClass>filter(pckg.getEClassifiers(), EClass.class));

-    final List<EEnum> enums = IterableExtensions.<EEnum>toList(Iterables.<EEnum>filter(pckg.getEClassifiers(), EEnum.class));

-    final Function1<EEnum, EList<EEnumLiteral>> _function = (EEnum it) -> {

-      return it.getELiterals();

-    };

-    final List<EEnumLiteral> literals = IterableExtensions.<EEnumLiteral>toList(Iterables.<EEnumLiteral>concat(ListExtensions.<EEnum, EList<EEnumLiteral>>map(enums, _function)));

-    final Function1<EClass, EList<EReference>> _function_1 = (EClass it) -> {

-      return it.getEReferences();

-    };

-    final List<EReference> references = IterableExtensions.<EReference>toList(Iterables.<EReference>concat(ListExtensions.<EClass, EList<EReference>>map(classes, _function_1)));

-    final Function1<EClass, EList<EAttribute>> _function_2 = (EClass it) -> {

-      return it.getEAttributes();

-    };

-    final List<EAttribute> attributes = IterableExtensions.<EAttribute>toList(Iterables.<EAttribute>concat(ListExtensions.<EClass, EList<EAttribute>>map(classes, _function_2)));

-    return new EcoreMetamodelDescriptor(classes, Collections.<EClass>unmodifiableSet(CollectionLiterals.<EClass>newHashSet()), false, enums, literals, references, attributes);

-  }

-  

-  private static List<EObject> loadPartialModel(final ReasonerWorkspace inputs) {

-    List<EObject> _xblockexpression = null;

-    {

-      Map<String, Object> _extensionToFactoryMap = Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap();

-      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

-      _extensionToFactoryMap.put("*", _xMIResourceFactoryImpl);

-      _xblockexpression = IteratorExtensions.<EObject>toList(inputs.<EObject>readModel(EObject.class, "FamInstance.xmi").eResource().getAllContents());

-    }

-    return _xblockexpression;

-  }

-  

-  private static Object loadQueries(final EcoreMetamodelDescriptor metamodel) {

-    return null;

-  }

 }