GSoC C++-ificiation merge and cleanup.

[inkscape.git] / src / verbs-test.h

diff --git a/src/verbs-test.h b/src/verbs-test.h
index 24c7c73a62984510267cd5a69b95918864adadd2..04a0b80c09ec0cd898c90da9e737a588033d01e1 100644 (file)
--- a/src/verbs-test.h
+++ b/src/verbs-test.h
@@ -44,7 +44,7 @@ public:
             TSM_ASSERT( descr, verb );
             if ( verb )
             {
-                TSM_ASSERT_EQUALS( descr, verb->get_code(), i );
+                TSM_ASSERT_EQUALS( descr, verb->get_code(), static_cast<unsigned int>(i) );
 
                 if ( i != static_cast<int>(SP_VERB_INVALID) )
                 {
@@ -56,11 +56,11 @@ public:
                     //TSM_ASSERT( descr, bounced );
                     if ( bounced )
                     {
-                        TSM_ASSERT_EQUALS( descr, bounced->get_code(), i );
+                        TSM_ASSERT_EQUALS( descr, bounced->get_code(), static_cast<unsigned int>(i) );
                     }
                     else
                     {
-                        TS_WARN( std::string("Unable to getbyid() for ") + descr + std::string(" ID: '") + std::string(verb->get_id()) + std::string("'") );
+                        TS_FAIL( std::string("Unable to getbyid() for ") + descr + std::string(" ID: '") + std::string(verb->get_id()) + std::string("'") );
                     }
                 }
                 else
@@ -83,4 +83,4 @@ public:
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :