Merge branch 'master' of https://github.com/dopefishh/tt2015

diff --git a/a2/1cases.tex b/a2/1cases.tex
index 7b90350..d339dfa 100644 (file)
--- a/a2/1cases.tex
+++ b/a2/1cases.tex
@@ -82,8 +82,7 @@ results to asses whether or not the SUT has passed the test.
 
 The implementation of the SUT is tested using black box testing techniques. A
 series of tests asses the correctness of the implementation with regards to the
-TCP specification. These tests are specified in Table~\textbf{referentie naar
-tests-tabel}. The test cases aim to cover the most interesting parts of the TCP
+TCP specification. These tests are specified in Table~\ref{tbl:testpairs}. The test cases aim to cover the most interesting parts of the TCP
 specification. 
 
 To cover the TCP specification as complete as possible while still maintaining
@@ -178,7 +177,7 @@ Partitions 2 to 6 are tested using pairwise testing to keep the number of test
 cases feasible. The pairs are then all *except some where it does not make sense
 to do so) tested with the different request sizes of partition 1.
 
-This is expressed in Table~\ref{table:testpairs}. In this table the first five
+This is expressed in Table~\ref{tbl:testpairs}. In this table the first five
 columns represent the different options for the partitions 2 to 6 of the above
 enumeration. The last four columns are the different number segments as
 described in the partition 1 of the above enumeration. These cells identify
@@ -186,9 +185,7 @@ individual test cases by a number. An \xmark in the cell indicates that this
 test case can not be created as it is not possible with that number of segments
 (eg. sending segments out of order when the number of segments is 1).
 
-\newcounter{TCC}
 \setcounter{TCC}{1}
-\newcommand{\doTCC}{\theTCC \stepcounter{TCC}}
 \begin{table}[H]
        \centering
        \begin{tabular}{|l|l|l|l|l|l||l|l|l|l|}
@@ -208,9 +205,9 @@ test case can not be created as it is not possible with that number of segments
                & b & b & b & a & b & \xmark & \doTCC & \doTCC & \doTCC\\
                & a & b & b & b & a & \xmark & \xmark & \doTCC & \doTCC\\
                \hline
-\end{tabular}
+       \end{tabular}
 \caption{Combinations of test cases}
-\label{table:testpairs}
+\label{tbl:testpairs}
 \end{table}
 
 \subsection{Quality, completeness and coverage of tests}
@@ -248,7 +245,7 @@ position.
 
 To further decrease the number of tests needed test cases are divided into
 equivalence partitions and the combination of cases as described in 
-Table~\ref{table:testpairs} ensures that all partitions are
+Table~\ref{tbl:testpairs} ensures that all partitions are
 covered and the number of individual tests is still feasible. 
 
 
@@ -258,92 +255,148 @@ covered and the number of individual tests is still feasible.
 %
 
 
-\subsection{Test cases}
+\subsection{Test suite}
 
-Before every test case use the following steps to initialize the testing environment.
+Before executing the test suite the test environment has to be initialized. 
 
 \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}
