Skip to content

Commit

Permalink
UnitTests moved to .dnp files.. @adferguson should review carefully.
Browse files Browse the repository at this point in the history
  • Loading branch information
Arjun Guha committed Dec 15, 2011
1 parent ba8ba42 commit a8fdcec
Show file tree
Hide file tree
Showing 30 changed files with 151 additions and 272 deletions.
6 changes: 1 addition & 5 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,4 @@ all:
cabal build

filetest:
./dnp -f tests/ex1.dnp
./dnp -f tests/ex2.dnp
./dnp -f tests/ex3.dnp
./dnp -f tests/ex4.dnp
./dnp -f tests/ex5.dnp
./test
267 changes: 0 additions & 267 deletions src/UnitTests.hs
View file

This file was deleted.

12 changes: 12 additions & 0 deletions test
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/bin/bash

for file in tests/*.dnp
do
echo -en "\rTest $file ... "
./dnp -f $file
tput el1
done



echo "Testing complete."
1 change: 1 addition & 0 deletions tests/t1.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True <- root : AddUser arjun.
1 change: 1 addition & 0 deletions tests/t10.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
2 changes: 2 additions & 0 deletions tests/t11.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
False <- root : reserve(*) = 300 on net0.
2 changes: 2 additions & 0 deletions tests/t12.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : reserve(*) = 300 on rootShare.
3 changes: 3 additions & 0 deletions tests/t13.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : reserve(*) = 100 on net0.
True <- root : reserve(*) = 100 on net0.
4 changes: 4 additions & 0 deletions tests/t14.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : reserve(*) = 100 on net0.
True <- root : reserve(*) = 100 on net0.
False <- root : reserve(*) = 100 on net0.
5 changes: 5 additions & 0 deletions tests/t15.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : AddUser adf.
True <- root : NewShare adfShare for (*) [reserve <= 150] on net0.
True <- root : Grant adfShare to adf.
True <- adf : reserve(*) = 100 on adfShare.
6 changes: 6 additions & 0 deletions tests/t16.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : AddUser adf.
True <- root : NewShare adfShare for (*) [reserve <= 150] on net0.
True <- root : Grant adfShare to adf.
True <- adf : reserve(*) = 100 on adfShare.
True <- root : reserve(*) = 100 on net0.
6 changes: 6 additions & 0 deletions tests/t16a.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : AddUser adf.
True <- root : NewShare adfShare for (*) [reserve <= 150] on net0.
True <- root : Grant adfShare to adf.
True <- adf : reserve(*) = 100 on adfShare.
True <- root : reserve(*) = 50 on adfShare.
6 changes: 6 additions & 0 deletions tests/t16b.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : AddUser adf.
True <- root : NewShare adfShare for (*) [reserve <= 150] on net0.
True <- root : Grant adfShare to adf.
True <- adf : reserve(*) = 100 on adfShare.
False <- root : reserve(*) = 51 on adfShare.
6 changes: 6 additions & 0 deletions tests/t17.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : AddUser adf.
True <- root : NewShare adfShare for (*) [reserve <= 150] on net0.
True <- root : Grant adfShare to adf.
True <- adf : reserve(*) = 100 on adfShare.
False <- root : reserve(*) = 101 on net0.
6 changes: 6 additions & 0 deletions tests/t18.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
True <- root : NewShare net0 for (*) [reserve <= 200] on rootShare.
True <- root : AddUser adf.
True <- root : NewShare adfShare for (*) [reserve <= 150] on net0.
True <- root : Grant adfShare to adf.
True <- adf : reserve(*) = 100 on adfShare.
False <- adf : reserve(*) = 51 on adfShare.
4 changes: 4 additions & 0 deletions tests/t19.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
True <- root : AddUser arjun.
True <- root : NewShare hadoopShare for (*) [reserve<=100] on rootShare.
True <- root : GrantDefault hadoopShare.
True <- arjun : reserve(*) = 25 on hadoopShare.
1 change: 1 addition & 0 deletions tests/t2.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
False <- root : AddUser root.
6 changes: 6 additions & 0 deletions tests/t20.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
True <- root : AddUser arjun.
True <- root : NewShare hadoopShare for (*) [reserve<=100] on rootShare.
True <- root : GrantDefault hadoopShare.
True <- arjun : reserve(*) = 25 on hadoopShare.
True <- root : AddUser adf.
True <- adf : reserve(*) = 25 on hadoopShare.
4 changes: 4 additions & 0 deletions tests/t21.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
True <- root : AddUser arjun.
True <- root : NewShare arjunShare for (user=arjun) [reserve <= 100] on rootShare.
True <- root : Grant arjunShare to arjun.
True <- arjun : reserve (user=arjun) = 50 on arjunShare.
13 changes: 13 additions & 0 deletions tests/t22.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
True <- root : AddUser arjun.
True <- root : NewShare arjunShare for (user=arjun) [reserve <= 100] on rootShare.
True <- root : Grant arjunShare to arjun.
True <- arjun : reserve (user=arjun) = 50 on arjunShare.
True <- arjun : reserve(user=arjun,app=80) = 50 on arjunShare.
/* TODO: the in-Haskell test checked that

Set.fromList s == Set.fromList [
(foreverReq "arjun-share" arjunFlow (ReqResv 50)),
(foreverReq "arjun-share" arjunWebFlow (ReqResv 50))]

We can do this (or something similar) once we return the free/busy schedule.
*/
5 changes: 5 additions & 0 deletions tests/t23.dnp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
True <- root : AddUser arjun.
True <- root : NewShare arjunShare for (user=arjun) [reserve <= 100] on rootShare.
True <- root : Grant arjunShare to arjun.
True <- arjun : reserve (user=arjun) = 50 on arjunShare.
False <- arjun : reserve (*) = 50 on arjunShare.
Loading

1 comment on commit a8fdcec

@adferguson
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good Ajrun! The original test case for 21 had the same reservations check as 22 has, so I'll commit the same TODO message.

Please sign in to comment.