Skip to content

Commit

Permalink
update r664
Browse files Browse the repository at this point in the history
  • Loading branch information
srz-zumix committed Jul 25, 2014
1 parent bf72e1e commit 69ff711
Show file tree
Hide file tree
Showing 7 changed files with 35 additions and 29 deletions.
5 changes: 5 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ Changes for 1.10.0:
* operatoer == のないオブジェクトの IUTEST_*_EQ 対応
* operatoer != のないオブジェクトの IUTEST_*_NE 対応
* junit xml 出力に対応(--iutest_output=junit)
* ARM対応

** 修正
* --iutest_break_on_failure でスキップや警告でも停止していた不具合を修正
* バグ修正

--------------------------------------------------
Changes for 1.9.1:
Expand Down
2 changes: 1 addition & 1 deletion doc/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = iutest
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 1.9.99.13
PROJECT_NUMBER = 1.9.99.14

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
3 changes: 1 addition & 2 deletions include/internal/iutest_genparams.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -300,8 +300,7 @@ class iuValueArray2
template<typename T>
operator iuIParamGenerator<T>* (void) const
{
const T val[] = { static_cast<T>(v1), static_cast<T>(v2)
};
const T val[] = { static_cast<T>(v1), static_cast<T>(v2) };
return new iuValuesInParamsGenerator<T>(val);
}
public:
Expand Down
9 changes: 0 additions & 9 deletions include/internal/iutest_params_util.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,15 +41,6 @@ class IParamTestInfoData
::std::string m_name;
};

/**
* @brief パラメータテストインスタンスベースクラス
*/
class IParamEachTestBase
{
public:
virtual ~IParamEachTestBase(void) {}
};

/**
* @brief パラメータ単体テストインスタンスインターフェイス
*/
Expand Down
19 changes: 14 additions & 5 deletions include/internal/iutest_result_reporter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,17 @@ class NewTestPartResultCheckHelper
class ReporterHolder
{
public:
ReporterHolder(TestPartResultReporterInterface* p)
: m_origin(TestEnv::GetGlobalTestPartResultReporter())
ReporterHolder() : m_origin(NULL) {}
virtual ~ReporterHolder(void)
{
Detach();
}
void Attach(TestPartResultReporterInterface* p)
{
m_origin = TestEnv::GetGlobalTestPartResultReporter();
TestEnv::SetGlobalTestPartResultReporter(p);
}
virtual ~ReporterHolder(void)
void Detach(void)
{
TestEnv::SetGlobalTestPartResultReporter(m_origin);
}
Expand All @@ -106,8 +111,9 @@ class NewTestPartResultCheckHelper
{
typedef REPORTER _Mybase;
public:
Counter(void) : m_holder(this), m_count(0)
Counter(void) : m_count(0)
{
m_holder.Attach(this);
}
virtual void ReportTestPartResult(const TestPartResult& result) IUTEST_CXX_OVERRIDE
{
Expand All @@ -132,7 +138,10 @@ class NewTestPartResultCheckHelper
typedef REPORTER _Mybase;
typedef ::std::vector<TestPartResult> TestPartResults;
public:
Collector(void) : m_holder(this) {}
Collector(void)
{
m_holder.Attach(this);
}
public:
virtual void ReportTestPartResult(const TestPartResult& result) IUTEST_CXX_OVERRIDE
{
Expand Down
22 changes: 12 additions & 10 deletions include/internal/iutest_stdlib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -137,19 +137,21 @@ namespace iutest {
namespace tuples
{
#if IUTEST_HAS_STD_TUPLE
using ::std::tuple;
using ::std::tuple_size;
using ::std::tuple_element;
using ::std::make_tuple;
using ::std::get;
namespace alias = ::std;
#elif IUTEST_HAS_TR1_TUPLE
using ::std::tr1::tuple;
using ::std::tr1::tuple_size;
using ::std::tr1::tuple_element;
using ::std::tr1::make_tuple;
using ::std::tr1::get;
namespace alias = ::std::tr1;
#endif

using alias::tuple;
using alias::tuple_element;
using alias::make_tuple;
using alias::get;

template<typename T>struct tuple_size : public alias::tuple_size<T> {};
template<typename T>struct tuple_size<const T> : public alias::tuple_size<T> {};
template<typename T>struct tuple_size<volatile T> : public alias::tuple_size<T>{};
template<typename T>struct tuple_size<const volatile T> : public alias::tuple_size<T>{};

namespace detail
{
template<typename T, typename F, int Begin>
Expand Down
4 changes: 2 additions & 2 deletions include/iutest_ver.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

//======================================================================
// define
#define IUTEST_VER 0x01099913u //!< iutest version 1.9.99.13
#define IUTEST_VER 0x01099914u //!< iutest version 1.9.99.14
#define IUTEST_MAJORVER 0x01u //!< Major Version
#define IUTEST_MINORVER 0x09u //!< Minor Version
#define IUTEST_BUILD 0x99u //!< Build
#define IUTEST_REVISION 0x13u //!< Revision
#define IUTEST_REVISION 0x14u //!< Revision

/**
* @mainpage
Expand Down

0 comments on commit 69ff711

Please sign in to comment.