Merge pull request #8 from atom-community/fix-cpp-tests

Author: aminya

benchmark/native/marker-index-benchmark.cc

@@ -9,6 +9,7 @@
 
 using namespace std::chrono;
 using std::vector;
+using uint = unsigned int;
 
 Range get_random_range() {
   Point start(rand() % 100, rand() % 100);

package.json

@@ -8,7 +8,7 @@
     "build:node": "node-gyp rebuild",
     "build:browser": "bash -c script/build-browser-version.sh || echo 'the browser build is unsupported'",
     "build": "npm run build:node && npm run build:browser",
-    "test:native": "node ./script/test-native.js",
+    "test:native": "node-gyp build --debug --tests && node script/test-native.js",
     "test:node": "mocha test/js/*.js",
     "test:browser": "cross-env SUPERSTRING_USE_BROWSER_VERSION=1 mocha test/js/*.js || echo 'the browser tests are unsupported'",
     "test": "npm run test:node && npm run test:native && npm run test:browser",

script/test-native.js

@@ -52,6 +52,5 @@ switch (args[0]) {
 }
 
 function run(command, args = [], options = {stdio: 'inherit'}) {
-  const {status} = spawnSync(command, args, options)
-  if (status !== 0) process.exit(status)
-}
+  spawnSync(command, args, options)
+}

test/native/encoding-conversion-test.cc

@@ -10,7 +10,7 @@ using std::u16string;
 
 TEST_CASE("EncodingConversion::decode - basic UTF-8") {
   auto conversion = transcoding_from("UTF-8");
-  string input("abγdefg\nhijklmnop");
+  string input(u8"abγdefg\nhijklmnop");
 
   u16string string;
   conversion->decode(string, input.data(), input.size());
@@ -42,7 +42,7 @@ TEST_CASE("EncodingConversion::decode - invalid byte sequences in the middle of
 
   u16string string;
   conversion->decode(string, input.data(), input.size());
-  REQUIRE(string == u"ab" "\ufffd" "\ufffd" "de");
+  REQUIRE(string == u"ab" u"\ufffd" u"\ufffd" u"de");
 }
 
 TEST_CASE("EncodingConversion::decode - invalid byte sequences at the end of the input") {
@@ -58,7 +58,7 @@ TEST_CASE("EncodingConversion::decode - invalid byte sequences at the end of the
   string.clear();
   bytes_encoded = conversion->decode(string, input.data(), input.size(), true);
   REQUIRE(bytes_encoded == 4);
-  REQUIRE(string == u"ab" "\ufffd" "\ufffd");
+  REQUIRE(string == u"ab" u"\ufffd" u"\ufffd");
 }
 
 TEST_CASE("EncodingConversion::decode - four-byte UTF-16 characters") {
@@ -67,7 +67,7 @@ TEST_CASE("EncodingConversion::decode - four-byte UTF-16 characters") {
 
   u16string string;
   conversion->decode(string, input.data(), input.size());
-  REQUIRE(string == u"ab" "\xd83d" "\xde01" "cd");
+  REQUIRE(string == u"ab" u"\xd83d"  u"\xde01" u"cd");
 }
 
 TEST_CASE("EncodingConversion::encode - basic") {
@@ -93,7 +93,7 @@ TEST_CASE("EncodingConversion::encode - basic") {
 
 TEST_CASE("EncodingConversion::encode - four-byte UTF-16 characters") {
   auto conversion = transcoding_to("UTF-8");
-  u16string string = u"ab" "\xd83d" "\xde01" "cd";  // 'ab😁cd'
+  u16string string = u"ab" u"\xd83d" u"\xde01" u"cd";  // 'ab😁cd'
 
   vector<char> output(10);
   size_t bytes_encoded = 0, start = 0;
@@ -116,32 +116,32 @@ TEST_CASE("EncodingConversion::encode - four-byte UTF-16 characters") {
 
 TEST_CASE("EncodingConversion::encode - invalid characters in the middle of the string") {
   auto conversion = transcoding_to("UTF-8");
-  u16string string = u"abc" "\xD800" "def";
+  u16string string = u"abc" u"\xD800" u"def";
 
   vector<char> output(10);
   size_t bytes_encoded = 0, start = 0;
 
   bytes_encoded = conversion->encode(
     string, &start, string.size(), output.data(), output.size());
-  REQUIRE(std::string(output.data(), bytes_encoded) == "abc" "\ufffd" "def");
+  REQUIRE(std::string(output.data(), bytes_encoded) == u8"abc" u8"\ufffd" u8"def");
 
   // Here, the invalid character occurs at the end of a chunk.
   start = 0;
   bytes_encoded = conversion->encode(
     string, &start, 4, output.data(), output.size());
   bytes_encoded += conversion->encode(
     string, &start, string.size(), output.data() + bytes_encoded, output.size() - bytes_encoded);
-  REQUIRE(std::string(output.data(), bytes_encoded) == "abc" "\ufffd" "def");
+  REQUIRE(std::string(output.data(), bytes_encoded) == u8"abc" u8"\ufffd" u8"def");
 }
 
 TEST_CASE("EncodingConversion::encode - invalid characters at the end of the string") {
   auto conversion = transcoding_to("UTF-8");
-  u16string string = u"abc" "\xD800";
+  u16string string = u"abc" u"\xD800";
 
   vector<char> output(10);
   size_t bytes_encoded = 0, start = 0;
 
   bytes_encoded = conversion->encode(
     string, &start, string.size(), output.data(), output.size(), true);
-  REQUIRE(std::string(output.data(), bytes_encoded) == "abc" "\ufffd");
+  REQUIRE(std::string(output.data(), bytes_encoded) == u8"abc" u8"\ufffd");
 }

test/native/test-helpers.h

@@ -15,6 +15,7 @@
 
 using std::cout;
 using std::cerr;
+using uint = unsigned int;
 
 class TextBuffer;
 

test/native/text-buffer-test.cc

@@ -4,7 +4,8 @@
 #include "text-slice.h"
 #include "regex.h"
 #include <future>
-#include <unistd.h>
+#include <chrono>
+#include <thread>
 
 using std::move;
 using std::pair;
@@ -466,7 +467,7 @@ TEST_CASE("TextBuffer::find_words_with_subsequence_in_range") {
 }
 
 TEST_CASE("TextBuffer::has_astral") {
-  REQUIRE(TextBuffer{u"ab" "\xd83d" "\xde01" "cd"}.has_astral());
+  REQUIRE(TextBuffer{u"ab" u"\xd83d" u"\xde01" u"cd"}.has_astral());
   REQUIRE(!TextBuffer{u"abcd"}.has_astral());
 }
 
@@ -535,7 +536,7 @@ TEST_CASE("TextBuffer - random edits and queries") {
             Generator rand(seed);
             vector<SnapshotData> results;
             for (uint32_t k = 0; k < 5; k++) {
-              usleep(rand() % 1000);
+              std::this_thread::sleep_for(std::chrono::microseconds(rand() % 1000));
               vector<Point> line_ending_positions;
               for (uint32_t row = 0; row < snapshot->extent().row; row++) {
                 line_ending_positions.push_back({row, snapshot->line_length_for_row(row)});