scripts/test.sh

@@ -34,7 +34,6 @@ COMPILE_COMMANDS=(
     "$CXX_WITH_FLAGS src/test/nbt_helpers.cpp -I./include -Lbin/lib -l:nbt.so -l:javacompat.so -o bin/test/nbt_helpers"
     "$CXX_WITH_FLAGS src/test/cli_argument_parser.cpp -Lbin/lib -l:cli.so -o bin/test/cli_argument_parser"
     "$CXX_WITH_FLAGS src/test/javacompat.cpp -I./include -Lbin/lib -l:javacompat.so -o bin/test/javacompat"
-    "$CXX_WITH_FLAGS src/test/nbt_writestring_failure_mode.cpp -I./include -Lbin/lib -l:nbt.so -l:javacompat.so -o bin/test/nbt_writestring_failure_mode"
 )
 for command in ${!COMPILE_COMMANDS[@]}; do
     echo "${COMPILE_COMMANDS[command]}"
@@ -46,7 +45,6 @@ wait
 
 echo "Running tests..."
 
-set +e
 for test in $(ls bin/test); do
     bin/test/$test
 done

src/lib/javacompat.cpp

@@ -65,7 +65,7 @@ namespace JavaCompat {
         //placeholder size bytes
         output.push_back(0x00);
         output.push_back(0x00);
-        for(uint16_t i=0; i<stdString.size(); i++){
+        for(int i=0; i<stdString.size(); i++){
             if((uint8_t) stdString[i] == 0x00){
                 *size += 1;
                 output.push_back(0xc0);
@@ -87,6 +87,7 @@ namespace JavaCompat {
             #endif
         #endif
 
+        
         return ErrorOr(output);
     }
 

src/test/nbt_helpers.cpp

@@ -522,6 +522,8 @@ int main(){
     NBT::helper::writeString(exportedString, normalString);
     ASSERT(javaStdString1 == *exportedString);
 
+    std::string overrunString = std::string(0xFFFFF, '.');
+    NBT::helper::writeString(exportedString, tiny_utf8::string(overrunString));
     std::cout << "Passed writeString NBT helper test." << std::endl;
     return 0;
 }

src/test/nbt_writestring_failure_mode.cpp

@@ -1,16 +0,0 @@
-#include <string>
-#include <vector>
-#include <iostream>
-#include "../lib/nbt.h++"
-#include "../lib/error.h++"
-#include "../lib/javacompat.h++"
-
-int main() {
-    std::cout << "=================================" << std::endl;
-    std::cout << "NBT write string helper failure mode test" << std::endl;
-    std::cout << "=================================" << std::endl;
-    std::cout << "This is supposed to abort." << std::endl;
-    std::vector<uint8_t>* exportedString = new std::vector<uint8_t>();
-    std::string overrunString = std::string(0xFFFFF, '.');
-    NBT::helper::writeString(exportedString, tiny_utf8::string(overrunString));
-}