Attachment #261562 for bug #493136

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

Lines 3-8 Link Here

(-)a/org.eclipse.gef4.dot.tests/.classpath (+1 lines)
3	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>	3	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
4	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	4	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5	<classpathentry kind="src" path="src"/>	5	<classpathentry kind="src" path="src"/>
		6	<classpathentry kind="src" path="xtend-gen"/>
6	<classpathentry kind="src" path="src-gen"/>	7	<classpathentry kind="src" path="src-gen"/>
7	<classpathentry kind="output" path="bin"/>	8	<classpathentry kind="output" path="bin"/>
8	</classpath>	9	</classpath>

Lines 1-2 Link Here

(-)a/org.eclipse.gef4.dot.tests/.gitignore (-1 / +2 lines)
1	/output/	1	/output/
2	/src-gen/	2	/src-gen/
		3	/xtend-gen/

Lines 6-11 Link Here

(-)a/org.eclipse.gef4.dot.tests/.project (+6 lines)
6	</projects>	6	</projects>
7	<buildSpec>	7	<buildSpec>
8	<buildCommand>	8	<buildCommand>
		9	<name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
		10	<arguments>
		11	</arguments>
		12	</buildCommand>
		13	<buildCommand>
9	<name>org.eclipse.jdt.core.javabuilder</name>	14	<name>org.eclipse.jdt.core.javabuilder</name>
10	<arguments>	15	<arguments>
11	</arguments>	16	</arguments>
Lines 25-29 Link Here
25	<nature>org.eclipse.pde.PluginNature</nature>	30	<nature>org.eclipse.pde.PluginNature</nature>
26	<nature>org.eclipse.jdt.core.javanature</nature>	31	<nature>org.eclipse.jdt.core.javanature</nature>
27	<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>	32	<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
		33	<nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
28	</natures>	34	</natures>
29	</projectDescription>	35	</projectDescription>




###############################################################################
# Copyright (c) 2015, 2016 itemis AG and others.
# 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

#
# Contributors:
#     Alexander Ny�en (itemis AG) - initial API and implementation
#     Tamas Miklossy  (itemis AG) - add xtend-gen to the source folders
###############################################################################
source.. = src/,\
           src-gen/,\
           xtend-gen/
