boost/spec/detail/container_should_impl.hpp libs/spec/test/spec_test_containers.cpp @@ -8,13 +8,14 @@ Done: * "should.be_odd()" * Add pointer inspection / specification * "should.be_null()" and "should.be_not_null()/should.not_be_null()" +* Add container inspection / specification + * "should.contain(instance)" and "should.not_contain()" + * "should.be_empty()" and "should.not_be_empty()/should.be_not_empty()" Missing: * Add pointer inspection / specification * "should.be_of_type<type>(instance)" and "should.not_be_of_type<type>(instance)" * "should.be_derived_from<type>(instance)" and "should.not_be_derived_from<type>(instance)" * Add container inspection / specification - * "should.be_empty()" and "should.not_be_empty()/should.be_not_empty()" - * "should.contain(instance)" and "should.not_contain()" * Implement appropriate exception types TODO @@ -12,6 +12,7 @@ #include <boost/spec/exceptions.hpp> #include <boost/spec/detail/should_impl.hpp> +#include <boost/spec/detail/container_should_impl.hpp> #include <boost/type_traits/is_array.hpp> #include <boost/type_traits/is_pointer.hpp> #include <boost/type_traits/is_same.hpp> @@ -76,6 +77,20 @@ namespace boost { namespace spec { return spec<T>(v); }; + template <typename T> + struct container_spec { + typedef T type; + T & container; + detail::should_container_impl<T> should, & must; + + explicit container_spec(T & container_) : container(container_), should(container), must(should) { }; + }; + + template <typename T> + inline container_spec<T> container(T & c) { + return container_spec<T>(c); + }; + }; // namespace spec }; // namepsace boost boost/spec.hpp @@ -244,6 +244,50 @@ namespace boost { namespace spec { }; template <typename T> + struct container_does_not_contain : std::exception { + explicit container_does_not_contain (T const & value) + : _value(value) { + std::ostringstream message(""); + message << "spec:: container supplied does not contain value (" + << _value + << ")."; + + _message = message.str(); + }; + + const char * what() const throw () { + return _message.c_str(); + }; + + ~container_does_not_contain() throw () { }; + + T _value; + std::string _message; + }; + + template <typename T> + struct container_contains : std::exception { + explicit container_contains (T const & value) + : _value(value) { + std::ostringstream message(""); + message << "spec:: container supplied contains value (" + << _value + << ")."; + + _message = message.str(); + }; + + const char * what() const throw () { + return _message.c_str(); + }; + + ~container_contains() throw () { }; + + T _value; + std::string _message; + }; + + template <typename T> struct is_null : std::exception { explicit is_null(T const & value) : _value(value) { @@ -287,6 +331,45 @@ namespace boost { namespace spec { std::string _message; }; + template <typename T> + struct container_not_empty : std::exception { + typedef T type; + explicit container_not_empty() + { + std::ostringstream message(""); + message << "spec:: container supplied is not empty."; + + _message = message.str(); + }; + + const char * what() const throw () { + return _message.c_str(); + }; + + ~container_not_empty() throw () { }; + + std::string _message; + }; + + template <typename T> + struct container_empty : std::exception { + typedef T type; + explicit container_empty() + { + std::ostringstream message(""); + message << "spec:: container supplied is empty."; + + _message = message.str(); + }; + + const char * what() const throw () { + return _message.c_str(); + }; + + ~container_empty() throw () { }; + + std::string _message; + }; }; // namespace spec }; // namespace boost boost/spec/exceptions.hpp @@ -14,3 +14,6 @@ unit-test spec_test : spec_test.cpp : <linkflags>-lboost_regex-gcc41 ; +unit-test spec_test_containers : spec_test_containers.cpp + : <linkflags>-lboost_regex-gcc41 + ; libs/spec/build/Jamfile.v2 @@ -4,7 +4,6 @@ // http://www.boost.org/LICENSE_1_0.txt ) #include <boost/spec.hpp> -#include <vector> #include <iostream> using namespace boost::spec ; libs/spec/test/spec_test.cpp 1d6a18a9e49634b71067d52e81fa489a02e3c051 Dean Michael Berris mikhailberis@gmail.com http://github.com/mikhailberis/spec-c--/commit/d52d035addf393d6ad9f63e073729536a4300242 d52d035addf393d6ad9f63e073729536a4300242 2007-02-23T03:49:54-08:00 2007-02-23T03:49:54-08:00 Added support for inspecting containers. See TODO file for more details. c273784cbbfd63c25b51fb5ab5d379fd4d6ec2b5 Dean Michael Berris mikhailberis@gmail.com