From 8de3f4d145c8f0321164afdcd1fa3d0e0c374e97 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 23 Jul 2018 19:02:56 +0100
Subject: Update for compatibility with Catch2 version 2.3.0

---
 meson.build                       | 2 +-
 unittest/catch_main.cpp           | 2 +-
 unittest/test1.cc                 | 2 +-
 unittest/test2.cc                 | 2 +-
 unittest/test3.cc                 | 2 +-
 unittest/test_C_API.cpp           | 2 +-
 unittest/test_HOTP.cc             | 2 +-
 unittest/test_issues.cc           | 2 +-
 unittest/test_multiple_devices.cc | 2 +-
 unittest/test_offline.cc          | 2 +-
 unittest/test_strdup.cpp          | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/meson.build b/meson.build
index f3be6b3..600be6d 100644
--- a/meson.build
+++ b/meson.build
@@ -120,7 +120,7 @@ install_data(
 )
 
 if get_option('tests') or get_option('offline-tests')
-  dep_catch = dependency('catch', required : false)
+  dep_catch = dependency('catch2', version : '>=2.3.0', required : false)
   if not dep_catch.found()
     dep_catch = declare_dependency(
       include_directories : include_directories('unittest/Catch/single_include')
diff --git a/unittest/catch_main.cpp b/unittest/catch_main.cpp
index 0ef4a4b..11a0a3a 100644
--- a/unittest/catch_main.cpp
+++ b/unittest/catch_main.cpp
@@ -20,4 +20,4 @@
  */
 
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main()
-#include "catch.hpp"
\ No newline at end of file
+#include "catch2/catch.hpp"
\ No newline at end of file
diff --git a/unittest/test1.cc b/unittest/test1.cc
index 51a2ef6..c8281c3 100644
--- a/unittest/test1.cc
+++ b/unittest/test1.cc
@@ -19,7 +19,7 @@
  * SPDX-License-Identifier: LGPL-3.0
  */
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 
 #include <iostream>
 #include <string.h>
diff --git a/unittest/test2.cc b/unittest/test2.cc
index a943683..604b3ba 100644
--- a/unittest/test2.cc
+++ b/unittest/test2.cc
@@ -23,7 +23,7 @@
 static const char *const default_admin_pin = "12345678";
 static const char *const default_user_pin = "123456";
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 
 #include <iostream>
 #include <string.h>
diff --git a/unittest/test3.cc b/unittest/test3.cc
index 84f952c..bb8a376 100644
--- a/unittest/test3.cc
+++ b/unittest/test3.cc
@@ -25,7 +25,7 @@ static const char *const default_user_pin = "123456";
 const char * temporary_password = "123456789012345678901234";
 const char * RFC_SECRET = "12345678901234567890";
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 
 #include <iostream>
 #include <string.h>
diff --git a/unittest/test_C_API.cpp b/unittest/test_C_API.cpp
index 1964738..27eb1c4 100644
--- a/unittest/test_C_API.cpp
+++ b/unittest/test_C_API.cpp
@@ -21,7 +21,7 @@
 
 static const int TOO_LONG_STRING = 200;
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 
 #include <iostream>
 #include <string>
diff --git a/unittest/test_HOTP.cc b/unittest/test_HOTP.cc
index b11cf25..0b0b222 100644
--- a/unittest/test_HOTP.cc
+++ b/unittest/test_HOTP.cc
@@ -20,7 +20,7 @@
  */
 
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 #include <iostream>
 #include "device_proto.h"
 #include "log.h"
diff --git a/unittest/test_issues.cc b/unittest/test_issues.cc
index d4fd72e..b588b00 100644
--- a/unittest/test_issues.cc
+++ b/unittest/test_issues.cc
@@ -26,7 +26,7 @@ const char * const temporary_password = "123456789012345678901234";
 const char * const RFC_SECRET = "12345678901234567890";
 const char * const hidden_volume_pass = "123456789012345";
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 
 #include <NitrokeyManager.h>
 
diff --git a/unittest/test_multiple_devices.cc b/unittest/test_multiple_devices.cc
index 81d18c9..cd78681 100644
--- a/unittest/test_multiple_devices.cc
+++ b/unittest/test_multiple_devices.cc
@@ -24,7 +24,7 @@ static const char *const default_user_pin = "123456";
 const char * temporary_password = "123456789012345678901234";
 const char * RFC_SECRET = "12345678901234567890";
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 
 #include <iostream>
 #include <NitrokeyManager.h>
diff --git a/unittest/test_offline.cc b/unittest/test_offline.cc
index 3f79fa8..75bd316 100644
--- a/unittest/test_offline.cc
+++ b/unittest/test_offline.cc
@@ -19,7 +19,7 @@
  * SPDX-License-Identifier: LGPL-3.0
  */
 
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 #include <NitrokeyManager.h>
 #include <memory>
 #include <string>
diff --git a/unittest/test_strdup.cpp b/unittest/test_strdup.cpp
index 6c2cfb3..4f77b7f 100644
--- a/unittest/test_strdup.cpp
+++ b/unittest/test_strdup.cpp
@@ -26,7 +26,7 @@
 #include <cstdio>
 #include <memory.h>
 #include "../NK_C_API.h"
-#include "catch.hpp"
+#include "catch2/catch.hpp"
 
 
 static const int SHORT_STRING_LENGTH = 10;
-- 
cgit v1.2.3