output.. = bin/
bin.includes = META-INF/,\
               .




		<sourceDirectory>src</sourceDirectory>
		<plugins>
			<plugin>
				<artifactId>maven-clean-plugin</artifactId>
				<version>${maven-clean-plugin.version}</version>
				<executions>
					<execution>
						<id>gen-clean</id>
						<phase>clean</phase>
						<configuration>
							<filesets combine.children="append">
								<fileset>
									<directory>${basedir}/xtend-gen/</directory>
								</fileset>
							</filesets>
						</configuration>
					</execution>
				</executions>
			</plugin>
			<plugin>
                <groupId>org.eclipse.xtend</groupId>
                <artifactId>xtend-maven-plugin</artifactId>
                <version>${xtext.version}</version>
                <executions>
                    <execution>
                        <goals>
                            <goal>compile</goal>
                        </goals>
                    </execution>
                </executions>
                <configuration>
					<encoding>${project.build.sourceEncoding}</encoding>
					<outputDirectory>xtend-gen</outputDirectory>
				</configuration>
            </plugin>
			<plugin>
				<groupId>org.eclipse.tycho</groupId>
				<artifactId>tycho-surefire-plugin</artifactId>
			</plugin>





	@Test
	public void digraphType() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.TWO_NODES_ONE_DIRECTED_EDGE))
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(DotAttributes._TYPE__G__DIGRAPH,


	@Test
	public void graphType() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.TWO_NODES_ONE_EDGE)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(DotAttributes._TYPE__G__GRAPH,
				DotAttributes._getType(graph));


	@Test
	public void nodeDefaultLabel() {
		Graph graph = interpreter.interpret(parse(DotSampleGraphs.ONE_NODE))
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("1", //$NON-NLS-1$
				DotAttributes._getName(graph.getNodes().get(0)));


	@Test
	public void nodeCount() {
		Graph graph = interpreter.interpret(parse(DotSampleGraphs.TWO_NODES))
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(2, graph.getNodes().size());
	}

	@Test
	public void edgeCount() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.TWO_NODES_AND_THREE_EDGES))
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(3, graph.getEdges().size());
	}

	@Test
	public void nodeLabel() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.NODE_LABEL_LOCAL)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("Node1", //$NON-NLS-1$
				DotAttributes.getLabel(graph.getNodes().get(0)));

	@Test
	public void edgeLabel() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.EDGE_LABEL_LOCAL)).get(0);
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("Edge1", DotAttributes.getLabel(graph.getEdges() //$NON-NLS-1$
				.get(0)));

	@Test
	public void edgeStyle() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.EDGE_STYLE_LOCAL)).get(0);
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(EdgeStyle.DASHED.toString(),
				DotAttributes.getStyle(graph.getEdges().get(0)));

	@Test
	public void globalEdgeStyle() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.EDGE_STYLE_GLOBAL)).get(0);
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(EdgeStyle.DASHED.toString(),
				DotAttributes.getStyle(graph.getEdges().get(0)));

	@Test
	public void globalEdgeLabel() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.EDGE_LABEL_GLOBAL)).get(0);
						parse("graph Sample{edge[label=\"Edge1\"];1;2;1--2}")) //$NON-NLS-1$
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("Edge1", DotAttributes.getLabel(graph.getEdges() //$NON-NLS-1$
				.get(0)));

	@Test
	public void globalNodeLabel() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.NODE_LABEL_GLOBAL)).get(0);
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("Node1", //$NON-NLS-1$
				DotAttributes.getLabel(graph.getNodes().get(0)));

	@Test
	public void layoutSpring() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.GRAPH_LAYOUT_FDP)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(Layout.FDP.toString(),
				DotAttributes.getLayout(graph));

	@Test
	public void layoutGrid() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.GRAPH_LAYOUT_OSAGE)).get(0);
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(Layout.OSAGE.toString(),
				DotAttributes.getLayout(graph));

	@Test
	public void layoutRadial() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.GRAPH_LAYOUT_TWOPI)).get(0);
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(Layout.TWOPI.toString(),
				DotAttributes.getLayout(graph));

	@Test
	public void layoutTree() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.GRAPH_LAYOUT_DOT)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(Layout.DOT.toString(),
				DotAttributes.getLayout(graph));

	@Test
	public void layoutHorizontalTreeViaLayout() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.GRAPH_LAYOUT_DOT_HORIZONTAL))
						parse("graph Sample{graph[layout=dot];rankdir=LR;1;}")) //$NON-NLS-1$
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(Layout.DOT.toString(),

	@Test
	public void layoutHorizontalTreeViaAttribute() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.GRAPH_RANKDIR_LR)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(Rankdir.LR, DotAttributes.getRankdirParsed(graph));
	}

	@Test
	public void globalNodeAttributeAdHocNodes() {
		Graph graph = interpreter
				.interpret(
						parse(DotSampleGraphs.GLOBAL_NODE_LABEL_AD_HOC_NODES))
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("TEXT", //$NON-NLS-1$
				DotAttributes.getLabel(graph.getNodes().get(0)));

	@Test
	public void globalEdgeAttributeAdHocNodes() {
		Graph graph = interpreter
				.interpret(
						parse(DotSampleGraphs.GLOBAL_EDGE_LABEL_AD_HOC_NODES))
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("TEXT", DotAttributes.getLabel(graph.getEdges() //$NON-NLS-1$
				.get(0)));

	@Test
	public void headerCommentGraph() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.HEADER_COMMENT)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(2, graph.getNodes().size());
		Assert.assertEquals(1, graph.getEdges().size());

	@Test
	public void nodesBeforeEdges() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.NODES_BEFORE_EDGES)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(4, graph.getNodes().size());
		Assert.assertEquals(3, graph.getEdges().size());

	@Test
	public void nodesAfterEdges() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.NODES_AFTER_EDGES)).get(0);
						parse("graph{1--2;2--3;2--4;1[label=\"node\"];2;3;4}")) //$NON-NLS-1$
				.get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(4, graph.getNodes().size());
		Assert.assertEquals(3, graph.getEdges().size());


	@Test
	public void useInterpreterTwice() {
		String dot = DotSampleGraphs.NODES_AFTER_EDGES;
		Graph graph = interpreter.interpret(parse(dot)).get(0);
		graph = interpreter.interpret(parse(dot)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$


	@Test
	public void idsWithQuotes() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.IDS_WITH_QUOTES)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		List<Node> list = graph.getNodes();
		Assert.assertEquals("node 1", //$NON-NLS-1$


	@Test
	public void escapedQuotes() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.ESCAPED_QUOTES_LABEL)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("node \"1\"", //$NON-NLS-1$
				DotAttributes.getLabel(graph.getNodes().get(0)));


	@Test
	public void fullyQuoted() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.FULLY_QUOTED_IDS)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals(2, graph.getNodes().size());
		Assert.assertEquals(1, graph.getEdges().size());


	@Test
	public void labelsWithQuotes() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.QUOTED_LABELS)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		List<Node> list = graph.getNodes();
		Assert.assertEquals("node 1", //$NON-NLS-1$


	@Test
	public void newLinesInLabels() {
		Graph graph = interpreter
				.interpret(parse(DotSampleGraphs.NEW_LINES_IN_LABELS)).get(0);
		Assert.assertNotNull("Created graph must not be null", graph); //$NON-NLS-1$
		Assert.assertEquals("node" + System.lineSeparator() + "1", //$NON-NLS-1$
				DotAttributes.getLabel(graph.getNodes().get(0)));
	}

	@Test
	public void multiEdgeStatements() {
		Graph graph = new DotImport()
				.importDot(DotSampleGraphs.MULTI_EDGE_STATEMENTS);
		assertEquals(4, graph.getNodes().size());
		assertEquals(3, graph.getEdges().size());
		/* Each node should be connected to one other, the previous node: */

	@Test
	/* see http://www.graphviz.org/doc/info/attrs.html#d:style */
	public void edgeStyleInvis() {
		Graph graph = new DotImport()
				.importDot(DotSampleGraphs.EDGE_STYLE_INVIS);
		assertEquals(2, graph.getNodes().size());
		assertEquals(1, graph.getEdges().size());
	}





	@Test
	public void testEmptyGraph() {
		testString(DotSampleGraphs.EMPTY);
	}

	@Test
	public void testEmptyDirectedGraph() {
		testString(DotSampleGraphs.EMPTY_DIRECTED);
	}

	@Test
	public void testEmptyStrictGraph() {
		testString(DotSampleGraphs.EMPTY_STRICT);
	}

	@Test
	public void testEmptyStrictDirectedGraph() {
		testString(DotSampleGraphs.EMPTY_STRICT_DIRECTED);
	}

	@Test
	public void testGraphWithOneNode() {
		testString(DotSampleGraphs.ONE_NODE);
	}

	@Test
	public void testGraphWithOneNodeAndEmptyNodeAttributeList() {
		testString(DotSampleGraphs.EMPTY_NODE_ATTRIBUTE_LIST);
	}

	@Test
	public void testGraphWithOneEdge() {
		testString(DotSampleGraphs.ONE_EDGE);
	}

	@Test
	public void testDirectedGraphWithOneEdge() {
		testString(DotSampleGraphs.ONE_DIRECTED_EDGE);
	}

	@Test
	public void testGraphWithOneEdgeAndEmptyEdgeAttributeList() {
		testString(DotSampleGraphs.EMPTY_EDGE_ATTRIBUTE_LIST);
	}

	@Test
	public void testDirectedGraphWithOneEdgeAndEmptyEdgeAttributeList() {
		testString(DotSampleGraphs.EMPTY_DIRECTED_EDGE_ATTRIBUTE_LIST);
	}

	@Test
	public void testGraphWithEmptyGraphAttributeStatement() {
		testString(DotSampleGraphs.EMPTY_GRAPH_ATTRIBUTE_STATEMENT);
	}

	@Test
	public void testGraphWithEmptyNodeAttributeStatement() {
		testString(DotSampleGraphs.EMPTY_NODE_ATTRIBUTE_STATEMENT);
	}

	@Test
	public void testGraphWithEmptyEdgeAttributeStatement() {
		testString(DotSampleGraphs.EMPTY_EDGE_ATTRIBUTE_STATEMENT);
	}

	@Test
	public void testArrowShapesSingle() {
		testFile("arrowshapes_single.dot");
	}

	@Test
	public void testArrowShapesMultiple() {
		testFile("arrowshapes_multiple.dot");
	}

	@Test

	}

	@Test
	public void testArrowShapesDirectionBoth() {
		testFile("arrowshapes_direction_both.dot");
	}


	}

	@Test
	public void testArrowShapesMultiple() {
		testFile("arrowshapes_multiple.dot");
	}

	@Test
	public void testArrowShapesSingle() {
		testFile("arrowshapes_single.dot");
	}

	@Test
	public void testAttributesGraph() {
		testFile("attributes_graph.dot");
	}

	@Test
	public void testBasicDirectedGraph() {
		testFile("basic_directed_graph.dot");
	}

	@Test
	public void testGlobalEdgeGraph() {
		testFile("global_edge_graph.dot");
	}

	@Test
	public void testGlobalNodeGraph() {
		testFile("global_node_graph.dot");
	}

	@Test
	public void testIdMatchesKeyword() {
		testFile("id_matches_keyword.dot");
	}

	@Test
	public void testLabeledGraph() {
		testFile("labeled_graph.dot");
	}

	@Test
	public void testLayoutGridGraph() {
		testFile("layout_grid_graph.dot");
	}

	@Test
	public void testLayoutRadialGraph() {
		testFile("layout_radial_graph.dot");
	}

	@Test
	public void testLayoutSpringGraph() {
		testFile("layout_spring_graph.dot");
	}

	@Test
	public void testLayoutTreeGraph() {
		testFile("layout_tree_graph.dot");
	}

	@Test
	public void testNodeShapesPolygonBased() {
		testFile("nodeshapes_polygon_based.dot");
	}

	@Test
	public void testNodeGroups() {
		testFile("node_groups.dot");
	}

	@Test
	public void testSampleInput() {
		testFile("sample_input.dot");
	}

	@Test
	public void testSimpleDigraph() {
		testFile("simple_digraph.dot");
	}

	@Test
	public void testSimpleGraph() {
		testFile("simple_graph.dot");
	}

	@Test
	public void testStyledGraph() {
		testFile("styled_graph.dot");
	}




