Attachment 261510 Details for Bug 493136 – Invoke the Dot Attribute validation consistenly

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Invoke the Dot Attribute validation consistenly

493136-Invoke-the-Dot-Attribute-validation-consistenly.patch (text/plain), 17.11 KB, created by Tamas Miklossy

on 2016-05-06 08:58:27 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Tamas Miklossy

Created: 2016-05-06 08:58:27 EDT

Size: 17.11 KB

patch

obsolete

>diff --git a/org.eclipse.gef4.dot.tests/src/org/eclipse/gef4/dot/tests/DotAttributesTests.java b/org.eclipse.gef4.dot.tests/src/org/eclipse/gef4/dot/tests/DotAttributesTests.java
>index 55ab187..d067f75 100644
>--- a/org.eclipse.gef4.dot.tests/src/org/eclipse/gef4/dot/tests/DotAttributesTests.java
>+++ b/org.eclipse.gef4.dot.tests/src/org/eclipse/gef4/dot/tests/DotAttributesTests.java
>@@ -263,9 +263,7 @@
> 			fail("Expecting IllegalArgumentException.");
> 		} catch (IllegalArgumentException e) {
> 			assertEquals(
>-					// TODO: remove unnecessary period at the end of the error
>-					// message
>-					"Cannot set edge attribute 'dir' to 'foo'. The value 'foo' is not a syntactically correct dirType: Value has to be one of 'forward', 'back', 'both', 'none'..",
>+					"Cannot set edge attribute 'dir' to 'foo'. The value 'foo' is not a syntactically correct dirType: Value has to be one of 'forward', 'back', 'both', 'none'.",
> 					e.getMessage());
> 		}
> 	}
>@@ -645,7 +643,15 @@
> 		assertEquals(validGraphForceLabelsParsed,
> 				DotAttributes.getForceLabelsParsed(g));
> 
>-		// TODO: add test cases for setting invalid graph forcelabels
>+		// set invalid string values
>+		try {
>+			DotAttributes.setForceLabels(g, "foo");
>+			fail("Expecting IllegalArgumentException.");
>+		} catch (IllegalArgumentException e) {
>+			assertEquals(
>+					"Cannot set graph attribute 'forcelabels' to 'foo'. The value 'foo' is not a syntactically correct bool: The given value 'foo' does not (case-insensitively) equal 'true', 'yes', 'false', or 'no' and is also not parsable as an integer value.",
>+					e.getMessage());
>+		}
> 	}
> 
> 	@Test
>@@ -909,6 +915,58 @@
> 	}
> 
> 	@Test
>+	public void node_distortion() {
>+		Node n = new Node.Builder().buildNode();
>+
>+		// set valid string values
>+		String validNodeDistortion = "5";
>+		DotAttributes.setDistortion(n, validNodeDistortion);
>+		assertEquals(validNodeDistortion, DotAttributes.getDistortion(n));
>+		assertEquals(5.0, DotAttributes.getDistortionParsed(n).doubleValue(),
>+				0.0);
>+
>+		// set the minimum valid value
>+		validNodeDistortion = "-100.0";
>+		DotAttributes.setDistortion(n, validNodeDistortion);
>+		assertEquals(validNodeDistortion, DotAttributes.getDistortion(n));
>+		assertEquals(-100.0, DotAttributes.getDistortionParsed(n).doubleValue(),
>+				0.0);
>+
>+		// set valid parsed values
>+		Double validNodeDistortionParsed = 10.0;
>+		DotAttributes.setDistortionParsed(n, validNodeDistortionParsed);
>+		assertEquals("10.0", DotAttributes.getDistortion(n));
>+		assertEquals(validNodeDistortionParsed,
>+				DotAttributes.getDistortionParsed(n));
>+
>+		validNodeDistortionParsed = 9.9;
>+		DotAttributes.setDistortionParsed(n, validNodeDistortionParsed);
>+		assertEquals("9.9", DotAttributes.getDistortion(n));
>+		assertEquals(validNodeDistortionParsed,
>+				DotAttributes.getDistortionParsed(n));
>+
>+		// set syntactically invalid values
>+		try {
>+			DotAttributes.setDistortion(n, "42x");
>+			fail("Expecting IllegalArgumentException.");
>+		} catch (IllegalArgumentException e) {
>+			assertEquals(
>+					"Cannot set node attribute 'distortion' to '42x'. The value '42x' is not a syntactically correct double: For input string: \"42x\".",
>+					e.getMessage());
>+		}
>+
>+		// set syntactically correct, but semantically invalid values
>+		try {
>+			DotAttributes.setDistortion(n, "-100.01");
>+			fail("Expecting IllegalArgumentException.");
>+		} catch (IllegalArgumentException e) {
>+			assertEquals(
>+					"Cannot set node attribute 'distortion' to '-100.01'. The double value '-100.01' is not semantically correct: Value may not be smaller than -100.0.",
>+					e.getMessage());
>+		}
>+	}
>+
>+	@Test
> 	public void graph_type() {
> 		Graph g = new Graph.Builder().build();
> 
>@@ -927,7 +985,7 @@
> 			fail("Expecting IllegalArgumentException.");
> 		} catch (IllegalArgumentException e) {
> 			assertEquals(
>-					"Cannot set graph attribute \"type\" to \"foo\"; supported values: graph, digraph",
>+					"Cannot set graph attribute 'type' to 'foo'. The type value 'foo' is not semantically correct: Value should be one of 'graph', 'digraph'.",
> 					e.getMessage());
> 		}
> 	}
>diff --git a/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotAttributes.java b/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotAttributes.java
>index d841bf3..1562aa4 100644
>--- a/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotAttributes.java
>+++ b/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotAttributes.java
>@@ -328,9 +328,10 @@
> 	public static void _setType(Graph graph, String type) {
> 		if (!_TYPE__G__GRAPH.equals(type) && !_TYPE__G__DIGRAPH.equals(type)) {
> 			throw new IllegalArgumentException(
>-					"Cannot set graph attribute \"type\" to \"" + type
>-							+ "\"; supported values: " + _TYPE__G__GRAPH + ", "
>-							+ _TYPE__G__DIGRAPH);
>+					"Cannot set graph attribute 'type' to '" + type
>+							+ "'. The type value 'foo' is not semantically correct: Value should be one of '"
>+							+ _TYPE__G__GRAPH + "', '" + _TYPE__G__DIGRAPH
>+							+ "'.");
> 		}
> 		graph.attributesProperty().put(_TYPE__G, type);
> 	}
>@@ -504,7 +505,7 @@
> 	 * {@link Node}.
> 	 */
> 	public static String getFixedSize(Node node) {
>-		return (String) node.getAttributes().get(FIXEDSIZE__N);
>+		return (String) node.attributesProperty().get(FIXEDSIZE__N);
> 	}
> 
> 	/**
>@@ -533,7 +534,7 @@
> 	 * {@link Graph}.
> 	 */
> 	public static String getForceLabels(Graph graph) {
>-		return (String) graph.getAttributes().get(FORCELABELS__G);
>+		return (String) graph.attributesProperty().get(FORCELABELS__G);
> 	}
> 
> 	/**
>@@ -1215,6 +1216,8 @@
> 	 * {@link #ARROWHEAD__E} property.
> 	 * @param arrowHead
> 	 * The new value for the {@link #ARROWHEAD__E} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given arrowHead value is not supported.
> 	 */
> 	public static void setArrowHead(Edge edge, String arrowHead) {
> 		validate(AttributeContext.EDGE, ARROWHEAD__E, arrowHead);
>@@ -1230,6 +1233,8 @@
> 	 * {@link #ARROWHEAD__E} property.
> 	 * @param arrowHeadParsed
> 	 * The new value for the {@link #ARROWHEAD__E} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given arrowHeadParsed value is not supported.
> 	 */
> 	public static void setArrowHeadParsed(Edge edge,
> 			ArrowType arrowHeadParsed) {
>@@ -1314,6 +1319,8 @@
> 	 * {@link #DIR__E} property.
> 	 * @param dir
> 	 * The new value for the {@link #DIR__E} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given dir value is not supported.
> 	 */
> 	public static void setDir(Edge edge, String dir) {
> 		validate(AttributeContext.EDGE, DIR__E, dir);
>@@ -1329,6 +1336,8 @@
> 	 * {@link #DIR__E} property.
> 	 * @param dirParsed
> 	 * The new value for the {@link #DIR__E} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given dirParsed value is not supported.
> 	 */
> 	public static void setDirParsed(Edge edge, DirType dirParsed) {
> 		setDir(edge, dirParsed.toString());
>@@ -1343,6 +1352,8 @@
> 	 * {@link #DISTORTION__N} property.
> 	 * @param distortion
> 	 * The new value for the {@link #DISTORTION__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given distortion value is not supported.
> 	 */
> 	public static void setDistortion(Node node, String distortion) {
> 		validate(AttributeContext.NODE, DISTORTION__N, distortion);
>@@ -1358,6 +1369,9 @@
> 	 * {@link #DISTORTION__N} property.
> 	 * @param distortionParsed
> 	 * The new value for the {@link #DISTORTION__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given distortionParsed value is not
>+	 * supported.
> 	 */
> 	public static void setDistortionParsed(Node node, Double distortionParsed) {
> 		setDistortion(node, distortionParsed.toString());
>@@ -1374,7 +1388,7 @@
> 	 * The new value for the {@link #FIXEDSIZE__N} property.
> 	 */
> 	public static void setFixedSize(Node node, String fixedSize) {
>-		node.getAttributes().put(FIXEDSIZE__N, fixedSize);
>+		node.attributesProperty().put(FIXEDSIZE__N, fixedSize);
> 	}
> 
> 	/**
>@@ -1400,9 +1414,12 @@
> 	 * {@link #FORCELABELS__G} property.
> 	 * @param forceLabels
> 	 * The new value for the {@link #FORCELABELS__G} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given forceLabels value is not supported.
> 	 */
> 	public static void setForceLabels(Graph graph, String forceLabels) {
>-		graph.getAttributes().put(FORCELABELS__G, forceLabels);
>+		validate(AttributeContext.GRAPH, FORCELABELS__G, forceLabels);
>+		graph.attributesProperty().put(FORCELABELS__G, forceLabels);
> 	}
> 
> 	/**
>@@ -1414,6 +1431,9 @@
> 	 * {@link #FORCELABELS__G} property.
> 	 * @param forceLabelsParsed
> 	 * The new value for the {@link #FORCELABELS__G} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given forceLabelsParsed value is not
>+	 * supported.
> 	 */
> 	public static void setForceLabelsParsed(Graph graph,
> 			Boolean forceLabelsParsed) {
>@@ -1472,10 +1492,12 @@
> 	 * {@link #HEIGHT__N} property.
> 	 * @param height
> 	 * The new value for the {@link #HEIGHT__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given height value is not supported.
> 	 */
> 	public static void setHeight(Node node, String height) {
> 		validate(AttributeContext.NODE, HEIGHT__N, height);
>-		node.getAttributes().put(HEIGHT__N, height);
>+		node.attributesProperty().put(HEIGHT__N, height);
> 	}
> 
> 	/**
>@@ -1487,6 +1509,8 @@
> 	 * {@link #HEIGHT__N} property.
> 	 * @param heightParsed
> 	 * The new value for the {@link #HEIGHT__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given heightParsed value is not supported.
> 	 */
> 	public static void setHeightParsed(Node node, Double heightParsed) {
> 		setHeight(node, heightParsed.toString());
>@@ -1603,6 +1627,8 @@
> 	 * {@link #LAYOUT__G} property.
> 	 * @param layoutParsed
> 	 * The new value for the {@link #LAYOUT__G} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given layoutParsed value is not supported.
> 	 */
> 	public static void setLayoutParsed(Graph graph, Layout layoutParsed) {
> 		setLayout(graph, layoutParsed.toString());
>@@ -1645,10 +1671,12 @@
> 	 * {@link #POS__NE} property.
> 	 * @param pos
> 	 * The new value for the {@link #POS__NE} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given pos value is not supported.
> 	 */
> 	public static void setPos(Edge edge, String pos) {
> 		validate(AttributeContext.EDGE, POS__NE, pos);
>-		edge.getAttributes().put(POS__NE, pos);
>+		edge.attributesProperty().put(POS__NE, pos);
> 	}
> 
> 	/**
>@@ -1660,10 +1688,12 @@
> 	 * {@link #POS__NE} property.
> 	 * @param pos
> 	 * The new value for the {@link #POS__NE} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given pos value is not supported.
> 	 */
> 	public static void setPos(Node node, String pos) {
> 		validate(AttributeContext.NODE, POS__NE, pos);
>-		node.getAttributes().put(POS__NE, pos);
>+		node.attributesProperty().put(POS__NE, pos);
> 	}
> 
> 	/**
>@@ -1675,6 +1705,8 @@
> 	 * {@link #POS__NE} property.
> 	 * @param posParsed
> 	 * The new value for the {@link #POS__NE} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given posParsed value is not supported.
> 	 */
> 	public static void setPosParsed(Edge edge, SplineType posParsed) {
> 		setPos(edge,
>@@ -1690,6 +1722,8 @@
> 	 * {@link #POS__NE} property.
> 	 * @param posParsed
> 	 * The new value for the {@link #POS__NE} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given posParsed value is not supported.
> 	 */
> 	public static void setPosParsed(Node node, Point posParsed) {
> 		setPos(node, serialize(DotLanguageSupport.POINT_SERIALIZER, posParsed));
>@@ -1704,6 +1738,8 @@
> 	 * {@link #RANKDIR__G} property.
> 	 * @param rankdir
> 	 * The new value for the {@link #RANKDIR__G} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given rankdir value is not supported.
> 	 */
> 	public static void setRankdir(Graph graph, String rankdir) {
> 		validate(AttributeContext.GRAPH, RANKDIR__G, rankdir);
>@@ -1719,6 +1755,8 @@
> 	 * {@link #RANKDIR__G} property.
> 	 * @param rankdirParsed
> 	 * The new value for the {@link #RANKDIR__G} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given rankdirParsed value is not supported.
> 	 */
> 	public static void setRankdirParsed(Graph graph, Rankdir rankdirParsed) {
> 		setRankdir(graph, rankdirParsed.toString());
>@@ -1733,6 +1771,8 @@
> 	 * {@link #SHAPE__N} property.
> 	 * @param shape
> 	 * The new value for the {@link #SHAPE__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given shape value is not supported.
> 	 */
> 	public static void setShape(Node node, String shape) {
> 		validate(AttributeContext.NODE, SHAPE__N, shape);
>@@ -1748,6 +1788,8 @@
> 	 * {@link #SHAPE__N} property.
> 	 * @param shapeParsed
> 	 * The new value for the {@link #SHAPE__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given shapeParsed value is not supported.
> 	 */
> 	public static void setShapeParsed(Node node, Shape shapeParsed) {
> 		setShape(node,
>@@ -1763,6 +1805,8 @@
> 	 * {@link #SIDES__N} property.
> 	 * @param sides
> 	 * The new value for the {@link #SIDES__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given sides value is not supported.
> 	 */
> 	public static void setSides(Node node, String sides) {
> 		validate(AttributeContext.NODE, SIDES__N, sides);
>@@ -1778,6 +1822,8 @@
> 	 * {@link #SIDES__N} property.
> 	 * @param sidesParsed
> 	 * The new value for the {@link #SIDES__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given sidesParsed value is not supported.
> 	 */
> 	public static void setSidesParsed(Node node, Integer sidesParsed) {
> 		setSides(node, sidesParsed.toString());
>@@ -1792,6 +1838,8 @@
> 	 * {@link #SKEW__N} property.
> 	 * @param skew
> 	 * The new value for the {@link #SKEW__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given skew value is not supported.
> 	 */
> 	public static void setSkew(Node node, String skew) {
> 		validate(AttributeContext.NODE, SKEW__N, skew);
>@@ -1807,6 +1855,8 @@
> 	 * {@link #SKEW__N} property.
> 	 * @param skewParsed
> 	 * The new value for the {@link #SKEW__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given skewParsed value is not supported.
> 	 */
> 	public static void setSkewParsed(Node node, Double skewParsed) {
> 		setSkew(node, skewParsed.toString());
>@@ -1838,6 +1888,8 @@
> 	 * {@link #SPLINES__G} property.
> 	 * @param splinesParsed
> 	 * The new value for the {@link #SPLINES__G} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given splinesParsed value is not supported.
> 	 */
> 	public static void setSplinesParsed(Graph graph, Splines splinesParsed) {
> 		setSplines(graph, splinesParsed.toString());
>@@ -1886,6 +1938,8 @@
> 	 * {@link #STYLE__E} property.
> 	 * @param styleParsed
> 	 * The new value for the {@link #STYLE__E} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given styleParsed value is not supported.
> 	 */
> 	public static void setStyleParsed(Edge edge, Style styleParsed) {
> 		setStyle(edge,
>@@ -1961,10 +2015,12 @@
> 	 * {@link #WIDTH__N} property.
> 	 * @param width
> 	 * The new value for the {@link #WIDTH__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given width value is not supported.
> 	 */
> 	public static void setWidth(Node node, String width) {
> 		validate(AttributeContext.NODE, WIDTH__N, width);
>-		node.getAttributes().put(WIDTH__N, width);
>+		node.attributesProperty().put(WIDTH__N, width);
> 	}
> 
> 	/**
>@@ -1976,6 +2032,8 @@
> 	 * {@link #WIDTH__N} property.
> 	 * @param widthParsed
> 	 * The new value for the {@link #WIDTH__N} property.
>+	 * @throws IllegalArgumentException
>+	 * when the given widthParsed value is not supported.
> 	 */
> 	public static void setWidthParsed(Node node, Double widthParsed) {
> 		setWidth(node, widthParsed.toString());
>diff --git a/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotLanguageSupport.java b/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotLanguageSupport.java
>index 704892f..4786050 100644
>--- a/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotLanguageSupport.java
>+++ b/org.eclipse.gef4.dot/src/org/eclipse/gef4/dot/internal/DotLanguageSupport.java
>@@ -160,8 +160,7 @@
> 					Collections.<Diagnostic> singletonList(new BasicDiagnostic(
> 							Diagnostic.ERROR, rawValue, -1,
> 							"Value has to be one of "
>-									+ getFormattedValues(DirType.values())
>-									+ ".",
>+									+ getFormattedValues(DirType.values()),
> 							new Object[] {})));
> 		}
> 	};

Actions: View | Diff

Attachments on bug 493136: 261510 | 261511 | 261535 | 261562 | 261603 | 261698 | 261715