mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-11-03 21:49:32 +01:00 
			
		
		
		
	Remove last usage of NotImplementedException
TeamCity reporter now uses CATCH_ERROR instead
This commit is contained in:
		@@ -156,7 +156,6 @@ set(INTERNAL_HEADERS
 | 
				
			|||||||
        ${HEADER_DIR}/internal/catch_matchers_string.h
 | 
					        ${HEADER_DIR}/internal/catch_matchers_string.h
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_matchers_vector.h
 | 
					        ${HEADER_DIR}/internal/catch_matchers_vector.h
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_message.h
 | 
					        ${HEADER_DIR}/internal/catch_message.h
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_notimplemented_exception.h
 | 
					 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_objc.hpp
 | 
					        ${HEADER_DIR}/internal/catch_objc.hpp
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_objc_arc.hpp
 | 
					        ${HEADER_DIR}/internal/catch_objc_arc.hpp
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_option.hpp
 | 
					        ${HEADER_DIR}/internal/catch_option.hpp
 | 
				
			||||||
@@ -216,7 +215,6 @@ set(IMPL_SOURCES
 | 
				
			|||||||
        ${HEADER_DIR}/internal/catch_matchers.cpp
 | 
					        ${HEADER_DIR}/internal/catch_matchers.cpp
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_matchers_string.cpp
 | 
					        ${HEADER_DIR}/internal/catch_matchers_string.cpp
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_message.cpp
 | 
					        ${HEADER_DIR}/internal/catch_message.cpp
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_notimplemented_exception.cpp
 | 
					 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_registry_hub.cpp
 | 
					        ${HEADER_DIR}/internal/catch_registry_hub.cpp
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_interfaces_reporter.cpp
 | 
					        ${HEADER_DIR}/internal/catch_interfaces_reporter.cpp
 | 
				
			||||||
        ${HEADER_DIR}/internal/catch_random_number_generator.cpp
 | 
					        ${HEADER_DIR}/internal/catch_random_number_generator.cpp
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -17,9 +17,6 @@
 | 
				
			|||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include "internal/catch_notimplemented_exception.h"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
// Temporary hack to fix separately provided reporters
 | 
					// Temporary hack to fix separately provided reporters
 | 
				
			||||||
#include "../reporters/catch_reporter_bases.hpp"
 | 
					#include "../reporters/catch_reporter_bases.hpp"
 | 
				
			||||||
#include "catch_reporter_registrars.hpp"
 | 
					#include "catch_reporter_registrars.hpp"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,25 +0,0 @@
 | 
				
			|||||||
/*
 | 
					 | 
				
			||||||
 *  Created by Phil on 5/8/2012.
 | 
					 | 
				
			||||||
 *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 *  Distributed under the Boost Software License, Version 1.0. (See accompanying
 | 
					 | 
				
			||||||
 *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include "catch_notimplemented_exception.h"
 | 
					 | 
				
			||||||
#include <sstream>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
namespace Catch {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    NotImplementedException::NotImplementedException( SourceLineInfo const& lineInfo ) {
 | 
					 | 
				
			||||||
        std::ostringstream oss;
 | 
					 | 
				
			||||||
        oss << lineInfo << ": function ";
 | 
					 | 
				
			||||||
        oss << "not implemented";
 | 
					 | 
				
			||||||
        m_what = oss.str();
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    const char* NotImplementedException::what() const noexcept {
 | 
					 | 
				
			||||||
        return m_what.c_str();
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
} // end namespace Catch
 | 
					 | 
				
			||||||
@@ -1,35 +0,0 @@
 | 
				
			|||||||
/*
 | 
					 | 
				
			||||||
 *  Created by Phil on 5/8/2012.
 | 
					 | 
				
			||||||
 *  Copyright 2012 Two Blue Cubes Ltd. All rights reserved.
 | 
					 | 
				
			||||||
 *
 | 
					 | 
				
			||||||
 *  Distributed under the Boost Software License, Version 1.0. (See accompanying
 | 
					 | 
				
			||||||
 *  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 | 
					 | 
				
			||||||
 */
 | 
					 | 
				
			||||||
#ifndef TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
 | 
					 | 
				
			||||||
#define TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include "catch_common.h"
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#include <exception>
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
namespace Catch {
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    class NotImplementedException : public std::exception
 | 
					 | 
				
			||||||
    {
 | 
					 | 
				
			||||||
    public:
 | 
					 | 
				
			||||||
        NotImplementedException( SourceLineInfo const& lineInfo );
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        virtual ~NotImplementedException() noexcept = default;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        virtual const char* what() const noexcept override;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    private:
 | 
					 | 
				
			||||||
        std::string m_what;
 | 
					 | 
				
			||||||
    };
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
} // end namespace Catch
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
///////////////////////////////////////////////////////////////////////////////
 | 
					 | 
				
			||||||
#define CATCH_NOT_IMPLEMENTED throw Catch::NotImplementedException( CATCH_INTERNAL_LINEINFO )
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
#endif // TWOBLUECUBES_CATCH_NOTIMPLEMENTED_EXCEPTION_H_INCLUDED
 | 
					 | 
				
			||||||
@@ -97,12 +97,12 @@ namespace Catch {
 | 
				
			|||||||
                    case ResultWas::Ok:
 | 
					                    case ResultWas::Ok:
 | 
				
			||||||
                    case ResultWas::Info:
 | 
					                    case ResultWas::Info:
 | 
				
			||||||
                    case ResultWas::Warning:
 | 
					                    case ResultWas::Warning:
 | 
				
			||||||
 | 
					                        CATCH_ERROR( "Internal error in TeamCity reporter" );
 | 
				
			||||||
                    // These cases are here to prevent compiler warnings
 | 
					                    // These cases are here to prevent compiler warnings
 | 
				
			||||||
                    case ResultWas::Unknown:
 | 
					                    case ResultWas::Unknown:
 | 
				
			||||||
                    case ResultWas::FailureBit:
 | 
					                    case ResultWas::FailureBit:
 | 
				
			||||||
                    case ResultWas::Exception:
 | 
					                    case ResultWas::Exception:
 | 
				
			||||||
                        CATCH_NOT_IMPLEMENTED;
 | 
					                        CATCH_ERROR( "Not implemented" );
 | 
				
			||||||
                }
 | 
					                }
 | 
				
			||||||
                if( assertionStats.infoMessages.size() == 1 )
 | 
					                if( assertionStats.infoMessages.size() == 1 )
 | 
				
			||||||
                    msg << " with message:";
 | 
					                    msg << " with message:";
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user