/*******************************************************************************
 * Copyright (c) 2016 itemis AG and others.
 *
 * 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:
 *     Tamas Miklossy (itemis AG) - initial API and implementation
 *******************************************************************************/

package org.eclipse.gef4.dot.tests

class DotSampleGraphs {
	
	public static val EMPTY = '''
		graph {}
	'''
	
	public static val EMPTY_DIRECTED = '''
		digraph {}
	'''
	
	public static val EMPTY_STRICT = '''
		strict graph {}
	'''
	
	public static val EMPTY_STRICT_DIRECTED = '''
		strict digraph {}
	'''
	
	public static val ONE_NODE = '''
		graph {
			1
		}
	'''
	
	public static val TWO_NODES = '''
		graph {
			1
			2
		}
	'''
	
	public static val ONE_EDGE = '''
		graph {
			1--2
		}
	'''	
	
	public static val ONE_DIRECTED_EDGE = '''
		digraph {
			1->2
		}
	'''

	public static val TWO_EDGES = '''
		graph {
			1--2
			3--4
		}
	'''	
	
	public static val TWO_NODES_ONE_EDGE = '''
		graph {
			1;2;
			1--2
		}
	'''
	
	public static val TWO_NODES_ONE_DIRECTED_EDGE = '''
		digraph {
			1;2;
			1->2
		}
	'''	
	
