From ea8be779622d29870e4716e1de676d2d0f7826fe Mon Sep 17 00:00:00 2001
From: someone <jan@jvales.net>
Date: Tue, 5 Jun 2012 17:38:06 +0200
Subject: [PATCH] testscripts

---
 chk.sh => compchk.sh   |  0
 test.sh => comptest.sh |  0
 connchk.sh             | 18 ++++++++++++++++++
 connect.dl             | 15 +++++++++++++++
 conntest.sh            | 15 +++++++++++++++
 test_fault             | 20 --------------------
 testconnect.sh         | 14 --------------
 7 files changed, 48 insertions(+), 34 deletions(-)
 rename chk.sh => compchk.sh (100%)
 rename test.sh => comptest.sh (100%)
 create mode 100755 connchk.sh
 create mode 100755 conntest.sh
 delete mode 100644 test_fault
 delete mode 100755 testconnect.sh

diff --git a/chk.sh b/compchk.sh
similarity index 100%
rename from chk.sh
rename to compchk.sh
diff --git a/test.sh b/comptest.sh
similarity index 100%
rename from test.sh
rename to comptest.sh
diff --git a/connchk.sh b/connchk.sh
new file mode 100755
index 0000000..db504a9
--- /dev/null
+++ b/connchk.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+TESTS="`seq 1 1 9`"
+
+if [[ "$2" != "" ]]; then
+	TESTS="$2"
+fi
+
+for test in $(echo ${TESTS}) ; do
+	if [ -e "connect.test${test}.dl" ]; then
+		ret=`./dlv -silent c.dl psh.dl w.dl f.dl s.dl connect.dl connect.test${test}.dl connect.tester.dl -N=120 | egrep "UNCOMPUTED|UNEXPECTED|DUPLICATED"`
+		if [[ $? != 1 ]]; then
+			echo "Component ${component} failed at test ${test}:"
+			echo ${ret}
+		fi
+	fi
+done
+
diff --git a/connect.dl b/connect.dl
index e69de29..306f25d 100644
--- a/connect.dl
+++ b/connect.dl
@@ -0,0 +1,15 @@
+%define the system.
+
+control(c).
+switching(s).
+windmill(w).
+caloric_plant(f).
+storage_plant(psh).
+
+% our plant's max values
+c_max(f,60).
+c_max(w,15).
+c_max(psh,20).
+charge_max(psh,30).
+
+
diff --git a/conntest.sh b/conntest.sh
new file mode 100755
index 0000000..c424ecd
--- /dev/null
+++ b/conntest.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+TESTS="`seq 1 1 9`"
+
+if [[ "$1" != "" ]]; then
+	TESTS="$1"
+fi
+
+echo "Testing connect:"
+for test in $(echo ${TESTS}) ; do
+	if [ -e "connect.test${test}.dl" ]; then
+		echo "Running test ${test}:"
+		./dlv -silent c.dl psh.dl w.dl f.dl s.dl connect.dl connect.test${test}.dl connect.tester.dl -N=120
+	fi
+done
diff --git a/test_fault b/test_fault
deleted file mode 100644
index f050444..0000000
--- a/test_fault
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-if [[ "$1" == "" ]]; then
-	TESTS=`seq 10`
-else
-	TESTS="$1"
-fi
-
-if [[ $2 == "" ]]; then
-	DIAG="FRsingle"
-else
-	DIAG="$2"
-fi
-
-for test in $(echo ${TESTS})
-do
-	echo "Running test ${test}:"
-	./dlv -silent -${DIAG} c.dl psh.dl w.dl f.dl s.dl connect.dl abnormal.hyp connect.test${test}.dl -N=60
-	echo ""
-done
diff --git a/testconnect.sh b/testconnect.sh
deleted file mode 100755
index a221903..0000000
--- a/testconnect.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-if [[ "$1" == "" ]]; then
-	TESTS=`seq 10`
-else
-	TESTS="$1"
-fi
-
-echo "Testing connect:"
-for test in $(echo ${TESTS})
-do
-	echo "Running test ${test}:"
-	./dlv -silent c.dl psh.dl w.dl f.dl s.dl connect.dl connect.test${test}.dl connect.tester.dl -N=80
-done
-- 
2.43.0