added testcase for negative scalarproducts

added testcase for negative-zero scalarproducts

1 files changed, 4 insertions, 7 deletions

diff --git a/src/scalarproduct/test_scalarproduct.sh b/src/scalarproduct/test_scalarproduct.sh
index 5f335db3c..82b42e992 100755
--- a/src/scalarproduct/test_scalarproduct.sh
+++ b/src/scalarproduct/test_scalarproduct.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # compute a simple scalar product
 # payload for this test:
-INPUTALICE="-k AAAA -e 3,3,-1"
-INPUTBOB="-k AAAA -e 1000,100,24"
+INPUTALICE="-k CCC -e 3,3,-1"
+INPUTBOB="-k CCC -e 1000,100,24"
 
 # necessary to make the testing prefix deterministic, so we can access the config files
 PREFIX=/tmp/test-scalarproduct`date +%H%M%S`
@@ -18,16 +18,13 @@ CFGBOB="-c $PREFIX/1/config"
 # thus redirecting stdin does not suffice)
 GNUNET_LOG='scalarproduct;;;;DEBUG' GNUNET_TESTING_PREFIX=$PREFIX ../testbed/gnunet-testbed-profiler -n -c test_scalarproduct.conf -p 2 2>service.log &
 PID=$!
-
-echo $PID
-read
 sleep 5
+
 # get bob's peer ID, necessary for alice
 PEERIDBOB=`gnunet-peerinfo -qs $CFGBOB`
 
 GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGBOB $INPUTBOB 2>bob.log &
 RESULT=`GNUNET_LOG='scalarproduct;;;;DEBUG' gnunet-scalarproduct $CFGALICE $INPUTALICE -p $PEERIDBOB 2>alice.log`
-RESULT=`printf "%X\n" "0x$RESULT"`
 
 cat alice.log bob.log service.log >> test_scalarproduct.log
 rm -f alice.log bob.log service.log
@@ -36,7 +33,7 @@ ISSUES=$((`grep scalarproduct test_scalarproduct.log | grep -c ERROR` + `grep sc
 # terminate the testbed
 kill $PID 
 
-EXPECTED="CCC"
+EXPECTED="0CCC"
 if [ "$ISSUES" -eq "0" ]
 then
         if [ "$RESULT" == "$EXPECTED" ]