diff options
author | Christian W. Damus | 2013-09-16 13:32:48 +0000 |
---|---|---|
committer | Christian W. Damus | 2013-09-16 20:02:42 +0000 |
commit | f7f93bc26a060e7ccc97ef1a84129ca51c20fff6 (patch) | |
tree | 0fa835f41fcbb6208d340e0a02d3db63c3f6a9fb /tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src | |
parent | f4037d464d772ccd1a165471cc86ad4c093c5a56 (diff) | |
download | org.eclipse.papyrus-f7f93bc26a060e7ccc97ef1a84129ca51c20fff6.tar.gz org.eclipse.papyrus-f7f93bc26a060e7ccc97ef1a84129ca51c20fff6.tar.xz org.eclipse.papyrus-f7f93bc26a060e7ccc97ef1a84129ca51c20fff6.zip |
[417335] Update CDO integration plug-ins to Java SE 6.0
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417335
Regenerate EMF models for Java SE 6.0 source compliance level.
Diffstat (limited to 'tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src')
5 files changed, 147 insertions, 102 deletions
diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java new file mode 100644 index 00000000000..a5a12ca7298 --- /dev/null +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/AttributeTest.java @@ -0,0 +1,101 @@ +/** + * Copyright (c) 2013 CEA LIST. + * + * 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: + * CEA LIST - Initial API and implementation + */ +package org.eclipse.papyrus.cdo.validation.problems.tests; + +import java.util.Map; + +import junit.framework.TestCase; + +import junit.textui.TestRunner; + +import org.eclipse.papyrus.cdo.validation.problems.ProblemsFactory; +import org.eclipse.papyrus.cdo.validation.problems.ProblemsPackage; + +/** + * <!-- begin-user-doc --> + * A test case for the model object '<em><b>Attribute</b></em>'. + * <!-- end-user-doc --> + * @generated + */ +public class AttributeTest extends TestCase { + + /** + * The fixture for this Attribute test case. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Map.Entry<String, String> fixture = null; + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public static void main(String[] args) { + TestRunner.run(AttributeTest.class); + } + + /** + * Constructs a new Attribute test case with the given name. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + public AttributeTest(String name) { + super(name); + } + + /** + * Sets the fixture for this Attribute test case. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected void setFixture(Map.Entry<String, String> fixture) { + this.fixture = fixture; + } + + /** + * Returns the fixture for this Attribute test case. + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @generated + */ + protected Map.Entry<String, String> getFixture() { + return fixture; + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see junit.framework.TestCase#setUp() + * @generated + */ + @Override + @SuppressWarnings("unchecked") + protected void setUp() throws Exception { + setFixture((Map.Entry<String, String>)ProblemsFactory.eINSTANCE.create(ProblemsPackage.Literals.ATTRIBUTE)); + } + + /** + * <!-- begin-user-doc --> + * <!-- end-user-doc --> + * @see junit.framework.TestCase#tearDown() + * @generated + */ + @Override + protected void tearDown() throws Exception { + setFixture(null); + } + +} //AttributeTest diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java index f85c3213869..5957ea59a9a 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemTest.java @@ -31,16 +31,12 @@ import org.eclipse.papyrus.cdo.validation.problems.ProblemsPackage; * <p> * The following operations are tested: * <ul> - * <li> - * {@link org.eclipse.papyrus.cdo.validation.problems.EProblem#toDiagnostic() - * <em>To Diagnostic</em>}</li> + * <li>{@link org.eclipse.papyrus.cdo.validation.problems.EProblem#toDiagnostic() <em>To Diagnostic</em>}</li> * </ul> * </p> - * * @generated */ -public class EProblemTest - extends TestCase { +public class EProblemTest extends TestCase { protected static ESeverity SEVERITY = ESeverity.ERROR; @@ -57,16 +53,15 @@ public class EProblemTest protected static EObject RELATED2 = ProblemsPackage.Literals.EDIAGNOSTIC; /** - * The fixture for this EProblem test case. <!-- begin-user-doc --> <!-- + * The fixture for this EProblem test case. + * <!-- begin-user-doc --> <!-- * end-user-doc --> - * * @generated */ protected EProblem fixture = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public static void main(String[] args) { @@ -84,9 +79,9 @@ public class EProblemTest } /** - * Sets the fixture for this EProblem test case. <!-- begin-user-doc --> + * Sets the fixture for this EProblem test case. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ protected void setFixture(EProblem fixture) { @@ -94,9 +89,9 @@ public class EProblemTest } /** - * Returns the fixture for this EProblem test case. <!-- begin-user-doc --> + * Returns the fixture for this EProblem test case. + * <!-- begin-user-doc --> * <!-- end-user-doc --> - * * @generated */ protected EProblem getFixture() { @@ -110,8 +105,7 @@ public class EProblemTest * @generated NOT */ @Override - protected void setUp() - throws Exception { + protected void setUp() throws Exception { setFixture(ProblemsFactory.eINSTANCE.createEProblem()); getFixture().setSeverity(SEVERITY); @@ -124,13 +118,11 @@ public class EProblemTest /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see junit.framework.TestCase#tearDown() * @generated */ @Override - protected void tearDown() - throws Exception { + protected void tearDown() throws Exception { setFixture(null); } @@ -146,12 +138,10 @@ public class EProblemTest public void testToDiagnostic() { Diagnostic diag = getFixture().toDiagnostic(); - assertDiagnostic(diag, MESSAGE, new Object[]{ELEMENT, RELATED1, - RELATED2}); + assertDiagnostic(diag, MESSAGE, new Object[]{ ELEMENT, RELATED1, RELATED2 }); } - static void assertDiagnostic(Diagnostic diag, String message, - Object... data) { + static void assertDiagnostic(Diagnostic diag, String message, Object... data) { assertEquals(Diagnostic.ERROR, diag.getSeverity()); assertEquals(SOURCE, diag.getSource()); assertEquals(CODE, diag.getCode()); diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java index 3de5a59ae4c..51f2be7dab6 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/EProblemsContainerTest.java @@ -33,40 +33,27 @@ import org.eclipse.papyrus.cdo.validation.problems.ProblemsFactory; * <p> * The following operations are tested: * <ul> - * <li> - * {@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allProblems() - * <em>All Problems</em>}</li> - * <li> - * {@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allProblems(org.eclipse.emf.ecore.EObject) - * <em>All Problems</em>}</li> - * <li> - * {@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allDiagnostics() - * <em>All Diagnostics</em>}</li> - * <li> - * {@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allDiagnostics(org.eclipse.emf.ecore.EObject) - * <em>All Diagnostics</em>}</li> - * <li> - * {@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#getWorstProblem(org.eclipse.emf.ecore.EObject) - * <em>Get Worst Problem</em>}</li> + * <li>{@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allProblems() <em>All Problems</em>}</li> + * <li>{@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allProblems(org.eclipse.emf.ecore.EObject) <em>All Problems</em>}</li> + * <li>{@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allDiagnostics() <em>All Diagnostics</em>}</li> + * <li>{@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#allDiagnostics(org.eclipse.emf.ecore.EObject) <em>All Diagnostics</em>}</li> + * <li>{@link org.eclipse.papyrus.cdo.validation.problems.EProblemsContainer#getWorstProblem(org.eclipse.emf.ecore.EObject) <em>Get Worst Problem</em>}</li> * </ul> * </p> - * * @generated */ -public class EProblemsContainerTest - extends TestCase { +public class EProblemsContainerTest extends TestCase { /** - * The fixture for this EProblems Container test case. <!-- begin-user-doc + * The fixture for this EProblems Container test case. + * <!-- begin-user-doc * --> <!-- end-user-doc --> - * * @generated */ protected EProblemsContainer fixture = null; /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public static void main(String[] args) { @@ -110,20 +97,16 @@ public class EProblemsContainerTest * @generated NOT */ @Override - protected void setUp() - throws Exception { - EProblemsContainer root = ProblemsFactory.eINSTANCE - .createEProblemsContainer(); + protected void setUp() throws Exception { + EProblemsContainer root = ProblemsFactory.eINSTANCE.createEProblemsContainer(); root.getProblems().add(createProblem(EProblemTest.ELEMENT, "root")); - EProblemsContainer level1 = ProblemsFactory.eINSTANCE - .createEProblemsContainer(); + EProblemsContainer level1 = ProblemsFactory.eINSTANCE.createEProblemsContainer(); root.getSubcontainers().add(level1); level1.getProblems().add(createProblem(EProblemTest.RELATED1, "a")); level1.getProblems().add(createProblem(EProblemTest.RELATED2, "b")); - EProblemsContainer level2 = ProblemsFactory.eINSTANCE - .createEProblemsContainer(); + EProblemsContainer level2 = ProblemsFactory.eINSTANCE.createEProblemsContainer(); level1.getSubcontainers().add(level2); level1.getProblems().add(createProblem(EProblemTest.RELATED2, "c")); level1.getProblems().add(createProblem(EProblemTest.RELATED1, "d")); @@ -133,13 +116,11 @@ public class EProblemsContainerTest /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @see junit.framework.TestCase#tearDown() * @generated */ @Override - protected void tearDown() - throws Exception { + protected void tearDown() throws Exception { setFixture(null); } @@ -153,14 +134,10 @@ public class EProblemsContainerTest * @generated NOT */ public void testAllProblems() { - final Iterator<String> messages = Arrays.asList("root", "a", "b", "c", - "d").iterator(); - final Iterator<EObject> elements = Arrays.asList(EProblemTest.ELEMENT, - EProblemTest.RELATED1, EProblemTest.RELATED2, - EProblemTest.RELATED2, EProblemTest.RELATED1).iterator(); + final Iterator<String> messages = Arrays.asList("root", "a", "b", "c", "d").iterator(); + final Iterator<EObject> elements = Arrays.asList(EProblemTest.ELEMENT, EProblemTest.RELATED1, EProblemTest.RELATED2, EProblemTest.RELATED2, EProblemTest.RELATED1).iterator(); - for (Iterator<EProblem> allProblems = getFixture().allProblems(); allProblems - .hasNext();) { + for(Iterator<EProblem> allProblems = getFixture().allProblems(); allProblems.hasNext();) { assertProblem(allProblems.next(), messages.next(), elements.next()); } } @@ -176,11 +153,9 @@ public class EProblemsContainerTest */ public void testAllProblems__EObject() { final Iterator<String> messages = Arrays.asList("b", "c").iterator(); - final Iterator<EObject> elements = Arrays.asList(EProblemTest.RELATED2, - EProblemTest.RELATED2).iterator(); + final Iterator<EObject> elements = Arrays.asList(EProblemTest.RELATED2, EProblemTest.RELATED2).iterator(); - for (Iterator<EProblem> allProblems = getFixture().allProblems( - EProblemTest.RELATED2); allProblems.hasNext();) { + for(Iterator<EProblem> allProblems = getFixture().allProblems(EProblemTest.RELATED2); allProblems.hasNext();) { assertProblem(allProblems.next(), messages.next(), elements.next()); } } @@ -195,15 +170,11 @@ public class EProblemsContainerTest * @generated NOT */ public void testAllDiagnostics() { - final Iterator<String> messages = Arrays.asList("root", "a", "b", "c", - "d").iterator(); - final Iterator<EObject> elements = Arrays.asList(EProblemTest.ELEMENT, - EProblemTest.RELATED1, EProblemTest.RELATED2, - EProblemTest.RELATED2, EProblemTest.RELATED1).iterator(); + final Iterator<String> messages = Arrays.asList("root", "a", "b", "c", "d").iterator(); + final Iterator<EObject> elements = Arrays.asList(EProblemTest.ELEMENT, EProblemTest.RELATED1, EProblemTest.RELATED2, EProblemTest.RELATED2, EProblemTest.RELATED1).iterator(); - for (Diagnostic diag : getFixture().allDiagnostics()) { - EProblemTest.assertDiagnostic(diag, messages.next(), - elements.next()); + for(Diagnostic diag : getFixture().allDiagnostics()) { + EProblemTest.assertDiagnostic(diag, messages.next(), elements.next()); } } @@ -218,13 +189,10 @@ public class EProblemsContainerTest */ public void testAllDiagnostics__EObject() { final Iterator<String> messages = Arrays.asList("a", "d").iterator(); - final Iterator<EObject> elements = Arrays.asList(EProblemTest.RELATED1, - EProblemTest.RELATED1).iterator(); + final Iterator<EObject> elements = Arrays.asList(EProblemTest.RELATED1, EProblemTest.RELATED1).iterator(); - for (Diagnostic diag : getFixture().allDiagnostics( - EProblemTest.RELATED1)) { - EProblemTest.assertDiagnostic(diag, messages.next(), - elements.next()); + for(Diagnostic diag : getFixture().allDiagnostics(EProblemTest.RELATED1)) { + EProblemTest.assertDiagnostic(diag, messages.next(), elements.next()); } } @@ -239,17 +207,13 @@ public class EProblemsContainerTest */ public void testGetWorstProblem__EObject() { // change severities in the fixture - Iterator<ESeverity> severities = Arrays.asList(ESeverity.INFO, - ESeverity.WARNING).iterator(); - for (Iterator<EProblem> problems = getFixture().allProblems( - EProblemTest.RELATED1); problems.hasNext();) { + Iterator<ESeverity> severities = Arrays.asList(ESeverity.INFO, ESeverity.WARNING).iterator(); + for(Iterator<EProblem> problems = getFixture().allProblems(EProblemTest.RELATED1); problems.hasNext();) { problems.next().setSeverity(severities.next()); } - assertSame(ESeverity.WARNING, - getFixture().getWorstProblem(EProblemTest.RELATED1).getSeverity()); - assertSame(ESeverity.ERROR, - getFixture().getWorstProblem(EProblemTest.ELEMENT).getSeverity()); + assertSame(ESeverity.WARNING, getFixture().getWorstProblem(EProblemTest.RELATED1).getSeverity()); + assertSame(ESeverity.ERROR, getFixture().getWorstProblem(EProblemTest.ELEMENT).getSeverity()); assertNull(getFixture().getWorstProblem(EcorePackage.eINSTANCE)); } @@ -265,8 +229,7 @@ public class EProblemsContainerTest return result; } - static void assertProblem(EProblem problem, String message, - EObject element, EObject... related) { + static void assertProblem(EProblem problem, String message, EObject element, EObject... related) { assertSame(ESeverity.ERROR, problem.getSeverity()); assertEquals(EProblemTest.SOURCE, problem.getSource()); assertEquals(EProblemTest.CODE, problem.getCode()); diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java index c7a1143ac16..3693fe5f563 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsAllTests.java @@ -23,15 +23,12 @@ import org.eclipse.papyrus.cdo.validation.problems.util.tests.AllUtilTests; /** * <!-- begin-user-doc --> A test suite for the '<em><b>Problems</b></em>' * model. <!-- end-user-doc --> - * * @generated */ -public class ProblemsAllTests - extends TestSuite { +public class ProblemsAllTests extends TestSuite { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public static void main(String[] args) { @@ -46,8 +43,8 @@ public class ProblemsAllTests public static Test suite() { TestSuite suite = new ProblemsAllTests("Problems Tests"); //$NON-NLS-1$ suite.addTest(ProblemsTests.suite()); - - if (EMFPlugin.IS_ECLIPSE_RUNNING) { + + if(EMFPlugin.IS_ECLIPSE_RUNNING) { suite.addTest(new JUnit4TestAdapter(AllUtilTests.class)); } @@ -57,7 +54,6 @@ public class ProblemsAllTests /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ProblemsAllTests(String name) { diff --git a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java index 4967b897cfa..e590ab75118 100644 --- a/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java +++ b/tests/junit/extraplugins/cdo/org.eclipse.papyrus.cdo.validation.problems.tests/src/org/eclipse/papyrus/cdo/validation/problems/tests/ProblemsTests.java @@ -18,15 +18,12 @@ import junit.textui.TestRunner; /** * <!-- begin-user-doc --> A test suite for the '<em><b>problems</b></em>' * package. <!-- end-user-doc --> - * * @generated */ -public class ProblemsTests - extends TestSuite { +public class ProblemsTests extends TestSuite { /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public static void main(String[] args) { @@ -35,7 +32,6 @@ public class ProblemsTests /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public static Test suite() { @@ -47,7 +43,6 @@ public class ProblemsTests /** * <!-- begin-user-doc --> <!-- end-user-doc --> - * * @generated */ public ProblemsTests(String name) { |