	public static val TWO_NODES_AND_THREE_EDGES = '''
		graph {
			1;2
			1--2
			2--2
			1--1
		}
	'''
	
	public static val EMPTY_NODE_ATTRIBUTE_LIST = '''
		graph {
			1[]
		}
	'''
	
	public static val EMPTY_EDGE_ATTRIBUTE_LIST = '''
		graph {
			1--2[]
		}
	'''
	
	public static val EMPTY_DIRECTED_EDGE_ATTRIBUTE_LIST = '''
		digraph {
			1->2[]
		}
	'''
	
	public static val EMPTY_GRAPH_ATTRIBUTE_STATEMENT = '''
		graph {
			graph[]
		}
	'''
	
	public static val EMPTY_NODE_ATTRIBUTE_STATEMENT = '''
		graph {
			node[]
		}
	'''
	
	public static val EMPTY_EDGE_ATTRIBUTE_STATEMENT = '''
		graph {
			edge[]
		}
	'''	

	public static val ESCAPED_QUOTES_LABEL = '''
		graph {
			n1[label="node \"1\""]
		}
	'''
	
	public static val FULLY_QUOTED_IDS = '''
		graph {
			"n1"
			"n2"
			"n1"--"n2"
		}
	'''
	
	public static val GLOBAL_EDGE_LABEL_AD_HOC_NODES = '''
		graph {
			edge[label="TEXT"]
			1--2
		}
	'''
	
	public static val GLOBAL_NODE_LABEL_AD_HOC_NODES = '''
		graph {
			node[label="TEXT"]
			1--2
		}
	'''
	
	public static val GRAPH_LAYOUT_DOT_HORIZONTAL = '''
		graph {
			graph[layout=dot]
			rankdir=LR
			1
		}
	'''
	
	public static val HEADER_COMMENT = '''
		/*A header comment*/
		graph {
			1--2
		}
	'''

	public static val IDS_WITH_QUOTES = '''
		graph {
			"node 1"
			"node 2"
		}
	'''
	
	public static val MULTI_EDGE_STATEMENTS = '''
		digraph {
			1->2->3->4
		}
	'''
	
	public static val NEW_LINES_IN_LABELS = '''
		graph {
			n1[label=
		"node
		1"]}
	'''

	public static val NODES_AFTER_EDGES = '''
		graph {
			1--2
			2--3
			2--4
			1[label="node"]
			2
			3
			4
		}
	'''

	public static val NODES_BEFORE_EDGES = '''
		graph {
			1;2;3;4
			1--2
			2--3
			2--4
		}
	'''
	
	public static val QUOTED_LABELS = '''
		graph {
			n1[label="node 1"]
			n2[label="node 2"]
			n1--n2[label="edge 1"]
		}
	'''
	
	
/*
 ************************************************************************************************************
 * Sample dot graphs with different dot attribute valid values
 ************************************************************************************************************
 */