+       \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
-       Title & Single valid request with 1byte payload. \\\hline
-       Input & Generated packets. \\\hline
-       Expected output & Packets echoed back by Echo-Server. \\\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/1.py} \\\hline
-       Valid trace & Verify that the script prints 'Success'. \\\hline
-       \hline
-       
-       Nr & 2 \\\hline
-       Title & Single valid request with 65495bytes payload. \\\hline
-       Input & Generated packets. \\\hline
-       Expected output & Packets echoed back by Echo-Server. \\\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/2.py} \\\hline
-       Valid trace & Verify that the script prints 'Success'. \\\hline
-       \hline
-       
-       Nr & 3 \\\hline
-       Title & 5 valid requests with 1byte payload. \\\hline
-       Input & Generated packets. \\\hline
-       Expected output & Packets echoed back by Echo-Server, in the same order as the client sent them. \\\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/3.py} \\\hline
-       Valid trace & Verify that the script prints 'Success'. \\\hline
-       \hline
-       
-       Nr & 4 \\\hline
-       Title & 5 valid requests with 65495bytes payload. \\\hline
-       Input & Generated packets with 65495bytes payload. \\\hline
-       Expected output & Packets echoed back by Echo-Server, in the same order as the client sent them. \\\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/4.py} \\\hline
-       Valid trace & Verify that the script prints 'Success'. \\\hline
-       \hline
-       
-       Nr & 5 \\\hline
-       Title & 5 valid requests with 1byte payload sent out of order. \\\hline
-       Input & Generated packets with 1byte payload, two packets are swapped in position. \\\hline
-       Expected output & All requests sent up to and including
-        the swapped packet with the lowest sequence number, the remaining packets are dropped. \\\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/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}
+\subsubsection{Preflight checks}
+The we do the preflight checks as defined in Table~\ref{tbl:preflight}.
+
+\subsubsection{Test Cases}
+If the SUT passes the preflight checks the actual test cases can be executed.
+Table~\ref{tbl:testcases} shows the expected results of each of the test cases
+described in Table~\ref{tbl:testpairs}. 
+
+\setcounter{TCC}{1}
+\begin{table}[H]
+       \centering
+    \begin{tabular}{|l|p{.7\linewidth}|}
+       \hline
+       Test number & Expected results\\  
+       \hline\hline
+       \doTCC & An ACK\# of the send sequence number + 1.\\  \hline
+       \doTCC & An ACK\# of the sequence number of the last send segment + the
+               size of the payload of that segment.\\  \hline
+       \doTCC & An ACK\# of the sequence number of the last send segment + the
+               size of the payload of that segment.\\  \hline
+       \doTCC & An ACK\# of the sequence number of the last send segment + the
+               size of the payload of that segment.\\  \hline
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\  
+       $\vdots$ & \\  
+       \setcounter{TCC}{14}
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\  \hline
+       \doTCC & The segment is not attributed to the current connection
+               and therefore no ACK\# is received. \\  \hline
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\  \hline
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\  \hline
+       \doTCC & The segment is not attributed to the current connection
+               and therefore no ACK\# is received. \\  \hline
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\  \hline
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\ \hline
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\  \hline
+       \doTCC & The ACK\# for the SEQ\# of the first segments which is
+               corrupted is received for each consecutive segment send.\\ \hline
+    \end{tabular}
+\caption{Expected results of test cases}
+\label{tbl:testcases}
+\end{table}
+
+% Bij Ramons afwezigheid
+% Paul Vitero (linkerkant lange gang)
+% verdieping Mercator
+
+
+%\begin{longtable}{|p{.2\linewidth}|p{.8\linewidth}|}
+       %\hline
+       %Nr & 1 \\\hline
+       %Title & Single valid request with 1byte payload. \\\hline
+       %Input & Generated packets. \\\hline
+       %Expected output & Packets echoed back by Echo-Server. \\\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/1.py} \\\hline
+       %Valid trace & Verify that the script prints 'Success'. \\\hline
+       %\hline
+%      
+       %Nr & 2 \\\hline
+       %Title & Single valid request with 65495bytes payload. \\\hline
+       %Input & Generated packets. \\\hline
+       %Expected output & Packets echoed back by Echo-Server. \\\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/2.py} \\\hline
+       %Valid trace & Verify that the script prints 'Success'. \\\hline
+       %\hline
+%      
+       %Nr & 3 \\\hline
+       %Title & 5 valid requests with 1byte payload. \\\hline
+       %Input & Generated packets. \\\hline
+       %Expected output & Packets echoed back by Echo-Server, in the same order as the client sent them. \\\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/3.py} \\\hline
+       %Valid trace & Verify that the script prints 'Success'. \\\hline
+       %\hline
+%      
+       %Nr & 4 \\\hline
+       %Title & 5 valid requests with 65495bytes payload. \\\hline
+       %Input & Generated packets with 65495bytes payload. \\\hline
+       %Expected output & Packets echoed back by Echo-Server, in the same order as the client sent them. \\\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/4.py} \\\hline
+       %Valid trace & Verify that the script prints 'Success'. \\\hline
+       %\hline
+%      
+       %Nr & 5 \\\hline
+       %Title & 5 valid requests with 1byte payload sent out of order. \\\hline
+       %Input & Generated packets with 1byte payload, two packets are swapped in position. \\\hline
+       %Expected output & All requests sent up to and including
+        %the swapped packet with the lowest sequence number, the remaining packets are dropped. \\\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/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|}
 %\hline

diff --git a/a2/2results.tex b/a2/2results.tex
index 7c1bca0..871ab78 100644 (file)
--- a/a2/2results.tex
+++ b/a2/2results.tex
@@ -1,5 +1,10 @@
 \r
 \subsection{Preflight checklist}\r
+Execution of the preflight checklist of Table~\red{tbl:preflight}\r
+\r
+\r
+\subsection{Test cases}\r
+\r
 %\r
 %\textbf{TODO: DEZE TABEL WEL UPDATEN!!}\r
 %\r

diff --git a/a2/preamble.tex b/a2/preamble.tex
index 4afe3a3..aa5dacd 100644 (file)
--- a/a2/preamble.tex
+++ b/a2/preamble.tex
@@ -12,6 +12,9 @@
 \usepackage{amsfonts}
 \newcommand{\xmark}{\texttt{\textbf{x}}}
 
+\newcounter{TCC}
+\newcommand{\doTCC}{\theTCC \stepcounter{TCC}}
+
 \lstset{%
   breakatwhitespace=false,         % sets if automatic breaks should only happen at whitespace
   breaklines=true,                 % sets automatic line breaking