diff options
author | Vincent Lorenzo | 2019-06-14 08:31:38 +0000 |
---|---|---|
committer | vincent lorenzo | 2019-06-18 13:29:37 +0000 |
commit | 298b439c010cbfc855b0489e9cded2d8d4106bb3 (patch) | |
tree | c0a9dc33b2dddc07b7c926a4448b1c7d45f645d2 /tests | |
parent | 4debfd3361ccde920241edd952dd8f01858176e7 (diff) | |
download | org.eclipse.papyrus-298b439c010cbfc855b0489e9cded2d8d4106bb3.tar.gz org.eclipse.papyrus-298b439c010cbfc855b0489e9cded2d8d4106bb3.tar.xz org.eclipse.papyrus-298b439c010cbfc855b0489e9cded2d8d4106bb3.zip |
Bug 548237: [Expression] Papyrus must provide new expressions check single valued EAttribute and Stereotype Properties values (equality tests)
- provide the expression SingleEAttributeValueEqualityExpression
- provide the property View for it
- regenerate property view and remove useless custom datacontexts
- increase model and edit plugins from 1.0.0 to 1.1.0 (due to added classes).
- increase editor and properties plugin from 1.0.0 to 1.0.100 (just to indicate a regeneration and some changes which don't break API)
- create a EMF property view for EMF Expressions framework
- create new plugin org.eclipse.papyrus.emf.ui to group common code for EMF UI
Change-Id: I4a35a3f57009f0a8c27f78c83e4f9431e0394ec1
Signed-off-by: Vincent Lorenzo <vincent.lorenzo@cea.fr>
Diffstat (limited to 'tests')
2 files changed, 175 insertions, 4 deletions
diff --git a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/src/org/eclipse/papyrus/infra/emf/expressions/tests/AllTests.java b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/src/org/eclipse/papyrus/infra/emf/expressions/tests/AllTests.java index dbabf3419bb..9bcd69f1c15 100755 --- a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/src/org/eclipse/papyrus/infra/emf/expressions/tests/AllTests.java +++ b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/src/org/eclipse/papyrus/infra/emf/expressions/tests/AllTests.java @@ -1,6 +1,6 @@ /***************************************************************************** - * Copyright (c) 2017 CEA LIST and others. - * + * Copyright (c) 2017, 2019 CEA LIST and others. + * * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 * which accompanies this distribution, and is available at @@ -10,7 +10,7 @@ * * Contributors: * CEA LIST - Initial API and implementation - * + * *****************************************************************************/ package org.eclipse.papyrus.infra.emf.expressions.tests; @@ -26,7 +26,8 @@ import org.junit.runners.Suite.SuiteClasses; LiteralTrueExpressionTests.class, NotExpressionTests.class, OrExpressionTests.class, - ReferenceExpressionTests.class + ReferenceExpressionTests.class, + SingleEAttributeValueEqualityExpressionTests.class }) diff --git a/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/src/org/eclipse/papyrus/infra/emf/expressions/tests/SingleEAttributeValueEqualityExpressionTests.java b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/src/org/eclipse/papyrus/infra/emf/expressions/tests/SingleEAttributeValueEqualityExpressionTests.java new file mode 100755 index 00000000000..b6eb23d7e51 --- /dev/null +++ b/tests/junit/plugins/infra/emf/expressions/org.eclipse.papyrus.infra.emf.expressions.tests/src/org/eclipse/papyrus/infra/emf/expressions/tests/SingleEAttributeValueEqualityExpressionTests.java @@ -0,0 +1,170 @@ +/***************************************************************************** + * Copyright (c) 2019 CEA LIST and others. + * + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Eclipse Public License 2.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + * + * Contributors: + * Vincent Lorenzo (CEA LIST) vincent.lorenzo@cea.fr - Initial API and implementation + * + *****************************************************************************/ + +package org.eclipse.papyrus.infra.emf.expressions.tests; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EClass; +import org.eclipse.emf.ecore.EcoreFactory; +import org.eclipse.emf.ecore.EcorePackage; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.BooleanExpressionsFactory; +import org.eclipse.papyrus.infra.emf.expressions.booleanexpressions.SingleEAttributeValueEqualityExpression; +import org.junit.Assert; +import org.junit.Test; + +/** + * Junit tests for {@link SingleEAttributeValueEqualityExpression} + */ +@SuppressWarnings("nls") +public class SingleEAttributeValueEqualityExpressionTests { + + private EClass dummyObject = EcoreFactory.eINSTANCE.createEClass(); + + @Test + public void singleEAttributeEqualityExpression_Test1() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + Assert.assertFalse(exp.evaluate(null)); + } + + @Test + public void singleEAttributeEqualityExpression_Test2() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + Assert.assertFalse(exp.evaluate(dummyObject)); + } + + @Test + public void singleEAttributeEqualityExpression_Test3() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getEAnnotation_Source()); + Assert.assertFalse(exp.evaluate(dummyObject)); + } + + @Test + public void singleEAttributeEqualityExpression_Test4() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getEAnnotation_Source()); + exp.setExpectedValue("dummyValue"); + Assert.assertFalse(exp.evaluate(dummyObject)); + } + + @Test + public void singleEAttributeEqualityExpression_Test5() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getENamedElement_Name()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setName("niceName"); + exp.setExpectedValue(eClass.getName()); + Assert.assertTrue(exp.evaluate(eClass)); + } + + @Test + public void singleEAttributeEqualityExpression_Test6() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getENamedElement_Name()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setName("niceName"); + exp.setExpectedValue("anotherName"); + Assert.assertFalse(exp.evaluate(eClass)); + } + + /** + * tests for null string + */ + @Test + public void singleEAttributeEqualityExpression_Test7() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getENamedElement_Name()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setName(null); + exp.setExpectedValue(null); + Assert.assertTrue(exp.evaluate(eClass)); + } + + /** + * tests for empty string + */ + @Test + public void singleEAttributeEqualityExpression_Test8() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getENamedElement_Name()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setName(""); + exp.setExpectedValue(""); + Assert.assertTrue(exp.evaluate(eClass)); + } + + public void singleEAttributeEqualityExpression_Test9() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getEClass_Abstract()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setAbstract(true); + exp.setExpectedValue("true"); + Assert.assertTrue(exp.evaluate(eClass)); + } + + public void singleEAttributeEqualityExpression_Test10() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getEClass_Abstract()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setAbstract(true); + exp.setExpectedValue("TRUE"); + Assert.assertTrue(exp.evaluate(eClass)); + } + + public void singleEAttributeEqualityExpression_Test11() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getEClass_Abstract()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setAbstract(false); + exp.setExpectedValue("false"); + Assert.assertTrue(exp.evaluate(eClass)); + } + + public void singleEAttributeEqualityExpression_Test12() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getEClass_Abstract()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setAbstract(false); + exp.setExpectedValue("FALSE"); + Assert.assertTrue(exp.evaluate(eClass)); + } + + public void singleEAttributeEqualityExpression_Test13() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getEClass_Abstract()); + final EClass eClass = EcoreFactory.eINSTANCE.createEClass(); + eClass.setAbstract(false); + exp.setExpectedValue("dummyValue"); + Assert.assertFalse(exp.evaluate(eClass)); + } + + public void singleEAttributeEqualityExpression_Test14() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getETypedElement_LowerBound()); + final EAttribute eAttribute = EcoreFactory.eINSTANCE.createEAttribute(); + eAttribute.setLowerBound(2); + exp.setExpectedValue("2"); + Assert.assertTrue(exp.evaluate(eAttribute)); + } + + public void singleEAttributeEqualityExpression_Test15() { + final SingleEAttributeValueEqualityExpression exp = BooleanExpressionsFactory.eINSTANCE.createSingleEAttributeValueEqualityExpression(); + exp.setEAttribute(EcorePackage.eINSTANCE.getETypedElement_LowerBound()); + final EAttribute eAttribute = EcoreFactory.eINSTANCE.createEAttribute(); + eAttribute.setLowerBound(2); + exp.setExpectedValue("3"); + Assert.assertFalse(exp.evaluate(eAttribute)); + } +} |