From 68ec0ab3dc4ef312a8e12cf37689a9b7082cdde4 Mon Sep 17 00:00:00 2001
From: "S.Hentges" <sebastian.hentges@web.de>
Date: Wed, 11 Nov 2020 21:25:05 +0100
Subject: [PATCH] refactor testcases, delete doubling testcases

---
 .../shellmatta_opt/test_opt_peekNextHunk.cpp  | 77 ++++++++++++-------
 1 file changed, 51 insertions(+), 26 deletions(-)

diff --git a/test/unittest/shellmatta_opt/test_opt_peekNextHunk.cpp b/test/unittest/shellmatta_opt/test_opt_peekNextHunk.cpp
index 0bded4e..e6148fe 100644
--- a/test/unittest/shellmatta_opt/test_opt_peekNextHunk.cpp
+++ b/test/unittest/shellmatta_opt/test_opt_peekNextHunk.cpp
@@ -3,44 +3,69 @@
 #include <string.h>
 
 
-TEST_CASE( "shellmatta_opt peekNextHunk" ) {
+TEST_CASE( "shellmatta_opt peekNextHunk next char without space" ) {
+
+    char ret = 0;
+    shellmatta_instance_t inst;
+    char *dummyData = (char*) "Welcome... to Jurassic Park.";
+    char buffer[1024u];
+    memcpy(buffer, dummyData, strlen(dummyData));
+    inst.buffer = buffer;
+    inst.bufferSize = sizeof(buffer);
+    inst.inputCount = 28u;
+
+    inst.optionParser.nextOffset = 11u;
+
+    ret = peekNextHunk(&inst);
+    CHECK( ret == 't' );
+}
+
+TEST_CASE( "shellmatta_opt peekNextHunk next char with space" ) {
+
+    char ret = 0;
+    shellmatta_instance_t inst;
+    char *dummyData = (char*) "Welcome... to Jurassic Park.\0";
+    char buffer[1024u];
+    memcpy(buffer, dummyData, strlen(dummyData));
+    inst.buffer = buffer;
+    inst.bufferSize = sizeof(buffer);
+    inst.inputCount = 28u;
+
+    inst.optionParser.nextOffset = 13u;
+
+    ret = peekNextHunk(&inst);
+    CHECK( ret == 'J' );
+}
+
+TEST_CASE( "shellmatta_opt peekNextHunk next hunk escape and space" ) {
 
     char ret = 0;
     shellmatta_instance_t inst;
     char *dummyData = (char*) "Welcome... to Jurassic Park.\0 Remind  me to thank John for a lovely weekend.";
     char buffer[1024u];
-    memcpy(buffer, dummyData, strlen(dummyData));
-
+    uint16_t stringsize = 77u;
+    memcpy(buffer, dummyData, stringsize);
     inst.buffer = buffer;
     inst.bufferSize = sizeof(buffer);
-    inst.inputCount = 28u;
-    inst.optionParser.nextOffset = 11u;
-
-    ret = peekNextHunk(&inst);
-    CHECK( ret == 't' );
-    
-    inst.optionParser.nextOffset = 13u;
-    ret = peekNextHunk(&inst);
-    CHECK( ret == 'J' );
-    
-    inst.optionParser.nextOffset = 22u;
-    ret = peekNextHunk(&inst);
-    CHECK( ret == 'P' );
+    inst.inputCount = stringsize;
         
-    inst.optionParser.nextOffset = 23u;
-    ret = peekNextHunk(&inst);
-    CHECK( ret == 'P' );
-
-    //Copy whole string including escape sequence
-    inst.inputCount = 77u;
-    memcpy(buffer, dummyData, 77u);
-
-    //Check for combination of \0 and space
     inst.optionParser.nextOffset = 28u;
     ret = peekNextHunk(&inst);
     CHECK( ret == 'R' );
+}
+
+TEST_CASE( "shellmatta_opt peekNextHunk next char with spaces" ) {
+
+    char ret = 0;
+    shellmatta_instance_t inst;
+    char *dummyData = (char*) "Welcome... to Jurassic Park.\0 Remind  me to thank John for a lovely weekend.";
+    char buffer[1024u];
+    uint16_t stringsize = 77u;
+    memcpy(buffer, dummyData, stringsize);
+    inst.buffer = buffer;
+    inst.bufferSize = sizeof(buffer);
+    inst.inputCount = stringsize;
     
-    //Check for two spaces in a Row
     inst.optionParser.nextOffset = 36u;
     ret = peekNextHunk(&inst);
     CHECK( ret == 'm' );