fixed merge conflicts, new results table

[tt2015.git] / a2 / 1cases.tex

diff --git a/a2/1cases.tex b/a2/1cases.tex
index d84752a..ce1031d 100644 (file)
--- a/a2/1cases.tex
+++ b/a2/1cases.tex
@@ -35,7 +35,7 @@ user permissions.
        \hline\hline
        Check 3 & \multicolumn{2}{l|}{Initialize the testing environment..}\\
        \hline
-       \multirow{5}{*}{Course of action}
+       \multirow{6}{*}{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
@@ -43,9 +43,11 @@ user permissions.
                & 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 -}\\
+                       \texttt{\# cd code/server \&\& make}\\
                & 5. & Start the echo server by running
                        \texttt{\# cd code/server \&\& java Main}\\
+               & 6. & Generate all test cases by running
+                       \texttt{\$ python code/client/gen.py}\\
        \hline
        Passed & \multicolumn{2}{l|}{\textit{Yes/No}}\\
        \hline\hline
@@ -302,19 +304,11 @@ described in Table~\ref{table:testpairs}.
 \label{table:preflightresults}
 \end{table}
 
-% Bij Ramons aanwezigheid
+% Bij Ramons afwezigheid
 % Paul Vitero (linkerkant lange gang)
 % verdieping Mercator
 
-%Before every test case use the following steps to initialize the testing environment.
-%
-%\begin{enumerate}
-       %\item Boot the vm using VirtualBox.
-       %\item Setup iptables by executing \texttt{\# code/iptables.sh}
-       %\item Navigate to the working directory by running \texttt{\$ cd /home/student/tt2015}
-       %\item Start the echo server by running \texttt{\# cd code/server \&\& java Main}
-%\end{enumerate}
-%
+
 %\begin{longtable}{|p{.2\linewidth}|p{.8\linewidth}|}
        %\hline
        %Nr & 1 \\\hline
@@ -367,6 +361,28 @@ described in Table~\ref{table:testpairs}.
        %& 2. Execute the script by running \texttt{\# code/client/tests/5.py} \\\hline
        %Valid trace & Verify that the script prints 'Success'. \\\hline
        %\hline
+%      
+       %Nr & 6 \\\hline
+       %Title & Request with corrupted source port. \\\hline
+       %Input & Generated packets with 1byte payload, in these packets the source port number is increased by one. \\\hline
+       %Expected output & - \\\hline
+       %\multirow{2}{*}{Course of action}
+       %& 1. Use the steps listed above in order to start the SUT. \\
+       %& 2. Execute the script by running \texttt{\# code/client/tests/6.py} \\\hline
+       %Valid trace & Verify that the script prints 'Success'. \\\hline
+       %\hline
+%      
+%      
+       %Nr & 6 \\\hline
+       %Title & Request with corrupted destination port. \\\hline
+       %Input & Generated packets with 1byte payload, in these packets the destination port number is increased by one. \\\hline
+       %Expected output & - \\\hline
+       %\multirow{2}{*}{Course of action}
+       %& 1. Use the steps listed above in order to start the SUT. \\
+       %& 2. Execute the script by running \texttt{\# code/client/tests/6.py} \\\hline
+       %Valid trace & Verify that the script prints 'Success'. \\\hline
+       %\hline
+%      
 %\end{longtable}
 
 %\begin{tabularx}{\linewidth}{| l | X|}