	public static val GRAPH_LAYOUT_DOT = '''
		graph {
			graph[layout=dot]
			1
		}
	'''
	
	public static val GRAPH_LAYOUT_FDP = '''
		graph {
			graph[layout=fdp]
			1
		}
	'''	
	
	public static val GRAPH_LAYOUT_OSAGE = '''
		graph {
			graph[layout=osage]
			1
		}
	'''
	
	public static val GRAPH_LAYOUT_TWOPI = '''
		graph {
			graph[layout=twopi]
			1
		}
	''' 
	
	public static val GRAPH_RANKDIR_LR = '''
		graph {
			rankdir=LR
			1
		}
	'''
			
	public static val EDGE_STYLE_INVIS = '''
		digraph {
			1->2[style=invis]
		}
	'''	

/*
 ************************************************************************************************************
 * Sample dot graphs with local/global/override dot attributes
 ************************************************************************************************************
 */
	
	public static val NODE_LABEL_LOCAL = '''
		graph {
			1[label="Node1"]
		}
	'''
	
	public static val NODE_LABEL_GLOBAL = '''
		graph {
			node[label="Node1"]
			1
		}
	'''	
	
	public static val EDGE_LABEL_LOCAL = '''
		graph {
			1;2;
			1--2[label="Edge1"]
		}
	'''
	
	public static val EDGE_LABEL_GLOBAL = '''
		graph {
			edge[label="Edge1"]
			1;2
			1--2
		}
	'''
	
	public static val EDGE_STYLE_GLOBAL = '''
		graph {
			edge[style=dashed]
			1;2
			1--2
		}
	'''
	
	public static val EDGE_STYLE_LOCAL = '''
		graph {
			1;2;
			1->2[style=dashed]
		}
	'''
}

Return to bug 493136

Lines 56-122 Link Here

