From 0222eb218b5532a65febad6e21cb7a9d84f96d7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Sat, 26 Mar 2016 16:26:27 +0100
Subject: [PATCH] tests, bug fixes and clean up
---
.../kieker/analysis/graph/GraphTester.java | 35 ++++---------------
.../graph/export/dot/DotExporter.java | 5 +++
.../graph/export/dot/GraphTransformer.java | 5 ++-
.../java/kieker/analysis/util/DotBuilder.java | 4 +++
4 files changed, 17 insertions(+), 32 deletions(-)
diff --git a/src/main/java/kieker/analysis/graph/GraphTester.java b/src/main/java/kieker/analysis/graph/GraphTester.java
index cc5f78ae..222d92c3 100644
--- a/src/main/java/kieker/analysis/graph/GraphTester.java
+++ b/src/main/java/kieker/analysis/graph/GraphTester.java
@@ -1,6 +1,6 @@
package kieker.analysis.graph;
-import kieker.analysis.graph.export.graphml.GraphMLExporter;
+import kieker.analysis.graph.export.dot.DotExporter;
import kieker.analysis.graph.impl.GraphImpl;
public class GraphTester {
@@ -80,34 +80,11 @@ public class GraphTester {
System.out.println(edge.getId());
}
- GraphMLExporter graphMLExporter = new GraphMLExporter();
-
- graphMLExporter.export(graph, System.out);
-
- // JAXB Test
-
- //
- // GraphmlType graphmlType = new GraphmlType();
- // graphmlType.getKey().add(new KeyType());
- // GraphType graphType = new GraphType();
- // graphType.getDataOrNodeOrEdge().add(new NodeType());
- // graphType.getDataOrNodeOrEdge().add(new NodeType());
- // graphType.getDataOrNodeOrEdge().add(new EdgeType());
- // graphmlType.getGraphOrData().add(graphType);
- //
- // try {
- // JAXBContext context = JAXBContext.newInstance(GraphmlType.class);
- // Marshaller m = context.createMarshaller();
- // m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
- //
- // ObjectFactory objectFactory = new ObjectFactory();
- // JAXBElement<GraphmlType> element = objectFactory.createGraphml(graphmlType);
- //
- // m.marshal(element, System.out);
- // } catch (JAXBException e) {
- // // TODO Auto-generated catch block
- // e.printStackTrace();
- // }
+ // GraphMLExporter graphMLExporter = new GraphMLExporter();
+ // graphMLExporter.export(graph, System.out);
+
+ DotExporter dotExporter = new DotExporter();
+ dotExporter.export(graph, System.out);
}
diff --git a/src/main/java/kieker/analysis/graph/export/dot/DotExporter.java b/src/main/java/kieker/analysis/graph/export/dot/DotExporter.java
index 31519988..17de4122 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/DotExporter.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/DotExporter.java
@@ -1,6 +1,7 @@
package kieker.analysis.graph.export.dot;
import java.io.OutputStream;
+import java.io.PrintWriter;
import kieker.analysis.graph.Graph;
@@ -12,6 +13,10 @@ public class DotExporter {
// TODO Receiving a dot object would be (maybe) better
String dotString = graphTransformer.transform();
+ PrintWriter printWriter = new PrintWriter(outputStream);
+ printWriter.write(dotString);
+ printWriter.close();
+
}
}
diff --git a/src/main/java/kieker/analysis/graph/export/dot/GraphTransformer.java b/src/main/java/kieker/analysis/graph/export/dot/GraphTransformer.java
index edea3a08..bb54c471 100644
--- a/src/main/java/kieker/analysis/graph/export/dot/GraphTransformer.java
+++ b/src/main/java/kieker/analysis/graph/export/dot/GraphTransformer.java
@@ -25,10 +25,9 @@ public class GraphTransformer extends AbstractTransformer<String> {
protected void mapVertex(final Vertex vertex) {
if (vertex.hasChildGraph()) {
Graph childGraph = vertex.getChildGraph();
- GraphTransformer graphTransformer = new GraphTransformer(childGraph);
+ GraphTransformer graphTransformer = new GraphTransformer(childGraph, false);
String childGraphString = graphTransformer.transform();
- // TODO We need a subgraph cluster_XYZ { ... }
- // TODO dotBuilder.addCluster();
+ dotBuilder.addSubgraph(childGraphString);
} else {
dotBuilder.addNode(vertex.getId().toString());
// TODO Add style, label, etc
diff --git a/src/main/java/kieker/analysis/util/DotBuilder.java b/src/main/java/kieker/analysis/util/DotBuilder.java
index 32749a5c..ca284f0c 100644
--- a/src/main/java/kieker/analysis/util/DotBuilder.java
+++ b/src/main/java/kieker/analysis/util/DotBuilder.java
@@ -104,6 +104,10 @@ public class DotBuilder {
addElement('"' + source + '"' + " -> " + '"' + target + '"', extendEdgeProperties(properties));
}
+ public void addSubgraph(final String subgraph) {
+ body.append(subgraph + '\n');
+ }
+
private void addElement(final String element, final Map<String, String> properties) {
body.append(element);
if (properties != null && !properties.isEmpty()) {
--
GitLab