update r822

srz-zumix · Apr 20, 2015 · 1e36c18 · 1e36c18
1 parent 20a0a1c
commit 1e36c18
Show file tree

Hide file tree

Showing 5 changed files with 318 additions and 181 deletions.
diff --git a/test/CommonMakefile.in b/test/CommonMakefile.in
@@ -99,6 +99,8 @@ TARGETS_IUTEST_ONLY = \
           iutest_default_printer_listener_tests \
           iutest_env_var_tests \
           iutest_env_var_gtest_tests \
+          iutest_filter_file_invalid_path_tests \
+          iutest_filter_file_syntax_tests \
           iutest_filter_file_tests \
           iutest_ostream_formatter_tests \
           iutest_output_xml_invalid_path_tests \

diff --git a/test/iutest_env_var_tests.cpp b/test/iutest_env_var_tests.cpp
@@ -35,6 +35,7 @@ int SetUpEnvironment(void)
 	if( ::iutest::internal::posix::PutEnv(ENV_PREFIX "REPEAT=2") == -1 ) return -1;
 	if( ::iutest::internal::posix::PutEnv(ENV_PREFIX "FILTER=Flag*") == -1 ) return -1;
 
+	if( ::iutest::internal::posix::PutEnv("IUTEST_DEFAULT_PACKAGE_NAME=env_var") == -1 ) return -1;
 	if( ::iutest::internal::posix::PutEnv("IUTEST_FILE_LOCATION=vs") == -1 ) return -1;
 	return 0;
 }
@@ -51,6 +52,7 @@ IUTEST(FlagTest, Check)
 	IUTEST_EXPECT_TRUE( ::iutest::IUTEST_FLAG(print_time) );
 	IUTEST_EXPECT_TRUE( ::iutest::IUTEST_FLAG(shuffle) );
 #if !defined(IUTEST_USE_GTEST)
+	IUTEST_EXPECT_STREQ( "env_var", ::iutest::IUTEST_FLAG(default_package_name).c_str() );
 	IUTEST_EXPECT_TRUE( ::iutest::IUTEST_FLAG(file_location_style_msvc) );
 #endif
 

diff --git a/test/iutest_filter_file_invalid_path_tests.cpp b/test/iutest_filter_file_invalid_path_tests.cpp
@@ -0,0 +1,69 @@
+//======================================================================
+//-----------------------------------------------------------------------
+/**
+ * @file		iutest_filter_file_invalid_path_tests.cpp
+ * @brief		filter file invalid path 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 IUTEST_HAS_STREAMCAPTURE
+
+::iutest::detail::IUStreamCapture<> stderr_capture(stderr);
+
+#endif
+
+#if !defined(IUTEST_USE_GTEST) && IUTEST_HAS_FOPEN
+#  define FILTER_FILE_TEST	1
+#else
+#  define FILTER_FILE_TEST	0
+#endif
+
+IUTEST(Foo, Bar)
+{
+	IUTEST_ASSERT_EQ(3, 3);
+}
+
+#ifdef UNICODE
+int wmain(int argc, wchar_t* argv[])
+#else
+int main(int argc, char* argv[])
+#endif
+{
+#if FILTER_FILE_TEST
+	::std::vector< ::std::string > targv;
+	for( int i=0; i < argc; ++i )
+	{
+		targv.push_back(argv[i]);
+	}
+	targv.push_back("--iutest_filter=@invalid_filter_file_test.txt");
+	::iutest::InitIrisUnitTest(targv);
+
+	{
+		const int ret = IUTEST_RUN_ALL_TESTS();
+
+		if( ret != 0 ) return 1;
+#if IUTEST_HAS_STREAMCAPTURE && IUTEST_HAS_ASSERTION_RETURN
+		IUTEST_ASSERT_STRIN("Unable to open filter file \"invalid_filter_file_test.txt\".", stderr_capture.GetStreamString())
+			<< ::iutest::AssertionReturn<int>(1);
+#endif
+	}
+
+	printf("*** Successful ***\n");
+#else
+	(void)argc;
+	(void)argv;
+	printf("*** FILTER_FILE_TEST=0 ***\n");
+#endif
+	return 0;
+}
diff --git a/test/iutest_filter_file_syntax_tests.cpp b/test/iutest_filter_file_syntax_tests.cpp
@@ -0,0 +1,228 @@
+//======================================================================
+//-----------------------------------------------------------------------
+/**
+ * @file		iutest_filter_file_syntax_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
+