From 20a0a1c7f783913404f1fdc7fa8c3e502de07bf2 Mon Sep 17 00:00:00 2001
From: srz-zumix <zumix.cpp@gmail.com>
Date: Sat, 18 Apr 2015 20:54:51 +0900
Subject: [PATCH] update r819

---
 CHANGES                            |  10 ++
 doc/Doxyfile                       |   2 +-
 doc/cover.html                     |   6 +-
 doc/primer.html                    |  44 +++++-
 doc/wandbox.html                   |   9 +-
 include/impl/iutest_env.ipp        |  40 ++++-
 include/internal/iutest_file.hpp   |  58 +++++++-
 include/internal/iutest_stream.hpp |  36 ++++-
 include/internal/iutest_string.hpp |  10 ++
 include/iutest.hpp                 |  26 +++-
 include/iutest_env.hpp             |   7 +-
 include/iutest_ver.hpp             |  10 +-
 test/CommonMakefile.in             |   1 +
 test/iutest_filter_file_tests.cpp  | 228 +++++++++++++++++++++++++++++
 test/iutest_unit_tests.cpp         |   7 +
 15 files changed, 467 insertions(+), 27 deletions(-)
 create mode 100644 test/iutest_filter_file_tests.cpp

diff --git a/CHANGES b/CHANGES
index af3691174c..cacea6b862 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,14 @@
 --------------------------------------------------
+Changes for 1.12.0:
+
+** 追加
+* --iutest_filter=@filter.txt のようにファイルからフィルター指定できるように対応
+* twilio 対応
+
+** 修正
+* バグ修正
+
+--------------------------------------------------
 Changes for 1.11.1:
 
 ** 修正
diff --git a/doc/Doxyfile b/doc/Doxyfile
index b0c43a73d0..ac8331c1c0 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.11.1.0
+PROJECT_NUMBER         = 1.11.99.0
 
 # 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 a1a72f8e62..8fbbb715bb 100644
--- a/doc/cover.html
+++ b/doc/cover.html
@@ -52,7 +52,7 @@
 <div class="contents">
 <h1>IUTEST</h1>
 <div class="text_block">
-Iris Unit Test Framework : 2014 / 11 / 29<br />
+Iris Unit Test Framework : 2015 / 04 / 18<br />
 <br />
 </div>
 <h2>�͂��߂�</h2>
@@ -119,7 +119,7 @@ <h1>LICENSE</h1>
 This software is released under the new BSD License,<br />
 
 <pre>
-Copyright (c) 2011-2014, Takazumi-Shirayanagi
+Copyright (c) 2011-2015, Takazumi-Shirayanagi
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:
@@ -149,7 +149,7 @@ <h1>LICENSE</h1>
 </div> <!-- end of contents -->
 
 <br />
-<div align="right">Copyright (c) 2011-2014, Takazumi-Shirayanagi, All rights reserved.</div>
+<div align="right">Copyright (c) 2011-2015, Takazumi-Shirayanagi, All rights reserved.</div>
 
 </body>
 </html>