(-)a/org.eclipse.gef4.dot.tests/src/org/eclipse/gef4/dot/tests/DotParserTests.java (-23 / +103 lines)
56		56
57	@Test	57	@Test
58	public void testEmptyGraph() {	58	public void testEmptyGraph() {
59	testString("graph {}");	59	testString(DotSampleGraphs.EMPTY);
60	}	60	}
61		61
62	@Test	62	@Test
63	public void testEmptyDirectedGraph() {	63	public void testEmptyDirectedGraph() {
64	testString("digraph {}");	64	testString(DotSampleGraphs.EMPTY_DIRECTED);
65	}	65	}
66		66
67	@Test	67	@Test
68	public void testEmptyStrictGraph() {	68	public void testEmptyStrictGraph() {
69	testString("strict graph {}");	69	testString(DotSampleGraphs.EMPTY_STRICT);
70	}	70	}
71		71
72	@Test	72	@Test
73	public void testEmptyStrictDirectedGraph() {	73	public void testEmptyStrictDirectedGraph() {
74	testString("strict digraph {}");	74	testString(DotSampleGraphs.EMPTY_STRICT_DIRECTED);
75	}	75	}
76		76
77	@Test	77	@Test
78	public void testGraphWithOneNode() {	78	public void testGraphWithOneNode() {
79	testString("graph {n1}");	79	testString(DotSampleGraphs.ONE_NODE);
80	}	80	}
81		81
82	@Test	82	@Test
83	public void testGraphWithOneNodeAndEmptyNodeAttributeList() {	83	public void testGraphWithOneNodeAndEmptyNodeAttributeList() {
84	testString("graph {n1[]}");	84	testString(DotSampleGraphs.EMPTY_NODE_ATTRIBUTE_LIST);
85	}	85	}
86		86
87	@Test	87	@Test
88	public void testGraphWithOneEdge() {	88	public void testGraphWithOneEdge() {
89	testString("graph {n1--n2}");	89	testString(DotSampleGraphs.ONE_EDGE);
		90	}
		91
		92	@Test
		93	public void testDirectedGraphWithOneEdge() {
		94	testString(DotSampleGraphs.ONE_DIRECTED_EDGE);
90	}	95	}
91		96
92	@Test	97	@Test
93	public void testGraphWithOneEdgeAndEmptyEdgeAttributeList() {	98	public void testGraphWithOneEdgeAndEmptyEdgeAttributeList() {
94	testString("graph {n1--n2[]}");	99	testString(DotSampleGraphs.EMPTY_EDGE_ATTRIBUTE_LIST);
		100	}
		101
		102	@Test
		103	public void testDirectedGraphWithOneEdgeAndEmptyEdgeAttributeList() {
		104	testString(DotSampleGraphs.EMPTY_DIRECTED_EDGE_ATTRIBUTE_LIST);
95	}	105	}
96		106
97	@Test	107	@Test
98	public void testGraphWithEmptyGraphAttributeStatement() {	108	public void testGraphWithEmptyGraphAttributeStatement() {
99	testString("graph {graph[]}");	109	testString(DotSampleGraphs.EMPTY_GRAPH_ATTRIBUTE_STATEMENT);
100	}	110	}
101		111
102	@Test	112	@Test
103	public void testGraphWithEmptyNodeAttributeStatement() {	113	public void testGraphWithEmptyNodeAttributeStatement() {
104	testString("graph {node[]}");	114	testString(DotSampleGraphs.EMPTY_NODE_ATTRIBUTE_STATEMENT);
105	}	115	}
106		116
107	@Test	117	@Test
108	public void testGraphWithEmptyEdgeAttributeStatement() {	118	public void testGraphWithEmptyEdgeAttributeStatement() {
109	testString("graph {edge[]}");	119	testString(DotSampleGraphs.EMPTY_EDGE_ATTRIBUTE_STATEMENT);
110	}
111
112	@Test
113	public void testArrowShapesSingle() {
114	testFile("arrowshapes_single.dot");
115	}
116
117	@Test
118	public void testArrowShapesMultiple() {
119	testFile("arrowshapes_multiple.dot");
120	}	120	}
121		121
122	@Test	122	@Test
Lines 125-131 Link Here
125	}	125	}
126		126
127	@Test	127	@Test
128	public void testArrowshapesDirectionBoth() {	128	public void testArrowShapesDirectionBoth() {
129	testFile("arrowshapes_direction_both.dot");	129	testFile("arrowshapes_direction_both.dot");
130	}	130	}
131		131
Lines 135-145 Link Here
135	}	135	}
136		136
137	@Test	137	@Test
138	public void testPolygonBasedNodeShapes() {	138	public void testArrowShapesMultiple() {
		139	testFile("arrowshapes_multiple.dot");
		140	}
		141
		142	@Test
		143	public void testArrowShapesSingle() {
		144	testFile("arrowshapes_single.dot");
		145	}
		146
		147	@Test
		148	public void testAttributesGraph() {
		149	testFile("attributes_graph.dot");
		150	}
		151
		152	@Test
		153	public void testBasicDirectedGraph() {
		154	testFile("basic_directed_graph.dot");
		155	}
		156
		157	@Test
		158	public void testGlobalEdgeGraph() {
		159	testFile("global_edge_graph.dot");
		160	}
		161
		162	@Test
		163	public void testGlobalNodeGraph() {
		164	testFile("global_node_graph.dot");
		165	}
		166
		167	@Test
		168	public void testIdMatchesKeyword() {
		169	testFile("id_matches_keyword.dot");
		170	}
		171
		172	@Test
		173	public void testLabeledGraph() {
		174	testFile("labeled_graph.dot");
		175	}
		176
		177	@Test
		178	public void testLayoutGridGraph() {
		179	testFile("layout_grid_graph.dot");
		180	}
		181
		182	@Test
		183	public void testLayoutRadialGraph() {
		184	testFile("layout_radial_graph.dot");
		185	}
		186
		187	@Test
		188	public void testLayoutSpringGraph() {
		189	testFile("layout_spring_graph.dot");
		190	}
		191
		192	@Test
		193	public void testLayoutTreeGraph() {
		194	testFile("layout_tree_graph.dot");
		195	}
		196
		197	@Test
		198	public void testNodeShapesPolygonBased() {
139	testFile("nodeshapes_polygon_based.dot");	199	testFile("nodeshapes_polygon_based.dot");
140	}	200	}
141		201
142	@Test	202	@Test
		203	public void testNodeGroups() {
		204	testFile("node_groups.dot");
		205	}
		206
		207	@Test
		208	public void testSampleInput() {
		209	testFile("sample_input.dot");
		210	}
		211
		212	@Test
		213	public void testSimpleDigraph() {
		214	testFile("simple_digraph.dot");
		215	}
		216
		217	@Test
		218	public void testSimpleGraph() {
		219	testFile("simple_graph.dot");
		220	}
		221
		222	@Test
143	public void testStyledGraph() {	223	public void testStyledGraph() {
144	testFile("styled_graph.dot");	224	testFile("styled_graph.dot");
145	}	225	}

Lines 1-5 Link Here

