### Eclipse Workspace Patch 1.0 #P org.eclipse.gmf.tests.lite Index: src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.lite/src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java,v retrieving revision 1.2 diff -u -r1.2 LiteGeneratorConfiguration.java --- src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java 25 May 2006 14:22:13 -0000 1.2 +++ src/org/eclipse/gmf/tests/lite/gen/LiteGeneratorConfiguration.java 31 May 2006 14:50:21 -0000 @@ -106,7 +106,7 @@ req.setType(RequestConstants.REQ_CONNECTION_START); EditPart sourceEditPart = findEditPart(source); Assert.assertNotNull(sourceEditPart); - req.setSourceEditPart(sourceEditPart); + req.setTargetEditPart(sourceEditPart); return sourceEditPart.getCommand(req); } catch (Exception e) { return null; @@ -116,7 +116,7 @@ public Command getSetBusinessElementStructuralFeatureCommand(View view, String featureName, final Object value) { final EObject instance = view.getElement(); Assert.assertNotNull("No business element bound to notation element", instance); //$NON-NLS-1$ - EObject resultObj = EPath.findLocalFeature(instance.eClass(), featureName); + EObject resultObj = EPath.findFeature(instance.eClass(), featureName); if (!(resultObj instanceof EStructuralFeature)) { throw new IllegalArgumentException("Not existing feature: " + featureName); //$NON-NLS-1$ } Index: src/org/eclipse/gmf/tests/lite/AllTests.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests.lite/src/org/eclipse/gmf/tests/lite/AllTests.java,v retrieving revision 1.2 diff -u -r1.2 AllTests.java --- src/org/eclipse/gmf/tests/lite/AllTests.java 26 May 2006 17:58:29 -0000 1.2 +++ src/org/eclipse/gmf/tests/lite/AllTests.java 31 May 2006 14:50:21 -0000 @@ -16,8 +16,10 @@ import org.eclipse.gmf.tests.lite.gef.DiagramElementTest; import org.eclipse.gmf.tests.lite.gen.LiteCompilationTest; import org.eclipse.gmf.tests.lite.gen.RCPLiteCompilationTest; +import org.eclipse.gmf.tests.lite.rt.ElementInitializerTest; import org.eclipse.gmf.tests.lite.setup.LiteLinksSessionSetup; import org.eclipse.gmf.tests.lite.setup.LiteSessionSetup; +import org.eclipse.gmf.tests.rt.LinkCreationConstraintsTest; import org.eclipse.gmf.tests.setup.LinksSessionSetup; import org.eclipse.gmf.tests.setup.SessionSetup; @@ -37,6 +39,8 @@ suite.addTest(feed(DiagramNodeTest.class, sessionSetup)); suite.addTest(feed(DiagramElementTest.class, sessionSetup2)); + suite.addTest(feed(ElementInitializerTest.class, sessionSetup2)); + suite.addTest(feed(LinkCreationConstraintsTest.class, sessionSetup2)); suite.addTest(new TestCase("testCleanup") { protected void runTest() throws Throwable { Index: src/org/eclipse/gmf/tests/lite/rt/ElementInitializerTest.java =================================================================== RCS file: src/org/eclipse/gmf/tests/lite/rt/ElementInitializerTest.java diff -N src/org/eclipse/gmf/tests/lite/rt/ElementInitializerTest.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ src/org/eclipse/gmf/tests/lite/rt/ElementInitializerTest.java 1 Jan 1970 00:00:00 -0000 @@ -0,0 +1,28 @@ +/** + * Copyright (c) 2006 Eclipse.org + * + * 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: + * bblajer - initial API and implementation + */ +package org.eclipse.gmf.tests.lite.rt; + + +public class ElementInitializerTest extends org.eclipse.gmf.tests.rt.ElementInitializerTest { + public ElementInitializerTest(String name) { + super(name); + } + + protected Class loadJavaContainerClass() { + String javaContainerName = "JavaInitializers"; //$NON-NLS-1$ + try { + return loadGeneratedClass(getGenModel().getGenDiagram().getNotationViewFactoriesPackageName() + ".DomainElementInitializer$" + javaContainerName); //$NON-NLS-1$ + } catch (ClassNotFoundException e) { + return null; + } + } +} #P org.eclipse.gmf.tests Index: src/org/eclipse/gmf/tests/rt/ElementInitializerTest.java =================================================================== RCS file: /cvsroot/technology/org.eclipse.gmf/tests/org.eclipse.gmf.tests/src/org/eclipse/gmf/tests/rt/ElementInitializerTest.java,v retrieving revision 1.5 diff -u -r1.5 ElementInitializerTest.java --- src/org/eclipse/gmf/tests/rt/ElementInitializerTest.java 24 May 2006 16:22:41 -0000 1.5 +++ src/org/eclipse/gmf/tests/rt/ElementInitializerTest.java 31 May 2006 14:50:22 -0000 @@ -52,16 +52,9 @@ } public void testJavaInitializers() throws Exception { - Class elementTypesClass = null; - Class javaContainerClass = null; - String javaContainerName = "Initializers$Java"; //$NON-NLS-1$ - try { - elementTypesClass = loadGeneratedClass(getGenModel().getGenDiagram().getElementTypesQualifiedClassName()); - javaContainerClass = loadGeneratedClass(elementTypesClass.getName() + "$" + javaContainerName); //$NON-NLS-1$ - } catch (ClassNotFoundException e) { - fail("Could not find generated metric provider or view"); //$NON-NLS-1$ - } - + Class javaContainerClass = loadJavaContainerClass(); + assertNotNull("Could not find generated java initializer class", javaContainerClass); + GenJavaExpressionProvider javaProvider = null; GenExpressionProviderContainer container = getGenModel().getGenDiagram().getEditorGen().getExpressionProviders(); for (Iterator providerIt = container.getProviders().iterator(); providerIt.hasNext();) { @@ -130,7 +123,16 @@ assertTrue(multiObjValTypeAttrTested); assertTrue(multiRefTested); } - + + protected Class loadJavaContainerClass() { + String javaContainerName = "Initializers$Java"; //$NON-NLS-1$ + try { + return loadGeneratedClass(getGenModel().getGenDiagram().getElementTypesQualifiedClassName() + "$" + javaContainerName); //$NON-NLS-1$ + } catch (ClassNotFoundException e) { + return null; + } + } + public void testAttrMany() throws Exception { EStructuralFeature attrManyFeature = nodeBElement.eClass().getEStructuralFeature("integers_Init"); //$NON-NLS-1$ assertNotNull("field not found in tested class", attrManyFeature); //$NON-NLS-1$