From 078486660827209659c25bd41779672d450efd92 Mon Sep 17 00:00:00 2001 From: "Jordan Maples [MSFT]" <49793787+JordanMaples@users.noreply.github.com> Date: Mon, 9 Dec 2019 16:08:27 -0800 Subject: [PATCH] added back death test, fixed VS2019 test failures --- ThirdPartyNotices.txt | 66 +++++++++++++++++++++++-------------------- tests/span_tests.cpp | 12 ++++---- 2 files changed, 42 insertions(+), 36 deletions(-) diff --git a/ThirdPartyNotices.txt b/ThirdPartyNotices.txt index ebf7b6e..eab4580 100644 --- a/ThirdPartyNotices.txt +++ b/ThirdPartyNotices.txt @@ -2,38 +2,42 @@ THIRD-PARTY SOFTWARE NOTICES AND INFORMATION Do Not Translate or Localize -GSL: Guidelines Support Library incorporates third party material from the projects listed below. The original copyright notice and the license under which Microsoft received such third party material are set forth below. Microsoft reserves all other rights not expressly granted, whether by implication, estoppel or otherwise. +GSL: Guidelines Support Library incorporates third party material from the projects listed below. +The original copyright notice and the license under which Microsoft received such third party material are set forth below. +Microsoft reserves all other rights not expressly granted, whether by implication, estoppel or otherwise. +-------------------------------------------------------------------------- +Software: Google Test +Owner: Google Inc. +Source URL: github.com/google/googletest +License: BSD 3 - Clause +Text: + Copyright 2008, Google Inc. + All rights reserved. -1. Catch (https://github.com/philsquared/Catch) - - -%% Catch NOTICES, INFORMATION, AND LICENSE BEGIN HERE -========================================= -Boost Software License - Version 1.0 - August 17th, 2003 - -Permission is hereby granted, free of charge, to any person or organization -obtaining a copy of the software and accompanying documentation covered by -this license (the "Software") to use, reproduce, display, distribute, -execute, and transmit the Software, and to prepare derivative works of the -Software, and to permit third-parties to whom the Software is furnished to -do so, all subject to the following: - -The copyright notices in the Software and this entire statement, including -the above license grant, this restriction and the following disclaimer, -must be included in all copies of the Software, in whole or in part, and -all derivative works of the Software, unless such copies or derivative -works are solely in the form of machine-executable object code generated by -a source language processor. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT -SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE -FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, -ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER -DEALINGS IN THE SOFTWARE. -========================================= -END OF Catch NOTICES, INFORMATION, AND LICENSE + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following disclaimer + in the documentation and/or other materials provided with the + distribution. + * Neither the name of Google Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR + A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE + OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +-------------------------------------------------------------------------- diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp index b2687ce..cdc2f72 100644 --- a/tests/span_tests.cpp +++ b/tests/span_tests.cpp @@ -17,7 +17,7 @@ #ifdef _MSC_VER // blanket turn off warnings from CppCoreCheck from catch // so people aren't annoyed by them when running the tool. -#pragma warning(disable : 26440 26426 26497) // from catch +#pragma warning(disable : 26440 26426 26497 4189) // from catch #endif @@ -25,6 +25,7 @@ //disable warnings from gtest #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wundef" +#pragma GCC diagnostic ignored "-Wunused-variable" #endif #if __clang__ #pragma GCC diagnostic ignored "-Wglobal-constructors" @@ -1217,14 +1218,14 @@ TEST(span_test, from_array_constructor) auto beyond = s.rend(); EXPECT_TRUE(it != beyond); - //EXPECT_DEATH(*beyond, ".*"); + EXPECT_DEATH(auto _ = *beyond , ".*"); EXPECT_TRUE(beyond - first == 4); EXPECT_TRUE(first - first == 0); EXPECT_TRUE(beyond - beyond == 0); ++it; - EXPECT_TRUE(it - first == 1); + EXPECT_TRUE(it - s.rbegin() == 1); EXPECT_TRUE(*it == 3); *it = 22; EXPECT_TRUE(*it == 22); @@ -1258,14 +1259,15 @@ TEST(span_test, from_array_constructor) auto beyond = s.crend(); EXPECT_TRUE(it != beyond); - //EXPECT_DEATH(*beyond, ".*"); + EXPECT_DEATH(auto _ = *beyond, ".*"); EXPECT_TRUE(beyond - first == 4); EXPECT_TRUE(first - first == 0); EXPECT_TRUE(beyond - beyond == 0); + std::cout << *first << std::endl; ++it; - EXPECT_TRUE(it - first == 1); + EXPECT_TRUE(it - s.crbegin() == 1); EXPECT_TRUE(*it == 3); EXPECT_TRUE(beyond - it == 3);