(-)a/org.eclipse.gef4.dot.tests/build.properties (-2 / +4 lines)
1	###############################################################################	1	###############################################################################
2	# Copyright (c) 2015 itemis AG and others.	2	# Copyright (c) 2015, 2016 itemis AG and others.
3	# All rights reserved. This program and the accompanying materials	3	# All rights reserved. This program and the accompanying materials
4	# are made available under the terms of the Eclipse Public License v1.0	4	# are made available under the terms of the Eclipse Public License v1.0
5	# which accompanies this distribution, and is available at	5	# which accompanies this distribution, and is available at
Lines 7-15 Link Here
7	#	7	#
8	# Contributors:	8	# Contributors:
9	# Alexander Ny�en (itemis AG) - initial API and implementation	9	# Alexander Ny�en (itemis AG) - initial API and implementation
		10	# Tamas Miklossy (itemis AG) - add xtend-gen to the source folders
10	###############################################################################	11	###############################################################################
11	source.. = src/,\	12	source.. = src/,\
12	src-gen/	13	src-gen/,\
		14	xtend-gen/
13	output.. = bin/	15	output.. = bin/
14	bin.includes = META-INF/,\	16	bin.includes = META-INF/,\
15	.	17	.

Lines 20-25 Link Here

(-)a/org.eclipse.gef4.dot.tests/pom.xml (+33 lines)
20	<sourceDirectory>src</sourceDirectory>	20	<sourceDirectory>src</sourceDirectory>
21	<plugins>	21	<plugins>
22	<plugin>	22	<plugin>
		23	<artifactId>maven-clean-plugin</artifactId>
		24	<version>${maven-clean-plugin.version}</version>
		25	<executions>
		26	<execution>
		27	<id>gen-clean</id>
		28	<phase>clean</phase>
		29	<configuration>
		30	<filesets combine.children="append">
		31	<fileset>
		32	<directory>${basedir}/xtend-gen/</directory>
		33	</fileset>
		34	</filesets>
		35	</configuration>
		36	</execution>
		37	</executions>
		38	</plugin>
		39	<plugin>
		40	<groupId>org.eclipse.xtend</groupId>
		41	<artifactId>xtend-maven-plugin</artifactId>
		42	<version>${xtext.version}</version>
		43	<executions>
		44	<execution>
		45	<goals>
		46	<goal>compile</goal>
		47	</goals>
		48	</execution>
		49	</executions>
		50	<configuration>
		51	<encoding>${project.build.sourceEncoding}</encoding>
		52	<outputDirectory>xtend-gen</outputDirectory>
		53	</configuration>
		54	</plugin>
		55	<plugin>
23	<groupId>org.eclipse.tycho</groupId>	56	<groupId>org.eclipse.tycho</groupId>
24	<artifactId>tycho-surefire-plugin</artifactId>	57	<artifactId>tycho-surefire-plugin</artifactId>
25	</plugin>	58	</plugin>

Added Link Here

