From cf900f40739a34a029f4cfb3f54110b592370c59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thibaut=20D=C3=A9mare?= <fdhp_76@hotmail.com>
Date: Thu, 6 Feb 2014 16:56:46 +0100
Subject: [PATCH] Add and change some tests

---
 src-gama-test/gama_model/models/test.gaml     |  4 +-
 .../gama/tests/SimpleSinkAdapter.java         | 43 +++++++++++++++++++
 .../org/graphstream/gama/tests/Tests.java     | 13 ++----
 3 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 src-java-test/org/graphstream/gama/tests/SimpleSinkAdapter.java

diff --git a/src-gama-test/gama_model/models/test.gaml b/src-gama-test/gama_model/models/test.gaml
index eed2702..b3e3b8c 100644
--- a/src-gama-test/gama_model/models/test.gaml
+++ b/src-gama-test/gama_model/models/test.gaml
@@ -26,8 +26,6 @@ global {
 		gs_add_edge gs_sender_id:"test1" gs_edge_id:"edge1" gs_node_id_from:"node1" gs_node_id_to:"node2" gs_is_directed:true;
 		gs_add_edge gs_sender_id:"test1" gs_edge_id:"edge2" gs_node_id_from:"node2" gs_node_id_to:"node3" gs_is_directed:false;
 		
-		// Step
-		gs_step gs_sender_id:"test1" gs_step_number:1;
 		
 		// Add attributes on edge
 			// A string attribute
@@ -42,7 +40,7 @@ global {
 		//gs_add_edge_attribute gs_sender_id:"test1" gs_edge_id:"edge1" gs_attribute_name:"list" gs_attribute_value:["one","two","three"];
 		
 		// Step
-		gs_step gs_sender_id:"test1" gs_step_number:2;
+		gs_step gs_sender_id:"test1" gs_step_number:1;
 		
 		// Clear
 		//gs_clear gs_sender_id:"test1";
diff --git a/src-java-test/org/graphstream/gama/tests/SimpleSinkAdapter.java b/src-java-test/org/graphstream/gama/tests/SimpleSinkAdapter.java
new file mode 100644
index 0000000..ac8124f
--- /dev/null
+++ b/src-java-test/org/graphstream/gama/tests/SimpleSinkAdapter.java
@@ -0,0 +1,43 @@
+package org.graphstream.gama.tests;
+
+import org.graphstream.graph.Edge;
+import org.graphstream.graph.Graph;
+import org.graphstream.graph.Node;
+import org.graphstream.graph.implementations.SingleGraph;
+import org.graphstream.stream.SinkAdapter;
+import org.graphstream.stream.netstream.NetStreamReceiver;
+
+public class SimpleSinkAdapter extends SinkAdapter {
+	
+	private Graph graph;
+
+	public SimpleSinkAdapter(NetStreamReceiver receiver) {
+		graph = new SingleGraph("test", false, false);
+		receiver.getDefaultStream().addSink(graph);
+		receiver.getDefaultStream().addSink(this);
+	}
+
+	@Override
+	public void stepBegins(String sourceId, long timeId, double step) {
+		System.out.println("Edges attributes :");
+		for(Edge e : graph.getEachEdge()){
+			for(Object o : e.getAttributeKeySet()){
+				System.out.println(e.getAttribute((String)o).getClass() + " et value = " + e.getAttribute((String)o));
+			}
+		}
+		System.out.println("Nodes attributes :");
+		for(Node e : graph.getEachNode()){
+			for(Object o : e.getAttributeKeySet()){
+				System.out.println(e.getAttribute((String)o).getClass() + " et value = " + e.getAttribute((String)o));
+			}
+		}
+	}
+
+	public Graph getGraph() {
+		return graph;
+	}
+
+	public void setGraph(Graph graph) {
+		this.graph = graph;
+	}
+}
\ No newline at end of file
diff --git a/src-java-test/org/graphstream/gama/tests/Tests.java b/src-java-test/org/graphstream/gama/tests/Tests.java
index 8c4d973..822a259 100644
--- a/src-java-test/org/graphstream/gama/tests/Tests.java
+++ b/src-java-test/org/graphstream/gama/tests/Tests.java
@@ -7,15 +7,10 @@ import org.graphstream.stream.netstream.NetStreamReceiver;
 
 public class Tests {
 
-	public static void main(String[] args) throws UnknownHostException, IOException {
-		// System.setProperty("gs.ui.renderer", "org.graphstream.ui.j2dviewer.J2DGraphRenderer");
-
-		// test graph viewer
-		new SimpleNetStreamViewer(new NetStreamReceiver(2000), true, 500, 500);
-		
-		// test graph viewer
-		new SimpleNetStreamViewer(new NetStreamReceiver(2001), true, 500, 500);
-	
+	public static void main(String[] args) throws InterruptedException, UnknownHostException, IOException {
+		NetStreamReceiver receiver = new NetStreamReceiver(2001);
+		new SimpleNetStreamViewer(receiver, true);
+		new SimpleSinkAdapter(receiver);
 	}
 
 }
\ No newline at end of file
-- 
GitLab