From 7b3833633b861d08b486702d24bbfc2944fd6460 Mon Sep 17 00:00:00 2001 From: dm1sh Date: Sun, 26 Dec 2021 14:41:37 +0300 Subject: [PATCH] Set deterkite_method input to const --- CMakeLists.txt | 2 +- QRCodeLibrary/Method.cpp | 2 +- QRCodeLibrary/Method.hpp | 2 +- tests/Method_test.cpp | 10 +++------- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0eb21c2..ff62c36 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,6 @@ set(CMAKE_CXX_STANDARD 14) enable_testing() -add_subdirectory(Demo) add_subdirectory(QRCodeLibrary) +add_subdirectory(Demo) add_subdirectory(tests) diff --git a/QRCodeLibrary/Method.cpp b/QRCodeLibrary/Method.cpp index 390fc2f..0b0dc2d 100644 --- a/QRCodeLibrary/Method.cpp +++ b/QRCodeLibrary/Method.cpp @@ -3,7 +3,7 @@ #include "Method.hpp" #include "Tables.hpp" -QRCodeMethod Method::determite_method(byte_list& input) +QRCodeMethod Method::determite_method(const byte_list& input) { QRCodeMethod type = QRCodeMethod::Numeric; diff --git a/QRCodeLibrary/Method.hpp b/QRCodeLibrary/Method.hpp index e4503e3..6d9351e 100644 --- a/QRCodeLibrary/Method.hpp +++ b/QRCodeLibrary/Method.hpp @@ -20,7 +20,7 @@ enum class CorrectionLevel { class Method { public: - static QRCodeMethod determite_method(byte_list& input); + static QRCodeMethod determite_method(const byte_list& input); static constexpr bool is_num(char ch) { return ch >= '0' && ch <= '9'; }; }; diff --git a/tests/Method_test.cpp b/tests/Method_test.cpp index eb3597c..9669203 100644 --- a/tests/Method_test.cpp +++ b/tests/Method_test.cpp @@ -6,13 +6,9 @@ #include "../QRCodeLibrary/Method.hpp" TEST(MethodTests, DetermitesStringMethod) { - string a1("123"); - string a2("ABC"); - string a3("ghfjghfj gfjhgd"); - - EXPECT_EQ(Method::determite_method(str_to_bytes(a1)), QRCodeMethod::Numeric); - EXPECT_EQ(Method::determite_method(str_to_bytes(a2)), QRCodeMethod::Alphabetic); - EXPECT_EQ(Method::determite_method(str_to_bytes(a3)), QRCodeMethod::Byte); + EXPECT_EQ(Method::determite_method(str_to_bytes("123")), QRCodeMethod::Numeric); + EXPECT_EQ(Method::determite_method(str_to_bytes("ABC")), QRCodeMethod::Alphabetic); + EXPECT_EQ(Method::determite_method(str_to_bytes("ghfjghfj gfjhgd")), QRCodeMethod::Byte); } TEST(MethodTests, ChecksNumber) {