(-)a/org.eclipse.gef4.dot.tests/src/org/eclipse/gef4/dot/tests/DotSampleGraphs.xtend (+312 lines)
1	/*******************************************************************************
2	* Copyright (c) 2016 itemis AG and others.
3	*
4	* All rights reserved. This program and the accompanying materials
5	* are made available under the terms of the Eclipse Public License v1.0
6	* which accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Tamas Miklossy (itemis AG) - initial API and implementation
11	*******************************************************************************/
12
13	package org.eclipse.gef4.dot.tests
14
15	class DotSampleGraphs {
16
17	public static val EMPTY = '''
18	graph {}
19	'''
20
21	public static val EMPTY_DIRECTED = '''
22	digraph {}
23	'''
24
25	public static val EMPTY_STRICT = '''
26	strict graph {}
27	'''
28
29	public static val EMPTY_STRICT_DIRECTED = '''
30	strict digraph {}
31	'''
32
33	public static val ONE_NODE = '''
34	graph {
35	1
36	}
37	'''
38
39	public static val TWO_NODES = '''
40	graph {
41	1
42	2
43	}
44	'''
45
46	public static val ONE_EDGE = '''
47	graph {
48	1--2
49	}
50	'''
51
52	public static val ONE_DIRECTED_EDGE = '''
53	digraph {
54	1->2
55	}
56	'''
57
58	public static val TWO_EDGES = '''
59	graph {
60	1--2
61	3--4
62	}
63	'''
64
65	public static val TWO_NODES_ONE_EDGE = '''
66	graph {
67	1;2;
68	1--2
69	}
70	'''
71
72	public static val TWO_NODES_ONE_DIRECTED_EDGE = '''
73	digraph {
74	1;2;
75	1->2
76	}
77	'''
78
79	public static val TWO_NODES_AND_THREE_EDGES = '''
80	graph {
81	1;2
82	1--2
83	2--2
84	1--1
85	}
86	'''
87
88	public static val EMPTY_NODE_ATTRIBUTE_LIST = '''
89	graph {
90	1[]
91	}
92	'''
93
94	public static val EMPTY_EDGE_ATTRIBUTE_LIST = '''
95	graph {
96	1--2[]
97	}
98	'''
99
100	public static val EMPTY_DIRECTED_EDGE_ATTRIBUTE_LIST = '''
101	digraph {
102	1->2[]
103	}
104	'''
105
106	public static val EMPTY_GRAPH_ATTRIBUTE_STATEMENT = '''
107	graph {
108	graph[]
109	}
110	'''
111
112	public static val EMPTY_NODE_ATTRIBUTE_STATEMENT = '''
113	graph {
114	node[]
115	}
116	'''
117
118	public static val EMPTY_EDGE_ATTRIBUTE_STATEMENT = '''
119	graph {
120	edge[]
121	}
122	'''
123
124	public static val ESCAPED_QUOTES_LABEL = '''
125	graph {
126	n1[label="node \"1\""]
127	}
128	'''
129
130	public static val FULLY_QUOTED_IDS = '''
131	graph {
132	"n1"
133	"n2"
134	"n1"--"n2"
135	}
136	'''
137
138	public static val GLOBAL_EDGE_LABEL_AD_HOC_NODES = '''
139	graph {
140	edge[label="TEXT"]
141	1--2
142	}
143	'''
144
145	public static val GLOBAL_NODE_LABEL_AD_HOC_NODES = '''
146	graph {
147	node[label="TEXT"]
148	1--2
149	}
150	'''
151
152	public static val GRAPH_LAYOUT_DOT_HORIZONTAL = '''
153	graph {
154	graph[layout=dot]
155	rankdir=LR
156	1
157	}
158	'''
159
160	public static val HEADER_COMMENT = '''
161	/A header comment/
162	graph {
163	1--2
164	}
165	'''
166
167	public static val IDS_WITH_QUOTES = '''
168	graph {
169	"node 1"
170	"node 2"
171	}
172	'''
173
174	public static val MULTI_EDGE_STATEMENTS = '''
175	digraph {
176	1->2->3->4
177	}
178	'''
179
180	public static val NEW_LINES_IN_LABELS = '''
181	graph {
182	n1[label=
183	"node
184	1"]}
185	'''
186
187	public static val NODES_AFTER_EDGES = '''
188	graph {
189	1--2
190	2--3
191	2--4
192	1[label="node"]
193	2
194	3
195	4
196	}
197	'''
198
199	public static val NODES_BEFORE_EDGES = '''
200	graph {
201	1;2;3;4
202	1--2
203	2--3
204	2--4
205	}
206	'''
207
208	public static val QUOTED_LABELS = '''
209	graph {
210	n1[label="node 1"]
211	n2[label="node 2"]
212	n1--n2[label="edge 1"]
213	}
214	'''
215
216
217	/*
218	************************************************************************************************************
219	* Sample dot graphs with different dot attribute valid values
220	************************************************************************************************************
221	*/
222
223	public static val GRAPH_LAYOUT_DOT = '''
224	graph {
225	graph[layout=dot]
226	1
227	}
228	'''
229
230	public static val GRAPH_LAYOUT_FDP = '''
231	graph {
232	graph[layout=fdp]
233	1
234	}
235	'''
236
237	public static val GRAPH_LAYOUT_OSAGE = '''
238	graph {
239	graph[layout=osage]
240	1
241	}
242	'''
243
244	public static val GRAPH_LAYOUT_TWOPI = '''
245	graph {
246	graph[layout=twopi]
247	1
248	}
249	'''
250
251	public static val GRAPH_RANKDIR_LR = '''
252	graph {
253	rankdir=LR
254	1
255	}
256	'''
257
258	public static val EDGE_STYLE_INVIS = '''
259	digraph {
260	1->2[style=invis]
261	}
262	'''
263
264	/*
265	************************************************************************************************************
266	* Sample dot graphs with local/global/override dot attributes
267	************************************************************************************************************
268	*/
269
270	public static val NODE_LABEL_LOCAL = '''
271	graph {
272	1[label="Node1"]
273	}
274	'''
275
276	public static val NODE_LABEL_GLOBAL = '''
277	graph {
278	node[label="Node1"]
279	1
280	}
281	'''
282
283	public static val EDGE_LABEL_LOCAL = '''
284	graph {
285	1;2;
286	1--2[label="Edge1"]
287	}
288	'''
289
290	public static val EDGE_LABEL_GLOBAL = '''
291	graph {
292	edge[label="Edge1"]
293	1;2
294	1--2
295	}
296	'''
297
298	public static val EDGE_STYLE_GLOBAL = '''
299	graph {
300	edge[style=dashed]
301	1;2
302	1--2
303	}
304	'''
305
306	public static val EDGE_STYLE_LOCAL = '''
307	graph {
308	1;2;
309	1->2[style=dashed]
310	}
311	'''
312	}