fix typo

srz-zumix · Jun 12, 2017 · c063225 · c063225
1 parent 5ed637a
commit c063225
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 28 deletions.
diff --git a/include/impl/iutest_core_impl.ipp b/include/impl/iutest_core_impl.ipp
@@ -268,15 +268,15 @@ IUTEST_IPP_INLINE ::std::string MakeIndexTestName(const char* basename, size_t i
     return name;
 }
 
-IUTEST_IPP_INLINE::std::string MakeParamTestName(const ::std::string& basename, const ::std::string& parame_name)
+IUTEST_IPP_INLINE::std::string MakeParamTestName(const ::std::string& basename, const ::std::string& param_name)
 {
-    if( parame_name.empty() )
+    if( param_name.empty() )
     {
         return basename;
     }
     ::std::string name = basename;
     name += "/";
-    name += parame_name;
+    name += param_name;
     return name;
 }
 

diff --git a/include/impl/iutest_filepath.ipp b/include/impl/iutest_filepath.ipp
@@ -71,15 +71,15 @@ IUTEST_IPP_INLINE iuFilePath iuFilePath::RemoveTrailingPathSeparator() const
     return IsDirectory() ? iuFilePath(std::string(m_path.c_str(), length()-1)) : *this;
 }
 
-IUTEST_IPP_INLINE iuFilePath iuFilePath::RemoveExtension(const char* extention) const
+IUTEST_IPP_INLINE iuFilePath iuFilePath::RemoveExtension(const char* extension) const
 {
     const char* const path = m_path.c_str();
     const char* const ext = strrchr(path, '.');
     if( ext == NULL )
     {
         return *this;
     }
-    if( extention != NULL && !IsStringCaseEqual(ext + 1, extention) )
+    if( extension != NULL && !IsStringCaseEqual(ext + 1, extension) )
     {
         return *this;
     }

diff --git a/include/internal/iutest_filepath.hpp b/include/internal/iutest_filepath.hpp
@@ -122,7 +122,7 @@ class iuFilePath
     /**
      * @brief   拡張子の削除
     */
-    iuFilePath RemoveExtension(const char* extention=NULL) const;
+    iuFilePath RemoveExtension(const char* extension=NULL) const;
 
     /**
      * @brief   ディレクトリ名の削除

diff --git a/include/internal/iutest_pragma.hpp b/include/internal/iutest_pragma.hpp
@@ -93,20 +93,20 @@
 #endif
 
 #if   defined(__clang__)
-#  define IUTEST_PARGMA_WARN_PUSH()     IUTEST_PRAGMA_CLANG_WARN_PUSH()
-#  define IUTEST_PARGMA_WARN_POP()      IUTEST_PRAGMA_CLANG_WARN_PUSH()
+#  define IUTEST_PRAGMA_WARN_PUSH()     IUTEST_PRAGMA_CLANG_WARN_PUSH()
+#  define IUTEST_PRAGMA_WARN_POP()      IUTEST_PRAGMA_CLANG_WARN_PUSH()
 #  define IUTEST_PRAGMA_WARN_DISABLE(x) IUTEST_PRAGMA_CLANG_WARN_DISABLE(x)
 #elif defined(__GNUC__)
-#  define IUTEST_PARGMA_WARN_PUSH()     IUTEST_PRAGMA_GCC_WARN_PUSH()
-#  define IUTEST_PARGMA_WARN_POP()      IUTEST_PRAGMA_GCC_WARN_POP()
+#  define IUTEST_PRAGMA_WARN_PUSH()     IUTEST_PRAGMA_GCC_WARN_PUSH()
+#  define IUTEST_PRAGMA_WARN_POP()      IUTEST_PRAGMA_GCC_WARN_POP()
 #  define IUTEST_PRAGMA_WARN_DISABLE(x) IUTEST_PRAGMA_GCC_WARN_DISABLE(x)
 #elif defined(_MSC_VER)
-#  define IUTEST_PARGMA_WARN_PUSH()     IUTEST_PRAGMA_MSC_WARN_PUSH()
-#  define IUTEST_PARGMA_WARN_POP()      IUTEST_PRAGMA_MSC_WARN_POP()
+#  define IUTEST_PRAGMA_WARN_PUSH()     IUTEST_PRAGMA_MSC_WARN_PUSH()
+#  define IUTEST_PRAGMA_WARN_POP()      IUTEST_PRAGMA_MSC_WARN_POP()
 #  define IUTEST_PRAGMA_WARN_DISABLE(x)
 #else
-#  define IUTEST_PARGMA_WARN_PUSH()
-#  define IUTEST_PARGMA_WARN_POP()
+#  define IUTEST_PRAGMA_WARN_PUSH()
+#  define IUTEST_PRAGMA_WARN_POP()
 #  define IUTEST_PRAGMA_WARN_DISABLE(x)
 #endif
 
@@ -129,10 +129,10 @@
 
 #if defined(__clang__) || defined(__GNUC__)
 #  define IUTEST_PRAGMA_UNUSED_LOCAL_TYPEDEFS_WARN_DISABLE_BEGIN()  \
-        IUTEST_PARGMA_WARN_PUSH()                                   \
+        IUTEST_PRAGMA_WARN_PUSH()                                   \
         IUTEST_PRAGMA_WARN_DISABLE("-Wunused-local-typedefs")
 #  define IUTEST_PRAGMA_UNUSED_LOCAL_TYPEDEFS_WARN_DISABLE_END()    \
-        IUTEST_PARGMA_WARN_POP()
+        IUTEST_PRAGMA_WARN_POP()
 #else
 #endif
 

diff --git a/include/iutest_assertion.hpp b/include/iutest_assertion.hpp
@@ -546,7 +546,7 @@ inline AssertionResult CmpHelperEQ(const char* expected_str, const char* actual_
 {
     IUTEST_UNUSED_VAR(expected_str);
 
-IUTEST_PARGMA_WARN_PUSH()
+IUTEST_PRAGMA_WARN_PUSH()
 IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
 
     if( actual == expected )
@@ -559,7 +559,7 @@ IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
         , FormatForComparisonFailureMessage(actual, expected)
         );
 
-IUTEST_PARGMA_WARN_POP()
+IUTEST_PRAGMA_WARN_POP()
 }
 
 template<typename T>
@@ -568,7 +568,7 @@ inline AssertionResult CmpHelperMemCmpEQ(const char* expected_str, const char* a
 {
     IUTEST_UNUSED_VAR(expected_str);
 
-IUTEST_PARGMA_WARN_PUSH()
+IUTEST_PRAGMA_WARN_PUSH()
 IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
 
     if( memcmp(&actual, &expected, sizeof(T)) == 0 )
@@ -581,14 +581,14 @@ IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
         , FormatForComparisonFailureMessage(actual, expected)
         );
 
-IUTEST_PARGMA_WARN_POP()
+IUTEST_PRAGMA_WARN_POP()
 }
 
 template<typename T>
 inline AssertionResult CmpHelperMemCmpNE(const char* expected_str, const char* actual_str
     , const T& expected, const T& actual)
 {
-IUTEST_PARGMA_WARN_PUSH()
+IUTEST_PRAGMA_WARN_PUSH()
 IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
 
     if( memcmp(&actual, &expected, sizeof(T)) != 0 )
@@ -599,7 +599,7 @@ IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
     return AssertionFailure() << "error: Expected: " << expected_str << " != " << actual_str
         << "\n  Actual: " << FormatForComparisonFailureMessage(expected, actual);
 
-IUTEST_PARGMA_WARN_POP()
+IUTEST_PRAGMA_WARN_POP()
 }
 
 /**

diff --git a/include/iutest_matcher.hpp b/include/iutest_matcher.hpp
@@ -107,7 +107,7 @@ inline iu_ostream& operator << (iu_ostream& os, const IMatcher& msg)
     }
 
 
-IUTEST_PARGMA_WARN_PUSH()
+IUTEST_PRAGMA_WARN_PUSH()
 IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
 
 DECL_COMPARE_MATCHER(Ne, !=);
@@ -123,7 +123,7 @@ DECL_COMPARE_MATCHER2(Lt, < );
 DECL_COMPARE_MATCHER2(Ge, >=);
 DECL_COMPARE_MATCHER2(Gt, > );
 
-IUTEST_PARGMA_WARN_POP()
+IUTEST_PRAGMA_WARN_POP()
 
 #undef DECL_COMPARE_MATCHER
 #undef DECL_COMPARE_MATCHER2
@@ -477,10 +477,10 @@ class EqMatcher : public IMatcher
     template<typename A, typename B>
     static bool Equals(const A& actual, const B& expected)
     {
-IUTEST_PARGMA_WARN_PUSH()
+IUTEST_PRAGMA_WARN_PUSH()
 IUTEST_PRAGMA_WARN_DISABLE_SIGN_COMPARE()
         return actual == expected;
-IUTEST_PARGMA_WARN_POP()
+IUTEST_PRAGMA_WARN_POP()
     }
     static bool Equals(const char* actual, const char* expected)
     {

diff --git a/test/syntax_tests.cpp b/test/syntax_tests.cpp
@@ -21,7 +21,7 @@
 namespace syntax_tests
 {
 
-IUTEST_PARGMA_WARN_PUSH()
+IUTEST_PRAGMA_WARN_PUSH()
 IUTEST_PRAGMA_WARN_DISABLE_DANGLING_ELSE()
 
 IUTEST(SyntaxTest, True)
@@ -732,6 +732,6 @@ IUTEST_INSTANTIATE_TEST_CASE_P( X51, ValuesTest
 
 #endif
 
-IUTEST_PARGMA_WARN_POP()
+IUTEST_PRAGMA_WARN_POP()
 
 }   // end of namespace syntax_tests