fixed examples and tests

Author: tibut

bitflow-example.py

@@ -6,7 +6,7 @@
 from bitflow.sinksteps import TerminalOut
 from bitflow.marshaller import CsvMarshaller
 from bitflow.pipeline import Pipeline
-from bitflow.processingstep import SimpleLinePlot  
+from bitflow.steps.plotprocessingsteps import PlotLinePlot  
 from bitflow.source import FileSource
 
 
@@ -23,12 +23,12 @@ def main():
 	pipeline = Pipeline()
 
 	# add processingsteps to pipeline
-	pipeline.add_processing_step(SimpleLinePlot("pkg_out_1000-1100"))
+	pipeline.add_processing_step(PlotLinePlot(metric_names="pkg_out_1000-1100"))
 	# add terminal output to pipeline
 	pipeline.add_processing_step(TerminalOut())
 
 	# start pipeline
-	pipeline.add_processing_step(SimpleLinePlot("pkg_out_1000-1100"))
+	pipeline.add_processing_step(PlotLinePlot(metric_names="pkg_out_1000-1100"))
 	pipeline.add_processing_step(TerminalOut())
 	pipeline.start()
 

download-data.py

@@ -49,7 +49,7 @@ def main():
 
 	# INSERT DOWNLOAD HOST
 	download_host=""
-	download_port=5025
+	download_port=5012
 	out_file = "/tmp/test_filea.txt"
 	serials = ["66"]
 
@@ -67,7 +67,6 @@ def main():
 	download_source = DownloadSource(host=download_host,
 									port=download_port,
 									pipeline=pipeline,
-									marshaller=CsvMarshaller(),
 									buffer_size=2048)
 	download_source.start()
 

provide-data.py

@@ -39,7 +39,7 @@ def main():
 	# port to provide data on
 	listen_port=5012
 	# file to provide via port
-	in_file = "/tmp/test_filea.txt"
+	in_file = "testing/testing_file_in.txt"
 
 	# prepare ListenSink
 	ls = ListenSink(host="localhost",

tests.py

@@ -5,6 +5,7 @@
 import time
 import unittest
 import os
+from bitflow.script_parser import *
 from bitflow.sinksteps import *
 from bitflow.processingstep import *
 from bitflow.marshaller import CsvMarshaller