X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=a2%2F1cases.tex;h=da3a34bddf405bd1a21a7d0aae2c3286656bfcf4;hb=da69faad6643af30b9a9ed839e437ee03b0b8b47;hp=40bd1b90c3e9a0d12db0baa4235c238bde22e5a1;hpb=5120784fb9f8e609a2f3e8ffaca7d5768761f3cf;p=tt2015.git

diff --git a/a2/1cases.tex b/a2/1cases.tex
index 40bd1b9..da3a34b 100644
--- a/a2/1cases.tex
+++ b/a2/1cases.tex
@@ -7,81 +7,69 @@ are to be run in a terminal. Commands prefixed with a \texttt{\#} should be run
 with root permissions. Commands prefixed with a \texttt{\$} should be run with
 user permissions.
 
-\begin{longtabu}{|l|X|}
+\begin{longtable}{|l|rp{.8\linewidth}|}
 	\hline
-	Check 1 & Get the SUT in a workable state.\\
+	Check 1 & \multicolumn{2}{l|}{Get the SUT in a workable state.}\\
 	\hline
-	Course of action &
-		\begin{enumerate}
-			\item Import the VirtualBox image into VirtualBox.
-			\item Boot the vm.
-			\item Verify the SUT booted successfully and the network modules
-				are loaded.
-		\end{enumerate}\\
-	\hline Passed & \textit{Yes/No} \\
+	\multirow{3}{*}{Course of action} 
+		& 1. & Import the VirtualBox image into VirtualBox.\\
+	   	& 2. & Boot the vm.\\
+		& 3. & Verify the SUT booted successfully and the network modules are
+		loaded.\\
+	\hline
+	Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
 	\hline\hline
-	Check 2 & Verify the SUT is complete. \\\hline
-	Course of action &
-		\begin{enumerate}
-			\item Boot the SUT as in \emph{Check 1}.
-			\item Verify the loopback device exists by running
-				\texttt{\$ ifconfig}.
-			\item Verify the \emph{echo-server} is present on the system.
-			\item Verify \emph{Scapy} is present on the system by running
-				\texttt{\$ scapy}.
-			\item Verify all scripts used for testing are present on the
-				system.
-		\end{enumerate}\\
+	Check 2 & \multicolumn{2}{l|}{Verify the SUT is complete.}\\
+	\hline
+	\multirow{5}{*}{Course of action}
+		& 1. & Boot the SUT as in \emph{Check 1}.\\
+		& 2. & Verify the loopback device exists by running 
+			 \texttt{\$ ifconfig}.\\
+		& 3. & Verify the \emph{echo-server} is present on the system by running
+			\texttt{\$ file code/server/Main.java}\\
+		& 4. & Verify \emph{Scapy} is present on the system by running
+			\texttt{\$ scapy}.\\
+		& 5. & Verify all scripts used for testing are present on the system.\\
 	\hline
-	Passed & \textit{Yes/No}\\
-	Check 3 & Initialize the testing environment.\\
+	Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
+	\hline\hline
+	Check 3 & \multicolumn{2}{l|}{Initialize the testing environment..}\\
 	\hline
-	Course of action &
-			\begin{enumerate}
-				\item Boot the SUT as in \emph{Check 1}.
-				\item Setup iptables by executing 
-					\texttt{\# code/iptables.sh}~\footnote{ The IPTables script
-					ensures that the OS does not drop packets due to an the
-					unknown source.}
-				\item Navigate to the working directory by running
-					\texttt{\$ cd /home/student/tt2015}
-				\item Compile the echo server by running 
-					\texttt{\# cd code/server \&\& make \&\& cd -}
-				\item Start the echo server by running
-					\texttt{\# cd code/server \&\& java Main}
-		\end{enumerate}\\
+	\multirow{5}{*}{Course of action}
+		& 1. & Boot the SUT as in \emph{Check 1}.\\
+		& 2. & Setup iptables by executing
+			\texttt{\# code/iptables.sh}~\footnote{The IPTables script ensures
+			that the OS does not drop packets due to an the unknown source.}\\
+		& 3. & Navigate to the working directory by running
+			\texttt{\$ cd /home/student/tt2015}\\
+		& 4. & Compile the echo server by running 
+			\texttt{\# cd code/server \&\& make \&\& cd -}\\
+		& 5. & Start the echo server by running
+			\texttt{\# cd code/server \&\& java Main}\\
 	\hline
-	Passed & \textit{Yes/No}\\
+	Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
 	\hline\hline
-	Check 4 & Test the tool environment.\\
+	Check 4 & \multicolumn{2}{l|}{Test the tool environment.}\\
 	\hline
-	Course of action &
-		\begin{enumerate}
-			\item Initialize the SUT as in \emph{Check 3}
-			\item Execute the test script by running
-				\texttt{\# code/client/helloworld.py}.
-			\item Verify the console displays a success message.
-		\end{enumerate}\\
+	\multirow{3}{*}{Course of action}
+		& 1. & Initialize the SUT as in \emph{Check 3}\\
+		& 2. & Execute the test script by running
+			\texttt{\# code/client/helloworld.py}\\
+		& 3. & Verify the console displays a success message.\\
 	\hline
-	Passed & \textit{Yes/No}\\
+	Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
 	\hline\hline
-	Check 5 & All test inputs and scripts are present. \\\hline
-	% DIT MOET NOG EVEN ANDERS
-	Course of action & 
-		\begin{enumerate}
-			\item Boot the SUT as in \emph{Check 1}.
-			\item Execute the command \texttt{ls scripts/tests}
-			\item Verify that there is a file named case$X$ for each test case
-				$X$
-			\item Use \emph{ls packets}
-			\item Verify that there is a file named \texttt{single.pcap} and
-			\texttt{multi.pcap}.
-		\end{enumerate}\\
+	Check 5 & \multicolumn{2}{l|}{All test inputs and scripts are present.}\\
+	\hline
+	\multirow{2}{*}{Course of action}
+		& 1. & Boot the SUT as in \emph{Check 1}.\\
+		& 2. & Verify that the test generation script is present by running
+			\texttt{\$ file code/client/test.py}\\
 	\hline
-	Passed & \textit{Yes/No}\\
+	Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
 	\hline
 	\caption{Preflight checklist\label{tbl:preflight}}
-\end{longtabu}
+\end{longtable}
 
 \subsection{Testing of SUT}
 The SUT is a series of services for other computer programs with no end-user