diff --git a/doc/primer.html b/doc/primer.html
index dbc9dc9d2e..47ec699f4e 100644
--- a/doc/primer.html
+++ b/doc/primer.html
@@ -111,6 +111,13 @@
       <li><a href="#switch_gtest">Google Test ���[�h</a></li>
     </ul>
   </li>
+  <li><a href="#filter">�e�X�g�̃t�B���^�����O</a>
+    <ul>
+      <li><a href="#filter_format">�t�H�[�}�b�g</a></li>
+      <li><a href="#filter_exsample">��</a></li>
+      <li><a href="#filter_file">�t�@�C������w��</a></li>
+    </ul>
+  </li>
   <li><a href="#matcher">Matcher</a>
     <ul>
       <li><a href="#matcher_summary">Mathcer �̊T�v</a></li>
@@ -549,6 +556,41 @@
 </div>
 </div> <!-- end of contents -->
 
+<div class="contents">
+<h2><a name="filter" id="filter">�e�X�g�̃t�B���^�����O</a></h2>
+<div class="text_block">
+--iutest_filter �R�}���h���C���I�v�V�����Ńt�B���^���w��ł��܂��B
+�����ł́A�t�B���^�̃t�H�[�}�b�g�ɂ‚��Đ��������܂��B
+
+<h3><a name="filter_format" id="filter_format">�t�H�[�}�b�g</a></h3>
+<p>�t�B���^�̃t�H�[�}�b�g�́A':' �ŋ�؂�ꂽ���C���h�J�[�h�p�^�[���i�|�W�e�B�u�p�^�[���j�ɂȂ�܂��B<br />
+�܂��A�擪�� '-' ��t���邱�ƂŁA�}�b�`�����e�X�g�����O����l�K�e�B�u�p�^�[�����w��ł��܂��B<br />
+�iiutest �̃e�X�g���́ATestCaseName.TestName �ł��j<br />
+</p>
+<table class="ruled" >
+<tr><td>*</td><td>�C�ӂ̕�����Ƀ}�b�`</td></tr>
+<tr><td>?</td><td>�C�ӂ�1�����Ƀ}�b�`</td></tr>
+</table>
+
+<h3><a name="filter_exsample" id="filter_exsample">��</a></h3>
+<table class="ruled" >
+<tr><td>./foo_test</td><td rowspan="2">�S�Ẵe�X�g�����s���܂�</td></tr>
+<tr><td>./foo_test --iutest_filter=*</td></tr>
+<tr><td>./foo_test --iutest_filter=FooTest.*</td><td>�e�X�g�P�[�X FooTest ���̃e�X�g��S�Ď��s���܂�</td></tr>
+<tr><td>./foo_test --iutest_filter=*Null*:*Init*</td><td>���O�� "Null" �܂��� "Init" ���܂ރe�X�g�����s���܂�</td></tr>
+<tr><td>./foo_test --iutest_filter=-*Foo*</td><td>���O�� "Foo" ���܂ރe�X�g �ȊO ��S�Ď��s���܂�</td></tr>
+<tr><td>./foo_test --iutest_filter=FooTest.*:-FooTest.Bar</td><td>�e�X�g�P�[�X FooTest ���̃e�X�g�� FooTest.Bar ������<br />�S�Ẵe�X�g�����s���܂�</td></tr>
+<tr><td>./foo_test --iutest_filter=FooTest.*:-FooTest.Bar:-FooTest.Baz</td><td>�e�X�g�P�[�X FooTest ���̃e�X�g�� FooTest.Bar ��<br /> FooTest.Baz �������S�Ẵe�X�g�����s���܂�</td></tr>
+</table>
+
+<h3><a name="filter_file" id="filter_file">�t�@�C������w��</a></h3>
+<p>iutest �ł̓t�B���^�[���t�@�C������ǂݍ��ނ��Ƃ��ł��܂��B<br />
+--iutest_filter=@filter.txt �̂悤�ɐ擪�� @ ��t���A���̌�Ƀt�@�C�������w�肷�邱�Ƃœǂݍ��݂ł��܂��B<br />
+�t�H�[�}�b�g�̓R�}���h���C���Ɠ����ł��B�i���s�� ':' �ɒu���������܂��j
+</p>
+</div> <!-- end of text_block --
+</div> <!-- end of contents -->
+
 <div class="contents">
 <h2><a name="matcher" id="matcher">Matcher</a></h2>
 <div class="text_block">
@@ -571,7 +613,7 @@ <h2><a name="matcher" id="matcher">Matcher</a></h2>
 </div> <!-- end of contents -->
 
 <br />
-<div align="right">Copyright (c) 2011-2014, Takazumi-Shirayanagi, All rights reserved.</div>
+<div align="right">Copyright (c) 2011-2015, Takazumi-Shirayanagi, All rights reserved.</div>
 
 </body>
 </html>
diff --git a/doc/wandbox.html b/doc/wandbox.html
index 041ffbe365..6fc6b7930e 100644
--- a/doc/wandbox.html
+++ b/doc/wandbox.html
@@ -52,15 +52,12 @@
 <div class="contents">
 <h1>Wandbox �̗��p</h1>
 
-<div class="contents">
 <h2>iuwandbox</h2>
 <div class="text_block">
 <a href="">Wandbox</a> �� iutest ���g�����e�X�g�R�[�h��������悤�ɑΉ����܂����B<br />
 �l�X�ȃR���p�C���[�E�o�[�W�����Ńr���h�E�e�X�g���ł��邽�߁A���Ȃ��̃v���O�����̃R���p�C���[�Ή��������܂��B<br />
 </div>
-</div> <!-- end of contents -->
 
-<div class="contents">
 <h2>�g����</h2>
 <div class="text_block">
 tools/wandbox/iuwandbox.py ���g�p���܂��B<br />
@@ -82,9 +79,9 @@ <h2>iuwandbox</h2>
 int main(int argc, char** argv)
 {
     int x = 0;
-    std::cout << "hoge" << std::endl;
+    std::cout &lt;&lt; "hoge" &lt;&lt; std::endl;
     
-    IUTEST_INIT(&argc, argv);
+    IUTEST_INIT(&amp;argc, argv);
     return IUTEST_RUN_ALL_TESTS();
 }
 
@@ -119,7 +116,7 @@ <h2>iuwandbox</h2>
 <tr><td>-s, --save</td>     <td>permarnent link �𐶐����܂��B</td></tr>
 <tr><td>--permlink ID</td>  <td>ID �� permarnent link �̏����擾���܂��B--output �I�v�V�������w�肷��ƁA�\�[�X�R�[�h���t�@�C���ɏ����o���܂��B</td></tr>
 <tr><td>-v,--version</td>   <td>�o�[�W������\�����܂�</td></tr>
-<tr><td width="200px">-h,--help</td>      <td>�w���v��\�����܂�</td></tr>
+<tr><td width="200">-h,--help</td>      <td>�w���v��\�����܂�</td></tr>
 </table>
 </div>
 
diff --git a/include/impl/iutest_env.ipp b/include/impl/iutest_env.ipp
index 2b288e1e6f..29d3630831 100644
--- a/include/impl/iutest_env.ipp
+++ b/include/impl/iutest_env.ipp
@@ -6,7 +6,7 @@
  *
  * @author		t.shirayanagi
  * @par			copyright
- * Copyright (C) 2011-2014, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2015, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -18,6 +18,7 @@
 //======================================================================
 // include
 #include "../iutest_env.hpp"
+#include "../internal/iutest_file.hpp"
 
 namespace iutest
 {
@@ -176,7 +177,7 @@ IUTEST_IPP_INLINE bool TestEnv::ParseCommandLineElemA(const char* str)
 				}
 				else if( detail::IsStringForwardMatching(str, "filter") )
 				{
-					set_test_filter(ParseOptionSettingStr(str));
+					ParseFilterOption(ParseOptionSettingStr(str));
 				}
 #if IUTEST_HAS_STREAM_RESULT
 				else if( detail::IsStringForwardMatching(str, "stream_result_to") )
@@ -328,7 +329,7 @@ IUTEST_IPP_INLINE void TestEnv::LoadEnviromentVariable(void)
 		if( detail::GetEnvironmentVariable("IUTEST_FILTER", str, sizeof(str))
 		||  detail::GetEnvironmentVariable("GTEST_FILTER", str, sizeof(str)) )
 		{
-			set_test_filter(str);
+			ParseFilterOption(str);
 		}
 		if( detail::GetEnvironmentVariable("IUTEST_DEFAULT_PACKAGE_NAME", str, sizeof(str)) )
 		{
@@ -436,6 +437,39 @@ IUTEST_IPP_INLINE bool TestEnv::ParseFileLocationOption(const char* option)
 	return true;
 }
 
+IUTEST_IPP_INLINE bool TestEnv::ParseFilterOption(const char* option)
+{
+	if( option != NULL && *option == '@' )
+	{
+		// file
+		const char* path = option + 1;
+		IFile* fp = detail::IFileSystem::New();
+		if( fp == NULL )
+		{
+			return false;
+		}
+
+		if( !fp->Open(path, IFile::OpenRead) )
+		{
+			fprintf(stderr, "Unable to open filter file \"%s\".\n", path);
+			fflush(stderr);
+			detail::IFileSystem::Free(fp);
+			return false;
+		}
+
+		::std::string filter = fp->ReadAll();
+		detail::IFileSystem::Free(fp);
+
+		detail::StringReplaceToLF(filter);
+		detail::StringReplace(filter, '\n', ":");
+		set_test_filter(filter.c_str());
+		return true;
+	}
+
+	set_test_filter(option);
+	return true;
+}
+
 IUTEST_IPP_INLINE bool TestEnv::ParseYesNoFlagCommandLine(const char* str, TestFlag::Kind flag, int def)
 {
 	const char* option = ParseOptionSettingStr(str);
diff --git a/include/internal/iutest_file.hpp b/include/internal/iutest_file.hpp
index d7a1a3e888..b422ff9d76 100644
--- a/include/internal/iutest_file.hpp
+++ b/include/internal/iutest_file.hpp
@@ -6,7 +6,7 @@
  *
  * @author		t.shirayanagi
  * @par			copyright
- * Copyright (C) 2011-2014, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2015, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -98,7 +98,7 @@ namespace iutest
 /**
  * @brief	ファイルクラスインターフェイス
 */
-class IFile : public detail::IOutStream
+class IFile : public detail::IOutStream, public detail::IInStream
 {
 public:
 	//! ファイルオープンモードフラグ
@@ -193,6 +193,28 @@ IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
 		}
 		return true;
 	}
+
+	/**
+	 * @brief	読み込み
+	 * @param [in]	buf		= 読み込みバッファ
+	 * @param [in]	size	= 読み込みデータサイズ
+	 * @param [in]	cnt		= 読み込み回数
+	*/
+	virtual bool Read(void* buf, size_t size, size_t cnt) IUTEST_CXX_OVERRIDE
+	{
+		if( fread(buf, size, cnt, m_fp) < cnt ) return false;
+		return true;
+	}
+
+	//! サイズ取得
+	virtual size_t GetSize(void) IUTEST_CXX_OVERRIDE
+	{
+		long pre = ftell(m_fp);
+		fseek(m_fp, 0, SEEK_END);
+		size_t size = static_cast<size_t>(ftell(m_fp));
+		fseek(m_fp, pre, SEEK_SET);
+		return size;
+	}
 };
 
 #endif
@@ -239,6 +261,38 @@ class StringStreamFile : public IFile
 		return true;
 	}
 
+	/**
+	 * @brief	読み込み
+	 * @param [in]	buf		= 読み込みバッファ
+	 * @param [in]	size	= 読み込みデータサイズ
+	 * @param [in]	cnt		= 読み込み回数
+	*/
+	virtual bool Read(void* buf, size_t size, size_t cnt) IUTEST_CXX_OVERRIDE
+	{
+		char* p = static_cast<char*>(buf);
+		for( size_t i = 0; i < cnt; ++i )
+		{
+			ss.read(p, size);
+			p += size;
+		}
+		return true;
+	}
+
+	//! サイズ取得
+	virtual size_t GetSize(void) IUTEST_CXX_OVERRIDE
+	{
+		::std::stringstream::pos_type pre = ss.tellg();
+		ss.seekg(0, ::std::ios::end);
+		::std::stringstream::pos_type size = ss.tellg();
+		ss.seekg(pre, ::std::ios::beg);
+		return static_cast<size_t>(size);
+	}
+
+	//! 全読み込み
+	virtual ::std::string ReadAll(void)
+	{
+		return ss.str();
+	}
 protected:
 	::std::stringstream ss;
 };
diff --git a/include/internal/iutest_stream.hpp b/include/internal/iutest_stream.hpp
index 7f8a3720ec..e56659440c 100644
--- a/include/internal/iutest_stream.hpp
+++ b/include/internal/iutest_stream.hpp
@@ -6,7 +6,7 @@
  *
  * @author		t.shirayanagi
  * @par			copyright
- * Copyright (C) 2012-2014, Takazumi Shirayanagi\n
+ * Copyright (C) 2012-2015, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -64,6 +64,40 @@ IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_END()
 	}
 };
 
+/**
+ * @brief	入力ストリームインターフェイス
+*/
+class IInStream
+{
+public:
+	virtual ~IInStream(void) {}
+public:
+	//! 読み込み
+	virtual bool Read(void* buf, size_t size, size_t cnt) = 0;
+
+	//! サイズ取得
+	virtual size_t GetSize(void) = 0;
+
+public:
+	//! 全読み込み
+	virtual ::std::string ReadAll(void)
+	{
+		::std::string str;
+		const size_t size = GetSize();
+		if( size != 0 )
+		{
+			char* buf = new char[size+1];
+			buf[size] = '\0';
+			if( Read(buf, size, 1) )
+			{
+				str = buf;
+			}
+			delete [] buf;
+		}
+		return str;
+	}
+};
+
 /**
  * @brief	ファイルIO出力ストリームインターフェイス
 */
diff --git a/include/internal/iutest_string.hpp b/include/internal/iutest_string.hpp
index e82534f8a5..b18b581d1a 100644
--- a/include/internal/iutest_string.hpp
+++ b/include/internal/iutest_string.hpp
@@ -137,6 +137,16 @@ inline void StripTrailingSpace(::std::string& str)
 		it = str.erase(it);
 	}
 }
+inline void StringReplaceToLF(::std::string& str)
+{
+	::std::string::size_type pos = 0;
+	while( pos = str.find("\r\n", pos), pos != ::std::string::npos )
+	{
+		str.replace(pos, 2, "\n");
+		++pos;
+	}
+	StringReplace(str, '\r', "\n");
+}
 
 inline IUTEST_CXX_CONSTEXPR char ToHex(unsigned int n) { return (n&0xF) >= 0xA ? 'A'+((n&0xF)-0xA) : '0'+(n&0xF); }
 
diff --git a/include/iutest.hpp b/include/iutest.hpp
index 8a8e6bd3a6..e634492c30 100644
--- a/include/iutest.hpp
+++ b/include/iutest.hpp
@@ -6,7 +6,7 @@
  *
  * @author		t.shirayanagi
  * @par			copyright
- * Copyright (C) 2011-2014, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2015, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
  *
@@ -1645,26 +1645,38 @@ class UnitTestSource
 
 //======================================================================
 // function
+namespace detail
+{
+
+template<typename T>
+inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, T argv)
+{
+	UnitTestSource::GetInstance().Initialize();
+	TestEnv::ParseCommandLine(pargc, argv);
+}
+
+}
+
 /**
  * @brief	初期化
  * @details	コマンドラインオプションの解析をします。
  *			使用した引数は削除され pargc, argv を書き換えます
 */
-inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, char** argv)		{ TestEnv::ParseCommandLine(pargc, argv); UnitTestSource::GetInstance().Initialize(); }
-inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, wchar_t** argv)	{ TestEnv::ParseCommandLine(pargc, argv); UnitTestSource::GetInstance().Initialize(); }		//!< @overload
-inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, const char** argv)	{ TestEnv::ParseCommandLine(pargc, argv); UnitTestSource::GetInstance().Initialize(); }	//!< @overload
-inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, const wchar_t** argv)	{ TestEnv::ParseCommandLine(pargc, argv); UnitTestSource::GetInstance().Initialize(); }	//!< @overload
+inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, char** argv)		{ detail::InitIrisUnitTest(pargc, argv); }
+inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, wchar_t** argv)	{ detail::InitIrisUnitTest(pargc, argv); }		//!< @overload
+inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, const char** argv)	{ detail::InitIrisUnitTest(pargc, argv); }	//!< @overload
+inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, const wchar_t** argv)	{ detail::InitIrisUnitTest(pargc, argv); }	//!< @overload
 
 #if IUTEST_HAS_NULLPTR
-inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, ::std::nullptr_t)	{ TestEnv::ParseCommandLine(pargc, static_cast<char**>(NULL)); UnitTestSource::GetInstance().Initialize(); }	//!< @overload
+inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(int* pargc, ::std::nullptr_t)	{ detail::InitIrisUnitTest<char**>(pargc, NULL); }	//!< @overload
 #endif
 
 /** @overload */
 template<typename CharType>
 inline void IUTEST_ATTRIBUTE_UNUSED_ InitIrisUnitTest(::std::vector< ::std::basic_string<CharType> >& argv)
 {
-	TestEnv::ParseCommandLine(argv);
 	UnitTestSource::GetInstance().Initialize();
+	TestEnv::ParseCommandLine(argv);
 }
 
 /**
diff --git a/include/iutest_env.hpp b/include/iutest_env.hpp
index a1f8ce5565..2fc9e30895 100644
--- a/include/iutest_env.hpp
+++ b/include/iutest_env.hpp
@@ -6,7 +6,7 @@
  *
  * @author		t.shirayanagi
  * @par			copyright
- * Copyright (C) 2011-2014, Takazumi Shirayanagi\n
+ * Copyright (C) 2011-2015, Takazumi Shirayanagi\n
  * This software is released under the new BSD License,
  * see LICENSE
 */
@@ -675,6 +675,11 @@ class TestEnv
 	*/
 	static bool ParseFileLocationOption(const char* option);
 
+	/**
+	 * @brief	IUTEST_FILTER オプションの判定
+	*/
+	static bool ParseFilterOption(const char* option);
+
 	/**
 	 * @brief	yes オプションか no オプションかの判定
 	 * @param [in]	str		= コマンドライン文字列（関数ないでオプション文字列部分を取得する）
diff --git a/include/iutest_ver.hpp b/include/iutest_ver.hpp
index 981398a32d..d06bab4655 100644
--- a/include/iutest_ver.hpp
+++ b/include/iutest_ver.hpp
@@ -17,10 +17,10 @@
 
 //======================================================================
 // define
-#define IUTEST_VER			0x01110100u //!< iutest version 1.11.1.0
+#define IUTEST_VER			0x01119900u //!< iutest version 1.11.99.0
 #define IUTEST_MAJORVER		0x01u		//!< Major Version
 #define IUTEST_MINORVER		0x11u		//!< Minor Version
-#define IUTEST_BUILD		0x01u		//!< Build
+#define IUTEST_BUILD		0x99u		//!< Build
 #define IUTEST_REVISION		0x00u		//!< Revision
 
 /**
@@ -113,6 +113,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  * @page	CHANGELOG	変更履歴
  * @par		Changes
  <ul>
+  <li>v1.12.0.0
+    <ul>
+	  <li>--iutest_filter=@filter.txt のようにファイルからフィルター指定できるように対応</li>
+	  <li>twilio 対応</li>
+	</ul>
+  </li>
   <li>v1.11.1.0
     <ul>
 	  <li>IUTEST_REGISTER_TYPED_TEST_CASE_P でテスト名の後ろの空白が名前に含まれてしまう不具合を修正</li>
diff --git a/test/CommonMakefile.in b/test/CommonMakefile.in
index 5ea9c38d1c..82a17597bd 100644
--- a/test/CommonMakefile.in
+++ b/test/CommonMakefile.in
@@ -99,6 +99,7 @@ TARGETS_IUTEST_ONLY = \
           iutest_default_printer_listener_tests \
           iutest_env_var_tests \
           iutest_env_var_gtest_tests \
+          iutest_filter_file_tests \
           iutest_ostream_formatter_tests \
           iutest_output_xml_invalid_path_tests \
           iutest_tap_file_generator_listener_tests \
diff --git a/test/iutest_filter_file_tests.cpp b/test/iutest_filter_file_tests.cpp
new file mode 100644
index 0000000000..4adafe5452
--- /dev/null
+++ b/test/iutest_filter_file_tests.cpp
@@ -0,0 +1,228 @@
+//======================================================================
+//-----------------------------------------------------------------------
+/**
+ * @file		iutest_filter_file_tests.cpp
+ * @brief		filter by file test
+ *
+ * @author		t.shirayanagi
+ * @par			copyright
+ * Copyright (C) 2015, Takazumi Shirayanagi\n
+ * This software is released under the new BSD License,
+ * see LICENSE
+*/
+//-----------------------------------------------------------------------
+//======================================================================
+
+//======================================================================
+// include
+#include "iutest.hpp"
+
+#if !defined(IUTEST_USE_GTEST) && IUTEST_HAS_STRINGSTREAM
+#  define FILTER_FILE_TEST	1
+#else
+#  define FILTER_FILE_TEST	0
+#endif
+
+#if FILTER_FILE_TEST
+
+class FilterFile : public ::iutest::StringStreamFile
+{
+public:
+	static ::std::string filter;
+	virtual bool Open(const char* , int ) IUTEST_CXX_OVERRIDE
+	{
+		ss.clear();
+		ss << filter;
+		return true;
+	}
+};
+::std::string FilterFile::filter;
+
+IUTEST_FILESYSTEM_INSTANTIATE(FilterFile);
+
+
+#define MAKE_TEST(TestCase, TestName)									\
+	namespace TestCase##TestName { enum STATE { NOT_RAN, RAN };			\
+		void PrintTo(const STATE& state, ::iutest::iu_ostream* os) {	\
+			*os << ((state) ? "RAN" : "NOT_RAN");						\
+		}																\
+		static STATE state;												\
+	}																	\
+	IUTEST(TestCase, TestName) {										\
+		TestCase##TestName::state = TestCase##TestName::RAN;			\
+	}																	\
+
+MAKE_TEST(Test, Hoge)
+MAKE_TEST(Hoge, Test)
+MAKE_TEST(Foo, Bar)
+MAKE_TEST(Foo, Baz)
+MAKE_TEST(Foo, BarTest)
+MAKE_TEST(Foo, Qux)
+
+bool FilterTest( ::std::vector< ::std::string > targv
+	, const char* filter
+	, TestHoge::STATE ranTestHoge
+	, HogeTest::STATE ranHogeTest
+	, FooBar::STATE ranFooBar
+	, FooBaz::STATE ranFooBaz
+	, FooBarTest::STATE ranFooBarTest
+	, FooQux::STATE ranFooQux
+)
+{
+	TestHoge::state = TestHoge::NOT_RAN;
+	HogeTest::state = HogeTest::NOT_RAN;
+	FooBar::state = FooBar::NOT_RAN;
+	FooBaz::state = FooBaz::NOT_RAN;
+	FooBarTest::state = FooBarTest::NOT_RAN;
+	FooQux::state = FooQux::NOT_RAN;
+
+	FilterFile::filter = filter;
+	::iutest::InitIrisUnitTest(targv);
+	const int ret = IUTEST_RUN_ALL_TESTS();
+	
+	if( ret != 0 ) return false;
+	
+	{
+		IUTEST_SCOPED_TRACE(filter);
+
+		IUTEST_EXPECT_EQ( ranTestHoge  , TestHoge::state );
+		IUTEST_EXPECT_EQ( ranHogeTest  , HogeTest::state );
+		IUTEST_EXPECT_EQ( ranFooBar    , FooBar::state );
+		IUTEST_EXPECT_EQ( ranFooBaz    , FooBaz::state );
+		IUTEST_EXPECT_EQ( ranFooBarTest, FooBarTest::state );
+		IUTEST_EXPECT_EQ( ranFooQux    , FooQux::state );
+		
+		int nRan = 0;
+		
+		if( ranTestHoge ) ++nRan;
+		if( ranHogeTest ) ++nRan;
+		if( ranFooBar ) ++nRan;
+		if( ranFooBaz ) ++nRan;
+		if( ranFooBarTest ) ++nRan;
+		if( ranFooQux ) ++nRan;
+		
+#if !defined(IUTEST_USE_GTEST) || (defined(GTEST_MINOR) && GTEST_MINOR >= 0x07)
+		IUTEST_EXPECT_EQ( nRan, ::iutest::UnitTest::GetInstance()->reportable_test_count() );
+		IUTEST_EXPECT_EQ( 0, ::iutest::UnitTest::GetInstance()->reportable_disabled_test_count() );
+#endif
+#if !defined(IUTEST_USE_GTEST)
+		const int kTotal = 6;
+		IUTEST_EXPECT_EQ( kTotal-nRan, ::iutest::UnitTest::GetInstance()->skip_test_count() );
+		IUTEST_EXPECT_EQ( 0, ::iutest::UnitTest::GetInstance()->reportable_skip_test_count() );
+		IUTEST_EXPECT_EQ( 0, ::iutest::UnitTest::GetInstance()->reportable_test_run_skipped_count() );
+#endif
+	}
+	return ::iutest::UnitTest::GetInstance()->Passed();
+}
+
+#ifdef UNICODE
+int wmain(int argc, wchar_t* argv[])
+#else
+int main(int argc, char* argv[])
+#endif
+{
+	::std::vector< ::std::string > targv;
+	for( int i=0; i < argc; ++i )
+	{
+		targv.push_back(argv[i]);
+	}
+	targv.push_back("--iutest_filter=@test.txt");
+
+	if( !FilterTest(targv
+		, "*Test*"
+		, TestHoge::RAN
+		, HogeTest::RAN
+		, FooBar::NOT_RAN
+		, FooBaz::NOT_RAN
+		, FooBarTest::RAN
+		, FooQux::NOT_RAN
+	) ) {
+		return 1;
+	}
+
+	if( !FilterTest(targv
+		, "Foo.Ba*:-*Test*:-*Baz*"
+		, TestHoge::NOT_RAN
+		, HogeTest::NOT_RAN
+		, FooBar::RAN
+		, FooBaz::NOT_RAN
+		, FooBarTest::NOT_RAN
+		, FooQux::NOT_RAN
+	) ) {
+		return 1;
+	}
+
+	if( !FilterTest(targv
+		, "Foo.Ba*-*Test*:-*Baz*"
+		, TestHoge::NOT_RAN
+		, HogeTest::NOT_RAN
+		, FooBar::RAN
+		, FooBaz::NOT_RAN
+		, FooBarTest::NOT_RAN
+		, FooQux::NOT_RAN
+	) ) {
+		return 1;
+	}
+
+	if( !FilterTest(targv
+		, "Foo.Ba*-*Test*:*Test*-Foo.Ba*"
+		, TestHoge::RAN
+		, HogeTest::RAN
+		, FooBar::RAN
+		, FooBaz::RAN
+		, FooBarTest::NOT_RAN
+		, FooQux::NOT_RAN
+	) ) {
+		return 1;
+	}
+
+	if( !FilterTest(targv
+		, "Foo.Ba*:-*Test*"
+		, TestHoge::NOT_RAN
+		, HogeTest::NOT_RAN
+		, FooBar::RAN
+		, FooBaz::RAN
+		, FooBarTest::NOT_RAN
+		, FooQux::NOT_RAN
+	) ) {
+		return 1;
+	}
+
+	if( !FilterTest(targv
+		, "*Baz*:*Qux*"
+		, TestHoge::NOT_RAN
+		, HogeTest::NOT_RAN
+		, FooBar::NOT_RAN
+		, FooBaz::RAN
+		, FooBarTest::NOT_RAN
+		, FooQux::RAN
+	) ) {
+		return 1;
+	}
+
+	if( !FilterTest(targv
+		, ":::*Baz*:::::*Qux*:::"
+		, TestHoge::NOT_RAN
+		, HogeTest::NOT_RAN
+		, FooBar::NOT_RAN
+		, FooBaz::RAN
+		, FooBarTest::NOT_RAN
+		, FooQux::RAN
+	) ) {
+		return 1;
+	}
+
+	printf("*** Successful ***\n");
+	return 0;
+}
+
+#else
+
+int main()
+{
+	printf("*** Successful ***\n");
+	return 0;
+}
+
+#endif
+
diff --git a/test/iutest_unit_tests.cpp b/test/iutest_unit_tests.cpp
index db30ede185..bea248aa20 100644
--- a/test/iutest_unit_tests.cpp
+++ b/test/iutest_unit_tests.cpp
@@ -98,6 +98,13 @@ IUTEST(UnitTest, StringReplace)
 	IUTEST_EXPECT_STREQ("ii1ii2ii3ii4b5", str);
 }
 
+IUTEST(UnitTest, StringReplaceToLF)
+{
+	::std::string str = "a\r\nb\r\rc\r\n\nd";
+	::iutest::detail::StringReplaceToLF(str);
+	IUTEST_EXPECT_STREQ("a\nb\n\nc\n\nd", str);
+}
+
 IUTEST(UnitTest, AddDefaultPackageName)
 {
 	IUTEST_EXPECT_STREQ("Test.a1a2a3a4b5", ::iutest::TestEnv::AddDefaultPackageName("a1a2a3a4b5"));