Permalink
Browse files

fix typo

  • Loading branch information...
srz-zumix committed Nov 21, 2016
1 parent 6dac2da commit 6c767630c810ef27b92bfca856a657209945433c
View
@@ -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.15.99.6
PROJECT_NUMBER = 1.15.99.7
# 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
@@ -167,7 +167,7 @@ IUTEST_IPP_INLINE int TestCase::failed_test_count() const
return 0;
}
//if( m_ad_hoc_testresult.Failed() ) return m_testinfos.count();
return detail::CountIf(m_testinfos, IsFaildTest);
return detail::CountIf(m_testinfos, IsFailedTest);
}
IUTEST_IPP_INLINE int TestCase::successful_test_count() const
@@ -24,10 +24,10 @@
# if _MSC_VER >= 1900
IUTEST_PRAGMA_MSC_WARN_PUSH()
IUTEST_PRAGMA_MSC_WARN_DISABLE(4091)
# include <DbgHelp.h>
# include <dbghelp.h>
IUTEST_PRAGMA_MSC_WARN_POP()
# else
# include <DbgHelp.h>
# include <dbghelp.h>
# endif
//# pragma comment (lib, "dbghelp.lib")
# endif
@@ -22,7 +22,7 @@
namespace iutest
{
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestProgramStart(const UnitTest& test)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestProgramStart(const UnitTest& test)
{
IUTEST_UNUSED_VAR(test);
// フィルタリング
@@ -31,7 +31,7 @@ IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestProgramStart(const Unit
detail::iuConsole::color_output(detail::iuConsole::yellow, "Note: iutest filter = %s\n", TestEnv::test_filter());
}
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestIterationStart(const UnitTest& test
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestIterationStart(const UnitTest& test
, int iteration)
{
if( test.repeat_count() != 1 )
@@ -46,40 +46,40 @@ IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestIterationStart(const Un
detail::iuConsole::color_output(detail::iuConsole::green, "[==========] ");
detail::iuConsole::output("Running %d tests from %d test cases.\n", test.test_to_run_count(), test.test_case_to_run_count() );
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnEnvironmentsSetUpStart(const UnitTest& test)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnEnvironmentsSetUpStart(const UnitTest& test)
{
IUTEST_UNUSED_VAR(test);
detail::iuConsole::color_output(detail::iuConsole::green, "[----------] ");
detail::iuConsole::output("Global test environment set-up.\n" );
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnEnvironmentsSetUpEnd(const UnitTest& test)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnEnvironmentsSetUpEnd(const UnitTest& test)
{
IUTEST_UNUSED_VAR(test);
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestCaseStart(const TestCase& test_case)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestCaseStart(const TestCase& test_case)
{
detail::iuConsole::color_output(detail::iuConsole::green, "[----------] ");
detail::iuConsole::output("%d tests from %s\n", test_case.test_to_run_count(), test_case.testcase_name_with_where().c_str() );
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestStart(const TestInfo& test_info)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestStart(const TestInfo& test_info)
{
detail::iuConsole::color_output(detail::iuConsole::green, "[ RUN ] ");
detail::iuConsole::output("%s.%s\n", test_info.test_case_name(), test_info.name());
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestPartResult(const TestPartResult& test_part_result)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestPartResult(const TestPartResult& test_part_result)
{
//if( test_part_result.type() == TestPartResult::kSuccess ) return;
#if defined(_MSC_VER) && !defined(IUTEST_OS_WINDOWS_MOBILE)
OutputDebugStringA(test_part_result.make_newline_message().c_str());
#endif
detail::iuConsole::output(test_part_result.make_newline_message().c_str());
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestRecordProperty(const TestProperty& test_property)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestRecordProperty(const TestProperty& test_property)
{
detail::iuConsole::output("iutest record property:\n %s=%s\n", test_property.key(), test_property.value());
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestEnd(const TestInfo& test_info)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestEnd(const TestInfo& test_info)
{
if( test_info.HasFailure() )
{
@@ -106,7 +106,7 @@ IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestEnd(const TestInfo& tes
}
detail::iuConsole::output("\n");
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestCaseEnd(const TestCase& test_case)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestCaseEnd(const TestCase& test_case)
{
detail::iuConsole::color_output(detail::iuConsole::green, "[----------] ");
detail::iuConsole::output("%d tests from %s", test_case.test_to_run_count(), test_case.name() );
@@ -120,18 +120,18 @@ IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestCaseEnd(const TestCase&
}
detail::iuConsole::output("\n\n");
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnEnvironmentsTearDownStart(const UnitTest& test)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnEnvironmentsTearDownStart(const UnitTest& test)
{
IUTEST_UNUSED_VAR(test);
detail::iuConsole::color_output(detail::iuConsole::green, "[----------] ");
detail::iuConsole::output("Global test environment tear-down.\n" );
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnEnvironmentsTearDownEnd(const UnitTest& test)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnEnvironmentsTearDownEnd(const UnitTest& test)
{
IUTEST_UNUSED_VAR(test);
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestIterationEnd(const UnitTest& test
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestIterationEnd(const UnitTest& test
, int iteration)
{
IUTEST_UNUSED_VAR(iteration);
@@ -237,7 +237,7 @@ IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestIterationEnd(const Unit
}
}
}
IUTEST_IPP_INLINE void DefalutResultPrintListener::OnTestProgramEnd(const UnitTest& test)
IUTEST_IPP_INLINE void DefaultResultPrintListener::OnTestProgramEnd(const UnitTest& test)
{
IUTEST_UNUSED_VAR(test);
}
@@ -27,12 +27,12 @@ IUTEST_PRAGMA_CRT_SECURE_WARN_DISABLE_BEGIN()
IUTEST_IPP_INLINE void DefaultXmlGeneratorListener::OnTestIterationStart(const UnitTest& test, int iteration)
{
IUTEST_UNUSED_VAR(test);
if( !m_output_path_foramt.empty() )
if( !m_output_path_format.empty() )
{
m_output_path = detail::StringFormat(m_output_path_foramt.c_str(), iteration);
if( m_output_path == m_output_path_foramt )
m_output_path = detail::StringFormat(m_output_path_format.c_str(), iteration);
if( m_output_path == m_output_path_format)
{
m_output_path_foramt.clear();
m_output_path_format.clear();
}
if( m_fp != NULL )
{
@@ -267,7 +267,7 @@ IUTEST_IPP_INLINE bool TestEnv::ParseCommandLineElemA(const char* str)
return find;
}
IUTEST_IPP_INLINE void TestEnv::LoadEnviromentVariable()
IUTEST_IPP_INLINE void TestEnv::LoadEnvironmentVariable()
{
{
int var = 0;
@@ -93,7 +93,7 @@ IUTEST_IPP_INLINE void StreamResultListener::OnTestIterationEnd(const UnitTest&
}
IUTEST_IPP_INLINE void StreamResultListener::OnTestProgramEnd(const UnitTest& test)
{
SendLn("event=TestProgramEnd&passd=" + FormatBool(test.Passed()));
SendLn("event=TestProgramEnd&passed=" + FormatBool(test.Passed()));
m_socket.Close();
}
View
@@ -1618,7 +1618,7 @@ class UnitTestSource
IUTEST_UNUSED_VAR(&detail::iuDebugInitialize);
IUTEST_UNUSED_VAR(&detail::iuDebugBreakAlloc);
#endif
TestEnv::event_listeners().set_default_result_printer(new DefalutResultPrintListener());
TestEnv::event_listeners().set_default_result_printer(new DefaultResultPrintListener());
}
public:
View
@@ -212,7 +212,7 @@ class TestCase
private:
static bool IsSuccessfulTest(const TestInfo* p) { return p->is_ran() && p->Passed(); }
static bool IsFaildTest(const TestInfo* p) { return p->should_run() && p->HasFailure(); }
static bool IsFailedTest(const TestInfo* p) { return p->should_run() && p->HasFailure(); }
static bool IsSkipTest(const TestInfo* p) { return !p->is_ran() || p->is_skipped(); }
static bool IsReportableSkipTest(const TestInfo* p) { return p->is_reportable() && IsSkipTest(p); }
static bool IsRunSkippedTest(const TestInfo* p) { return p->should_run() && p->is_skipped(); }
View
@@ -173,7 +173,7 @@ class UnitTest : public UnitTestImpl
// デフォルトリポーターをセット
TestEnv::SetGlobalTestPartResultReporter(&m_default_test_part_result_reporter);
// 環境変数によるテストフラグ指定をロード
TestEnv::LoadEnviromentVariable();
TestEnv::LoadEnvironmentVariable();
}
#if defined(_MSC_VER) && _MSC_VER < 1300
public: // VC++6.0 bug
View
@@ -705,7 +705,7 @@ class TestEnv
/**
* @brief 環境変数から設定構築
*/
static void LoadEnviromentVariable();
static void LoadEnvironmentVariable();
/**
* @brief セットアップ
@@ -217,7 +217,7 @@ class TestEventListeners
friend class detail::DefaultGlobalTestPartResultReporter;
friend class DefaultXmlGeneratorListener;
friend class JunitXmlGeneratorListener;
friend class DefalutResultPrintListener;
friend class DefaultResultPrintListener;
template<typename T, typename ::std::string(*GetXmlPath)()>
friend class detail::StderrXmlGeneratorListenerBase;
View
@@ -17,11 +17,11 @@
//======================================================================
// define
#define IUTEST_VER 0x01159906u //!< iutest version 1.15.99.6
#define IUTEST_VER 0x01159907u //!< iutest version 1.15.99.7
#define IUTEST_MAJORVER 0x01u //!< Major Version
#define IUTEST_MINORVER 0x15u //!< Minor Version
#define IUTEST_BUILD 0x99u //!< Build
#define IUTEST_REVISION 0x06u //!< Revision
#define IUTEST_REVISION 0x07u //!< Revision
/**
* @mainpage
@@ -23,12 +23,12 @@ namespace iutest
/**
* @brief デフォルト出力イベントリスナー
*/
class DefalutResultPrintListener : public TestEventListener
class DefaultResultPrintListener : public TestEventListener
{
public:
DefalutResultPrintListener() {}
DefaultResultPrintListener() {}
virtual ~DefalutResultPrintListener()
virtual ~DefaultResultPrintListener()
{
TestEnv::event_listeners().set_default_result_printer(NULL);
}
@@ -25,7 +25,7 @@ namespace iutest
*/
class DefaultXmlGeneratorListener : public EmptyTestEventListener
{
::std::string m_output_path_foramt;
::std::string m_output_path_format;
::std::string m_output_path;
protected:
IFile* m_fp;
@@ -58,20 +58,20 @@ class DefaultXmlGeneratorListener : public EmptyTestEventListener
{
if( path.empty() )
{
m_output_path_foramt.clear();
m_output_path_format.clear();
m_output_path = detail::kStrings::DefaultXmlReportFileName;
}
else
{
m_output_path_foramt = path;
m_output_path_format = path;
const ::std::string::size_type pos = path.find('.');
if( pos == ::std::string::npos
|| pos == path.length()-1 )
{
m_output_path_foramt += detail::GetPathSeparator();
m_output_path_foramt += detail::kStrings::DefaultXmlReportFileName;
m_output_path_format += detail::GetPathSeparator();
m_output_path_format += detail::kStrings::DefaultXmlReportFileName;
}
m_output_path = m_output_path_foramt;
m_output_path = m_output_path_format;
}
}
@@ -42,7 +42,7 @@ class SSTP : public Socket
public:
enum eCharset
{
CHARSET_ASCII
CHARSET_ASCII
, CHARSET_SHIFTJIS
, CHARSET_ISO_220_JP
, CHARSET_EUC_JP
@@ -0,0 +1,3 @@
iutest
gtest
gmock
Oops, something went wrong.

0 comments on commit 6c76763

Please sign in to comment.