From e1ddf615b81592e812ffb97753c5e58eb898bf3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B6ren=20Henning?= <stu114708@informatik.uni-kiel.de>
Date: Thu, 31 Mar 2016 12:35:37 +0200
Subject: [PATCH] update tests
---
.../kieker/analysis/graph/GraphTester.java | 46 +++++++++----------
.../graph/export/graphml/GraphMLExporter.java | 8 ++--
2 files changed, 25 insertions(+), 29 deletions(-)
diff --git a/src/main/java/kieker/analysis/graph/GraphTester.java b/src/main/java/kieker/analysis/graph/GraphTester.java
index de9a11b6..418d6cf0 100644
--- a/src/main/java/kieker/analysis/graph/GraphTester.java
+++ b/src/main/java/kieker/analysis/graph/GraphTester.java
@@ -1,14 +1,9 @@
package kieker.analysis.graph;
-import java.io.IOException;
-import java.io.PrintWriter;
import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
import kieker.analysis.graph.export.graphml.GraphMLExporter;
import kieker.analysis.graph.impl.GraphImpl;
-import kieker.analysis.util.dot.DotWriter;
public class GraphTester {
@@ -106,26 +101,27 @@ public class GraphTester {
// dotExporter.export(graph, System.out);
// Could be useful for testing
- System.out.println("DotWriter Test");
-
- DotWriter dotWriter = new DotWriter(new PrintWriter(System.out));
- try {
- dotWriter.start("G");
- dotWriter.addGraphAttribute("rotate", "90");
- Map<String, String> defaultNodeAttributes = new HashMap<>();
- defaultNodeAttributes.put("style", "filled");
- dotWriter.addDefaultNodeAttributes(defaultNodeAttributes);
- Map<String, String> nodeAttributes = new HashMap<>();
- nodeAttributes.put("label", "LABEL Title");
- dotWriter.addNode("102", nodeAttributes);
- dotWriter.addNode("#id", nodeAttributes);
- dotWriter.addEdge("102", "#id", new HashMap<>());
- dotWriter.finish();
-
- } catch (IOException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
+ //
+ // System.out.println("DotWriter Test");
+ //
+ // DotWriter dotWriter = new DotWriter(new PrintWriter(System.out));
+ // try {
+ // dotWriter.start("G");
+ // dotWriter.addGraphAttribute("rotate", "90");
+ // Map<String, String> defaultNodeAttributes = new HashMap<>();
+ // defaultNodeAttributes.put("style", "filled");
+ // dotWriter.addDefaultNodeAttributes(defaultNodeAttributes);
+ // Map<String, String> nodeAttributes = new HashMap<>();
+ // nodeAttributes.put("label", "LABEL Title");
+ // dotWriter.addNode("102", nodeAttributes);
+ // dotWriter.addNode("#id", nodeAttributes);
+ // dotWriter.addEdge("102", "#id", new HashMap<>());
+ // dotWriter.finish();
+ //
+ // } catch (IOException e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
}
diff --git a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java b/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java
index 853efca0..81d32dd2 100644
--- a/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java
+++ b/src/main/java/kieker/analysis/graph/export/graphml/GraphMLExporter.java
@@ -27,13 +27,13 @@ public class GraphMLExporter {
graphmlType.getGraphOrData().add(graphType);
try {
- JAXBContext context = JAXBContext.newInstance(GraphmlType.class);
- Marshaller marshaller = context.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, FORMATTED_OUTPUT);
-
ObjectFactory objectFactory = new ObjectFactory();
JAXBElement<GraphmlType> rootElement = objectFactory.createGraphml(graphmlType);
+ JAXBContext context = JAXBContext.newInstance(rootElement.getValue().getClass());
+ Marshaller marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, FORMATTED_OUTPUT);
+
marshaller.marshal(rootElement, outputStream);
} catch (JAXBException e) {
// TODO Auto-generated catch block
--
GitLab