Merge pull request #16 from atom-community/catch2 [skip ci]

Author: aminya

.gitattributes

@@ -0,0 +1 @@
+vendor/ linguist-vendored

.github/workflows/ci.yml

@@ -16,11 +16,9 @@ jobs:
           - macos-latest
           - windows-2019
         node_version:
-          - 10
           - 12
           - 14
-    name: Node ${{ matrix.node_version }} on ${{ matrix.os }}
-
+          - 16
     steps:
       - uses: actions/checkout@v3
         with:
@@ -55,10 +53,3 @@ jobs:
         run: |
           npm run test:node
           npm run test:native
-
-  Skip:
-    if: contains(github.event.head_commit.message, '[skip ci]')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Skip CI 🚫
-        run: echo skip ci

binding.gyp

@@ -80,10 +80,8 @@
                 "target_name": "tests",
                 "type": "executable",
                 "cflags_cc!": ["-fno-exceptions"],
-                "defines": [
-                    "CATCH_CONFIG_CPP11_NO_IS_ENUM"
-                ],
                 "sources": [
+                    "vendor/catch_amalgamated.cpp",
                     "test/native/test-helpers.cc",
                     "test/native/tests.cc",
                     "test/native/encoding-conversion-test.cc",

test/native/test-helpers.cc

@@ -2,7 +2,7 @@
 #include "patch.h"
 #include "range.h"
 #include "text-buffer.h"
-#include <catch.hpp>
+#include <catch_amalgamated.hpp>
 #include <cstring>
 #include <memory>
 #include <ostream>

test/native/test-helpers.h

@@ -2,7 +2,7 @@
 #define SUPERSTRING_TEST_HELPERS_H
 
 #include "patch.h"
-#include <catch.hpp>
+#include <catch_amalgamated.hpp>
 #include <cstring>
 #include <memory>
 #include <ostream>

test/native/tests.cc

@@ -2,4 +2,4 @@
 // for a faster feedback loop
 
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <catch_amalgamated.hpp>

test/native/text-buffer-test.cc

@@ -339,20 +339,20 @@ TEST_CASE("TextBuffer::find") {
   Regex(u"(", &error_message);
   REQUIRE(error_message == u"missing closing parenthesis");
 
-  REQUIRE(buffer.find(Regex(u"", nullptr)) == (Range{{0, 0}, {0, 0}}));
-  REQUIRE(TextBuffer().find(Regex(u"", nullptr)) == (Range{{0, 0}, {0, 0}}));
+  REQUIRE(buffer.find(Regex(u"", nullptr)) == optional<Range>(Range{{0, 0}, {0, 0}}));
+  REQUIRE(TextBuffer().find(Regex(u"", nullptr)) == optional<Range>(Range{{0, 0}, {0, 0}}));
 
-  REQUIRE(buffer.find(Regex(u"ef*", nullptr)) == (Range{{1, 0}, {1, 2}}));
+  REQUIRE(buffer.find(Regex(u"ef*", nullptr)) == optional<Range>(Range{{1, 0}, {1, 2}}));
   REQUIRE(buffer.find(Regex(u"x", nullptr)) == optional<Range>{});
-  REQUIRE(buffer.find(Regex(u"c.", nullptr)) == (Range{{0, 2}, {0, 4}}));
-  REQUIRE(buffer.find(Regex(u"d", nullptr)) == (Range{{0, 3}, {0, 4}}));
-  REQUIRE(buffer.find(Regex(u"\\n", nullptr)) == (Range{{0, 4}, {1, 0}}));
-  REQUIRE(buffer.find(Regex(u"\\be", nullptr)) == (Range{{1, 0}, {1, 1}}));
-  REQUIRE(buffer.find(Regex(u"^e", nullptr)) == (Range{{1, 0}, {1, 1}}));
-  REQUIRE(buffer.find(Regex(u"^(e|d)g?", nullptr)) == (Range{{1, 0}, {1, 1}}));
+  REQUIRE(buffer.find(Regex(u"c.", nullptr)) == optional<Range>(Range{{0, 2}, {0, 4}}));
+  REQUIRE(buffer.find(Regex(u"d", nullptr)) == optional<Range>(Range{{0, 3}, {0, 4}}));
+  REQUIRE(buffer.find(Regex(u"\\n", nullptr)) == optional<Range>(Range{{0, 4}, {1, 0}}));
+  REQUIRE(buffer.find(Regex(u"\\be", nullptr)) == optional<Range>(Range{{1, 0}, {1, 1}}));
+  REQUIRE(buffer.find(Regex(u"^e", nullptr)) == optional<Range>(Range{{1, 0}, {1, 1}}));
+  REQUIRE(buffer.find(Regex(u"^(e|d)g?", nullptr)) == optional<Range>(Range{{1, 0}, {1, 1}}));
 
   buffer.reset(Text{u"a1b"});
-  REQUIRE(buffer.find(Regex(u"\\d", nullptr)) == (Range{{0, 1}, {0, 2}}));
+  REQUIRE(buffer.find(Regex(u"\\d", nullptr)) == optional<Range>(Range{{0, 1}, {0, 2}}));
 }
 
 TEST_CASE("TextBuffer::find - spanning edits") {
@@ -361,17 +361,17 @@ TEST_CASE("TextBuffer::find - spanning edits") {
   buffer.set_text_in_range({{0, 9}, {0, 9}}, u"67890");
 
   REQUIRE(buffer.text() == u"ab12345cd67890");
-  REQUIRE(buffer.find(Regex(u"b1234", nullptr)) == (Range{{0, 1}, {0, 6}}));
-  REQUIRE(buffer.find(Regex(u"b12345c", nullptr)) == (Range{{0, 1}, {0, 8}}));
-  REQUIRE(buffer.find(Regex(u"b12345cd6", nullptr)) == (Range{{0, 1}, {0, 10}}));
-  REQUIRE(buffer.find(Regex(u"345[a-z][a-z]", nullptr)) == (Range{{0, 4}, {0, 9}}));
-  REQUIRE(buffer.find(Regex(u"5cd6", nullptr)) == (Range{{0, 6}, {0, 10}}));
+  REQUIRE(buffer.find(Regex(u"b1234", nullptr)) == optional<Range>(Range{{0, 1}, {0, 6}}));
+  REQUIRE(buffer.find(Regex(u"b12345c", nullptr)) == optional<Range>(Range{{0, 1}, {0, 8}}));
+  REQUIRE(buffer.find(Regex(u"b12345cd6", nullptr)) == optional<Range>(Range{{0, 1}, {0, 10}}));
+  REQUIRE(buffer.find(Regex(u"345[a-z][a-z]", nullptr)) == optional<Range>(Range{{0, 4}, {0, 9}}));
+  REQUIRE(buffer.find(Regex(u"5cd6", nullptr)) == optional<Range>(Range{{0, 6}, {0, 10}}));
 
   buffer.reset(Text{u"abcdef"});
   buffer.set_text_in_range({{0, 2}, {0, 4}}, u"");
   REQUIRE(buffer.text() == u"abef");
-  REQUIRE(buffer.find(Regex(u"abe", nullptr)) == (Range{{0, 0}, {0, 3}}));
-  REQUIRE(buffer.find(Regex(u"bef", nullptr)) == (Range{{0, 1}, {0, 4}}));
+  REQUIRE(buffer.find(Regex(u"abe", nullptr)) == optional<Range>(Range{{0, 0}, {0, 3}}));
+  REQUIRE(buffer.find(Regex(u"bef", nullptr)) == optional<Range>(Range{{0, 1}, {0, 4}}));
   REQUIRE(buffer.find(Regex(u"bc", nullptr)) == optional<Range>{});
 }
 
@@ -584,10 +584,10 @@ TEST_CASE("TextBuffer - random edits and queries") {
 
         MatchResult match_result = regex.match(mutated_text.data(), mutated_text.size(), match_data);
         if (match_result.type == MatchResult::Partial || match_result.type == MatchResult::Full) {
-          REQUIRE(search_result == (Range{
-            mutated_text.position_for_offset(match_result.start_offset),
-            mutated_text.position_for_offset(match_result.end_offset),
-          }));
+          REQUIRE(search_result == optional<Range>(Range{
+                                       mutated_text.position_for_offset(match_result.start_offset),
+                                       mutated_text.position_for_offset(match_result.end_offset),
+                                   }));
         } else {
           REQUIRE(search_result == optional<Range>());
         }