diff --git a/CHANGES b/CHANGES index 2244fafd0b..0e9c0fd06a 100644 --- a/CHANGES +++ b/CHANGES @@ -8,7 +8,7 @@ Changes for 1.11.0: * Matcher に StrEq,StrNe,StrCaseEq,StrCaseNe,HasSubstr を追加 * Matcher に FloatEq,DoubleEq,NanSensitiveFloatEq,NanSensitiveDoubleEq を追加 * コンテナMatcher に Each,ElementsAre,ElementsAreArray を追加 -* メンバーMatcher に Key,Pair,Field を追加 +* メンバーMatcher に Key,Pair,Field,Property を追加 ** 修正 * IUTEST_*_FLOAT_EQ,DOUBLE_EQ で NAN の比較が真を返す不具合を修正 diff --git a/doc/Doxyfile b/doc/Doxyfile index 57d54f73fd..1daf3deaa1 100644 --- a/doc/Doxyfile +++ b/doc/Doxyfile @@ -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.10.99.15 +PROJECT_NUMBER = 1.10.99.16 # 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 diff --git a/doc/cover.html b/doc/cover.html index 7707424487..8c8529a5e6 100644 --- a/doc/cover.html +++ b/doc/cover.html @@ -52,7 +52,7 @@
iutest ł Matcher Ă܂Biutest Matcher Google Mock ̂Ƃقړg܂B
+AGoogle Mock Ƃ̌݊Ή͂Ă܂̂łӂB
+
+Matcher IUTEST_*_THAT AT[Vŗp܂B +
IUTEST_*_THAT(expression, m) | expression ̒l Mathcer m Ƀ}b`邩܂ |
+iuwandbox.py sample.cpp ++ +\[XR[hɓʂȋLq͕Kv܂B
+#include "../../include/iutest.hpp" +#include+ +Tv̎sʂ͂ɂȂ܂B+ +int main(int argc, char** argv) +{ + int x = 0; + std::cout << "hoge" << std::endl; + + IUTEST_INIT(&argc, argv); + return IUTEST_RUN_ALL_TESTS(); +} + +IUTEST(Foo, Bar) +{ + IUTEST_ASSERT_EQ(1, abs(-1)); +} +
-c,--compiler COMPILER | RpC[I܂BIłRpC[ Wandbox mF邩A--list_compiler IvVŊmFĂB |
-x,--options OPTIONS | IvVI܂BIłRpC[ Wandbox mF邩A--list_options IvVŊmFĂB |
-f,--compiler_options_raw OPTIONS | RpC[̃IvVڎw肵܂B̃IvVw肷ꍇ́A[ -f"-Dx=hogefuga\n-O3" ] Ƃ邩A[ -f"-Dx=hogefuga" -f"-O3" ] ̂悤ɕIvVLqĂB |
-r,--runtime_options_raw OPTIONS | rhst@C̃R}hCIvVw肵܂B̃IvVw肷ꍇ́A[ -r"--iutest_shuffle\n--iutest_random_seed=1" ] Ƃ邩A[ -r"--iutest_shuffle" -r"--iutest_random_seed=1" ] ̂悤ɕIvVLqĂB |
--list_compiler | p\ȃRpC[܂B |
--list_options COMPILER | COMPILER ŗp\ȃIvV܂B |
--stdin | s stdin ̓ew肵܂B |
--encoding ENCODING | ̓\[XR[ht@C̃GR[hw肵܂B |
-s, --save | permarnent link ܂B |
--permlink ID | ID permarnent link ̏擾܂B--output IvVw肷ƁA\[XR[ht@Cɏo܂B |
-o, --output FILE | --permlink w肵ۂɎ擾\[XR[h FILE ɏo܂B |
-v,--version | o[W\܂ |
-h,--help | wv\܂ |
Property(const P& prop, const T& expected) { return detail::PropertyMatcher
(prop, expected); }
+
#if IUTEST_HAS_MATCHER_ALLOF_AND_ANYOF
diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp
index adc76cc87a..2650c15c62 100644
--- a/include/iutest_ver.hpp
+++ b/include/iutest_ver.hpp
@@ -17,11 +17,11 @@
//======================================================================
// define
-#define IUTEST_VER 0x01109915u //!< iutest version 1.10.99.15
+#define IUTEST_VER 0x01109916u //!< iutest version 1.10.99.16
#define IUTEST_MAJORVER 0x01u //!< Major Version
#define IUTEST_MINORVER 0x10u //!< Minor Version
#define IUTEST_BUILD 0x99u //!< Build
-#define IUTEST_REVISION 0x15u //!< Revision
+#define IUTEST_REVISION 0x16u //!< Revision
/**
* @mainpage
diff --git a/shippable.yml b/shippable.yml
index c34873ca7c..a8ef30fa28 100644
--- a/shippable.yml
+++ b/shippable.yml
@@ -11,8 +11,8 @@ before_script:
script:
- cd tools/wandbox
-# - python ./iuwandbox.py ../../test/iutest_syntax_tests.cpp -c ${WANDBOX_COMPILER}
- - python ./iuwandbox.py sample.cpp -c ${WANDBOX_COMPILER}
+ - python ./iuwandbox.py ../../test/iutest_syntax_tests.cpp -c ${WANDBOX_COMPILER} --encoding utf-8-sig
+# - python ./iuwandbox.py sample.cpp -c ${WANDBOX_COMPILER}
env:
- WANDBOX_COMPILER=gcc-head
diff --git a/test/iutest_matcher_tests.cpp b/test/iutest_matcher_tests.cpp
index 4cf12f9c42..9721def3de 100644
--- a/test/iutest_matcher_tests.cpp
+++ b/test/iutest_matcher_tests.cpp
@@ -39,7 +39,7 @@ void* p1 = NULL;
void* p2 = &p1;
float f0 = 0.0f;
double d0 = 0.0;
-struct X { int a, b; X(int _a, int _b) : a(_a), b(_b) {} int GetA() { return a; } };
+struct X { int a, b; X(int _a, int _b) : a(_a), b(_b) {} int GetA() const { return a; } };
X x(1,1);
::std::map