From 98b31d788b827763f7ec97db5a9db4e4dd9f0deb Mon Sep 17 00:00:00 2001
From: Henry Fredrick Schreiner <henry.fredrick.schreiner@cern.ch>
Date: Mon, 18 Jun 2018 13:10:22 +0200
Subject: [PATCH] Adding tests and deprecation messages

---
 CMakeLists.txt           |  2 +-
 include/CLI/App.hpp      | 12 +++++++++++
 include/CLI/Macros.hpp   |  2 +-
 include/CLI/Option.hpp   |  4 ++++
 tests/CMakeLists.txt     |  8 ++++++++
 tests/DeprecatedTest.cpp | 43 ++++++++++++++++++++++++++++++++++++++++
 tests/HelpTest.cpp       |  8 ++++++++
 7 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 tests/DeprecatedTest.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1fe82483..e8cce1b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
     if(MSVC)
         add_definitions("/W4")
     else()
-        add_definitions(-Wall -Wextra -pedantic -Wno-deprecated-declarations)
+        add_definitions(-Wall -Wextra -pedantic)
     endif()
 
     if(CMAKE_VERSION VERSION_GREATER 3.6)
diff --git a/include/CLI/App.hpp b/include/CLI/App.hpp
index d81ccfd6..58ab5fd3 100644
--- a/include/CLI/App.hpp
+++ b/include/CLI/App.hpp
@@ -1039,6 +1039,18 @@ class App {
             return formatter_->make_help(this, prev, mode);
     }
 
+    /// Provided for backwards compatibility \deprecated
+    CLI11_DEPRECATED("Please use footer instead")
+    App *set_footer(std::string msg) { return footer(msg); }
+
+    /// Provided for backwards compatibility \deprecated
+    CLI11_DEPRECATED("Please use name instead")
+    App *set_name(std::string msg) { return name(msg); }
+
+    /// Provided for backwards compatibility \deprecated
+    CLI11_DEPRECATED("Please use callback instead")
+    App *set_callback(std::function<void()> fn) { return callback(fn); }
+
     ///@}
     /// @name Getters
     ///@{
diff --git a/include/CLI/Macros.hpp b/include/CLI/Macros.hpp
index 6defe59a..f7a26650 100644
--- a/include/CLI/Macros.hpp
+++ b/include/CLI/Macros.hpp
@@ -30,7 +30,7 @@
 #endif
 #endif
 
-#if defined(PYBIND11_CPP14)
+#if defined(CLI11_CPP14)
 #define CLI11_DEPRECATED(reason) [[deprecated(reason)]]
 #elif defined(_MSC_VER)
 #define CLI11_DEPRECATED(reason) __declspec(deprecated(reason))
diff --git a/include/CLI/Option.hpp b/include/CLI/Option.hpp
index d0335ff9..3bb24340 100644
--- a/include/CLI/Option.hpp
+++ b/include/CLI/Option.hpp
@@ -665,6 +665,10 @@ class Option : public OptionBase<Option> {
         return this;
     }
 
+    /// Provided for backward compatibility \deprecated
+    CLI11_DEPRECATED("Please use type_name instead")
+    Option *set_type_name(std::string typeval) { return type_name(typeval); }
+
     /// Set a custom option size
     Option *type_size(int type_size) {
         type_size_ = type_size;
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 81d9c118..64698fe2 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -30,6 +30,7 @@ set(CLI11_TESTS
     FormatterTest
     NewParseTest
     OptionalTest
+    DeprecatedTest
     )
 
 set(CLI11_MULTIONLY_TESTS
@@ -66,6 +67,13 @@ foreach(T ${CLI11_MULTIONLY_TESTS})
 
 endforeach()
 
+# Add -Wno-deprecated-declarations to DeprecatedTest
+if(NOT MSVC)
+    target_compile_options(DeprecatedTest PRIVATE -Wno-deprecated-declarations)
+    if(TARGET DeprecatedTest_Single)
+        target_compile_options(DeprecatedTest_Single PRIVATE -Wno-deprecated-declarations)
+    endif()
+endif()
 
 # Link test (build error if inlines missing)
 add_library(link_test_1 link_test_1.cpp)
diff --git a/tests/DeprecatedTest.cpp b/tests/DeprecatedTest.cpp
new file mode 100644
index 00000000..ba574365
--- /dev/null
+++ b/tests/DeprecatedTest.cpp
@@ -0,0 +1,43 @@
+#ifdef CLI11_SINGLE_FILE
+#include "CLI11.hpp"
+#else
+#include "CLI/CLI.hpp"
+#endif
+
+#include "gtest/gtest.h"
+
+TEST(Deprecated, SetFooter) {
+    CLI::App app{"My prog"};
+
+    app.set_footer("My Footer");
+    EXPECT_EQ("My Footer", app.get_footer());
+}
+
+TEST(Deprecated, SetName) {
+    CLI::App app{"My prog"};
+
+    app.set_name("My Name");
+    EXPECT_EQ("My Name", app.get_name());
+}
+
+TEST(Deprecated, SetCallback) {
+    CLI::App app{"My prog"};
+
+    bool val;
+    app.set_callback([&val]() { val = true; });
+
+    std::vector<std::string> something;
+    app.parse(something);
+
+    EXPECT_TRUE(val);
+}
+
+TEST(Deprecated, SetTypeName) {
+    CLI::App app{"My prog"};
+
+    std::string val;
+    auto opt = app.add_option("--val", val);
+    opt->set_type_name("THAT");
+
+    EXPECT_EQ(opt->get_type_name(), "THAT");
+}
diff --git a/tests/HelpTest.cpp b/tests/HelpTest.cpp
index 5f30f2ce..e611839e 100644
--- a/tests/HelpTest.cpp
+++ b/tests/HelpTest.cpp
@@ -561,6 +561,14 @@ TEST(THelp, CustomDoubleOption) {
     EXPECT_THAT(app.help(), Not(HasSubstr("x 2")));
 }
 
+TEST(THelp, CheckEmptyTypeName) {
+    CLI::App app;
+
+    auto opt = app.add_flag("-f,--flag");
+    std::string name = opt->get_type_name();
+    EXPECT_TRUE(name.empty());
+}
+
 TEST(THelp, AccessDescription) {
     CLI::App app{"My description goes here"};