diff options
author | Eike Stepper | 2015-04-22 16:16:16 +0000 |
---|---|---|
committer | Eike Stepper | 2015-04-22 16:16:16 +0000 |
commit | d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7 (patch) | |
tree | 6488f73e26dcddd9b1c7befccf7ba721215edce9 /plugins/org.eclipse.emf.cdo.dawn.tests | |
parent | ef5341796d793607c49d863f8607f3193ceb08ae (diff) | |
download | cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.gz cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.tar.xz cdo-d2c5b0ee9d0634fb6c79d99e6952ee0d7c752dd7.zip |
[Releng] Reformat everything with M6 formatter
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.dawn.tests')
15 files changed, 60 insertions, 58 deletions
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java index f7d6f08249..f52e3bbbaa 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AbstractDawnTest.java @@ -55,18 +55,18 @@ public abstract class AbstractDawnTest extends AbstractCDOTest NotationPackage.eINSTANCE.getClass(); String packageName = ePackage.getName(); ResourceSet resourceSet = new ResourceSetImpl(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() - .put(packageName + "_diagram", new XMIResourceFactoryImpl()); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(packageName + "_diagram", + new XMIResourceFactoryImpl()); resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(packageName, new XMIResourceFactoryImpl()); URL resourceURI = GMFTest.class.getResource(""); String resourcePath = resourceURI.toString().substring(0, resourceURI.toString().lastIndexOf("/bin")); - Resource emfResource = resourceSet.getResource( - URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName), true); - Resource gmfResource = resourceSet.getResource( - URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName + "_diagram"), true); + Resource emfResource = resourceSet + .getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName), true); + Resource gmfResource = resourceSet + .getResource(URI.createURI(resourcePath + "/testdata/" + resourceName + "." + packageName + "_diagram"), true); EcoreUtil.resolveAll(emfResource); EcoreUtil.resolveAll(gmfResource); diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java index 8a664cf874..065977ef14 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawn.java @@ -25,7 +25,7 @@ import junit.framework.TestSuite; /** * This test suite should be executed as plain JUnit test. - * + * * @author Martin Fluegge */ public class AllTestsDawn extends AllTests diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java index 8387ccf55a..8594f5f24d 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUI.java @@ -24,7 +24,7 @@ import junit.framework.TestSuite; /** * This test suite should be executed as JUnit Plug-in test. - * + * * @author Martin Fluegge */ public class AllTestsDawnUI extends AllTests diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java index 3fd684ade4..8fd853c1fe 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotEMF.java @@ -20,18 +20,18 @@ import org.junit.runners.Suite.SuiteClasses; /** * This test suite should be executed as SWTBot test. - * + * * @author Martin Fluegge * @formatter:off */ @Deprecated @RunWith(Suite.class) -@SuiteClasses({ +@SuiteClasses({ DawnEMFCreationWizardTest.class, EMFEditorRollbackTest.class, DawnEMFHandleEditorTest.class - }) - +}) + public class AllTestsDawnUISWTBotEMF { } diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java index 78e058c51c..e2147e9be0 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/AllTestsDawnUISWTBotGMF.java @@ -25,25 +25,25 @@ import org.junit.runners.Suite.SuiteClasses; /** * This test suite should be executed as SWTBot test. - * + * * @author Martin Fluegge * @formatter:off */ @Deprecated @RunWith(Suite.class) -@SuiteClasses({ +@SuiteClasses({ DawnPreferencesTest.class, - DawnCreationWizardSWTBotTest.class, - SimpleDiagramTest.class, + DawnCreationWizardSWTBotTest.class, + SimpleDiagramTest.class, MultipleResourcesTest.class, // MultipleResourcesDeletionTest.class, //excluded because of ui freeze DawnProjectExplorerTest.class, ConflictTest.class, RollbackTest.class, - Bugzilla_321024_Test.class - }) - - + Bugzilla_321024_Test.class +}) + + public class AllTestsDawnUISWTBotGMF { } diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java index db06aafd72..938e39a04f 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bundle/OM.java @@ -4,7 +4,7 @@ * 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: * Martin Fluegge - initial API and implementation */ @@ -18,7 +18,7 @@ import org.eclipse.net4j.util.om.trace.OMTracer; /** * The <em>Operations & Maintenance</em> class of this bundle. - * + * * @author Martin Fluegge */ public abstract class OM diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java index c4fe1bdecb..cccd216460 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/DawnCodeGenGMFFragmentTest.java @@ -71,13 +71,14 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPartProvider.java").exists()); assertEquals(true, new File(diagramFolder + "/providers/DawnAcoreEditPolicyProvider.java").exists()); - basicCompare(new File(new URI(DawnTestPlatform.instance.getBundlePathForClass(DawnAcoreDiagramEditor.class) - + ".dawn/src/")), new File(outputFolder + "/src")); + basicCompare( + new File(new URI(DawnTestPlatform.instance.getBundlePathForClass(DawnAcoreDiagramEditor.class) + ".dawn/src/")), + new File(outputFolder + "/src")); } /** * check whether the generated folder contains the same files as the reference editor - * + * * @throws IOException */ private void basicCompare(File reference, File expected) throws IOException @@ -156,7 +157,8 @@ public class DawnCodeGenGMFFragmentTest extends AbstractDawnTest { if (line.contains("AcoreDiagramEditorPlugin.getInstance().logInfo") || line.equals("") || line.startsWith("*") || line.equals("import org.eclipse.emf.cdo.dawn.examples.acore.diagram.part.AcoreDiagramEditorPlugin;") - | line.startsWith("/*") || line.startsWith("//") || line.contains("@")) + | line.startsWith("/*") + || line.startsWith("//") || line.contains("@")) { return false; } diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java index d008538feb..d2a35e5e26 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/GMFTest.java @@ -245,8 +245,8 @@ public class GMFTest extends AbstractCDOTest { ResourceSet resourceSet = new ResourceSetImpl(); AcorePackage.eINSTANCE.eClass(); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap() - .put("acore_diagram", new XMIResourceFactoryImpl()); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("acore_diagram", + new XMIResourceFactoryImpl()); resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put("acore", new XMIResourceFactoryImpl()); diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java index 011513876e..81cf9ddef3 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/common/TestFrameworkTest.java @@ -26,7 +26,7 @@ import org.eclipse.gmf.runtime.notation.Diagram; /** * This test tests the test framework itself. - * + * * @author Martin Fluegge */ public class TestFrameworkTest extends AbstractDawnTest @@ -43,8 +43,8 @@ public class TestFrameworkTest extends AbstractDawnTest CDOResource semanticResource = transaction.getResource("/simple.acore"); assertInstanceOf(CDOResource.class, semanticResource); - DawnWrapperResource notationalResource = (DawnWrapperResource)resourceSet.getResource( - URI.createURI("dawn://repo1/simple.acore_diagram"), true);// container.getNotationalResource(); + DawnWrapperResource notationalResource = (DawnWrapperResource)resourceSet + .getResource(URI.createURI("dawn://repo1/simple.acore_diagram"), true);// container.getNotationalResource(); assertInstanceOf(DawnWrapperResource.class, notationalResource); ACoreRoot acoreRoot = (ACoreRoot)semanticResource.getContents().get(0); diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java index 5da2984c7e..28d524febb 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnCodeGenerationTest.java @@ -90,14 +90,13 @@ public class DawnCodeGenerationTest extends AbstractDawnUITest<SWTWorkbenchBot> DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnAcoreEditPartFactory.java")); assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/edit/parts/DawnACoreRootEditPart.java")); - assertEquals( - true, - DawnCodeGenerationTestUtil.exists(fragment, diagramFolder - + "/edit/policies/DawnACoreRootCanonicalEditPolicy.java")); + assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, + diagramFolder + "/edit/policies/DawnACoreRootCanonicalEditPolicy.java")); assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreCreationWizard.java")); - assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditor.java")); + assertEquals(true, + DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditor.java")); assertEquals(true, DawnCodeGenerationTestUtil.exists(fragment, diagramFolder + "/part/DawnAcoreDiagramEditorUtil.java")); assertEquals(true, diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java index 44d017893c..a91c469e91 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnAcoreTestUtil.java @@ -89,7 +89,8 @@ public class DawnAcoreTestUtil return openNewAcoreGMFEditor(diagramResourceName, diagramResourceName.replace("_diagram", ""), bot); } - public static SWTBotGefEditor openNewAcoreGMFEditor(String diagramResourceName, String semanticResource, SWTGefBot bot) + public static SWTBotGefEditor openNewAcoreGMFEditor(String diagramResourceName, String semanticResource, + SWTGefBot bot) { bot.menu("File").menu("New").menu("Other...").click(); @@ -132,7 +133,7 @@ public class DawnAcoreTestUtil try { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage() - .openEditor(editorInput, editorID); + .openEditor(editorInput, editorID); } catch (PartInitException ex) { @@ -302,8 +303,8 @@ public class DawnAcoreTestUtil IFigure figure = e.getFigure(); Color color = ((LineBorder)figure.getBorder()).getColor(); - return !(color.equals(DawnColorConstants.COLOR_LOCKED_REMOTELY) && color - .equals(DawnColorConstants.COLOR_LOCKED_LOCALLY)); + return !(color.equals(DawnColorConstants.COLOR_LOCKED_REMOTELY) + && color.equals(DawnColorConstants.COLOR_LOCKED_LOCALLY)); } return false; } diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java index 6fdb76d621..7530f50820 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnCodeGenerationTestUtil.java @@ -4,7 +4,7 @@ * 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: * Martin Fluegge - initial API and implementation */ diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java index 2456833b63..bee0b9b378 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnEcoreTestUtil.java @@ -100,7 +100,7 @@ public class DawnEcoreTestUtil try { PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getActivePart().getSite().getPage() - .openEditor(editorInput, editorID); + .openEditor(editorInput, editorID); } catch (PartInitException ex) { diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java index 7eb0f8694b..595876b44c 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotEMFEditor.java @@ -167,7 +167,7 @@ public class DawnSWTBotEMFEditor extends SWTBotEditor } protected void setActivePage(final MultiPageEditorPart editor, final int i) throws SecurityException, - NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException + NoSuchMethodException, IllegalArgumentException, IllegalAccessException, InvocationTargetException { editor.getSite().getShell().getDisplay().syncExec(new Runnable() { diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java index 8881c892ab..2ee5af1a90 100644 --- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java +++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/util/DawnSWTBotUtil.java @@ -118,7 +118,7 @@ public class DawnSWTBotUtil public static List<SWTBotGefEditPart> getAllEditParts(SWTBotGefEditor editor) { List<SWTBotGefEditPart> editParts = editor.editParts(new AbstractMatcher<EditPart>() - { + { @Override protected boolean doMatch(Object item) { @@ -128,7 +128,7 @@ public class DawnSWTBotUtil public void describeTo(Description description) { } - }); + }); return editParts; } @@ -140,7 +140,7 @@ public class DawnSWTBotUtil public static List<SWTBotGefEditPart> getConnectionEditParts(SWTBotGefEditor editor, Class<? extends EditPart> clazz, List<SWTBotGefEditPart> editParts) - { + { List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>(); for (SWTBotGefEditPart editPart : editParts) @@ -155,7 +155,7 @@ public class DawnSWTBotUtil } } return ret; - } + } static Object monitor = new Object(); @@ -165,7 +165,7 @@ public class DawnSWTBotUtil public static List<SWTBotGefEditPart> getAllConnections(final SWTBotGefEditor editor) { AbstractMatcher<EditPart> matcher = new AbstractMatcher<EditPart>() - { + { @Override protected boolean doMatch(Object item) { @@ -175,16 +175,16 @@ public class DawnSWTBotUtil public void describeTo(Description description) { } - }; - List<SWTBotGefEditPart> aClassEditParts = editor.editParts(matcher); + }; + List<SWTBotGefEditPart> aClassEditParts = editor.editParts(matcher); - List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>(); + List<SWTBotGefEditPart> ret = new ArrayList<SWTBotGefEditPart>(); - for (SWTBotGefEditPart editPart : aClassEditParts) - { - ret.addAll(editPart.sourceConnections()); - } - return ret; + for (SWTBotGefEditPart editPart : aClassEditParts) + { + ret.addAll(editPart.sourceConnections()); + } + return ret; } public static Node createNewNodeRemote(Diagram diagram, AClass newAClass, String type) @@ -322,7 +322,7 @@ public class DawnSWTBotUtil } final MenuItem menuItem = UIThreadRunnable.syncExec(new WidgetResult<MenuItem>() - { + { public MenuItem run() { MenuItem menuItem = null; @@ -339,7 +339,7 @@ public class DawnSWTBotUtil return menuItem; } - }); + }); if (menuItem == null) { throw new WidgetNotFoundException("Could not find menu: " + Arrays.asList(texts)); |