Skip to content

The test case should work now #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Treehopper wants to merge 1 commit into
base: master
Choose a base branch
from
Open

The test case should work now #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 3 additions & 12 deletions ...store.client.test/src/org/eclipse/emf/emfstore/client/test/server/ModelGeneratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,11 @@
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.emfstore.client.model.ProjectSpace;
import org.eclipse.emf.emfstore.client.model.Usersession;
import org.eclipse.emf.emfstore.client.model.WorkspaceManager;
import org.eclipse.emf.emfstore.client.test.SetupHelper;
import org.eclipse.emf.emfstore.common.model.Project;
import org.eclipse.emf.emfstore.common.model.util.ModelUtil;
import org.eclipse.emf.emfstore.modelgenerator.ModelGenerator;
import org.eclipse.emf.emfstore.modelgenerator.common.ModelGeneratorConfiguration;
import org.eclipse.emf.emfstore.modelgenerator.common.ModelGeneratorUtil;
Expand Down Expand Up @@ -46,15 +44,8 @@ public class ModelGeneratorTest extends ServerTests {
public void beforeTest() throws EmfStoreException {
super.beforeTest();

projectSpace = org.eclipse.emf.emfstore.client.model.ModelFactory.eINSTANCE.createProjectSpace();
projectSpace.setProject(org.eclipse.emf.emfstore.common.model.ModelFactory.eINSTANCE.createProject());
projectSpace.setProjectName(projectName);
projectSpace.setProjectDescription(projectDescription);
projectSpace.setLocalOperations(org.eclipse.emf.emfstore.client.model.ModelFactory.eINSTANCE
.createOperationComposite());
ResourceSet resourceSet = new ResourceSetImpl();
resourceSet.getLoadOptions().putAll(ModelUtil.getResourceLoadOptions());
projectSpace.initResources(resourceSet);
projectSpace = WorkspaceManager.getInstance().getCurrentWorkspace()
.createLocalProject(projectName, projectDescription);

Usersession session = org.eclipse.emf.emfstore.client.model.ModelFactory.eINSTANCE.createUsersession();
session.setServerInfo(SetupHelper.getServerInfo());
Expand Down
25 changes: 13 additions & 12 deletions org.eclipse.emf.emfstore.modelgenerator.common/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Modelgenerator Common
Bundle-SymbolicName: org.eclipse.emf.emfstore.modelgenerator.common
Bundle-Version: 0.8.9.M9
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.emfstore.modelgenerator.common,
org.eclipse.emf.emfstore.modelgenerator.common.attribute
Require-Bundle: org.eclipse.emf.ecore,
org.eclipse.emf.edit
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Modelgenerator Common
Bundle-SymbolicName: org.eclipse.emf.emfstore.modelgenerator.common
Bundle-Version: 0.8.9.M9
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.emfstore.modelgenerator.common,
org.eclipse.emf.emfstore.modelgenerator.common.attribute
Require-Bundle: org.eclipse.emf.ecore,
org.eclipse.emf.edit,
org.eclipse.emf.emfstore.client;bundle-version="0.8.9"
Bundle-ActivationPolicy: lazy
Bundle-Vendor: Eclipse Modeling Project
Loading