Refactoring and fix to previous commits by me, forgot to actually rename the files before ...

This commit is contained in:
Reijo Tomperi 2008-12-14 22:36:34 +00:00
parent 24c978d5d2
commit 06b8cc48e8
15 changed files with 60 additions and 60 deletions

View File

@ -20,7 +20,7 @@
// Buffer overrun.. // Buffer overrun..
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "CheckBufferOverrun.h" #include "checkbufferoverrun.h"
#include <algorithm> #include <algorithm>
#include <sstream> #include <sstream>

View File

@ -17,7 +17,7 @@
*/ */
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "CheckClass.h" #include "checkclass.h"
#include <locale> #include <locale>

View File

@ -18,7 +18,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "CheckFunctionUsage.h" #include "checkfunctionusage.h"
#include "tokenize.h" #include "tokenize.h"
#include <sstream> #include <sstream>
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------

View File

@ -18,7 +18,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "CheckHeaders.h" #include "checkheaders.h"
#include "tokenize.h" #include "tokenize.h"
#include <algorithm> #include <algorithm>

View File

@ -17,7 +17,7 @@
*/ */
#include "CheckMemoryLeak.h" #include "checkmemoryleak.h"
#include <stdlib.h> // free #include <stdlib.h> // free

View File

@ -18,7 +18,7 @@
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
#include "CheckOther.h" #include "checkother.h"
#include <list> #include <list>
#include <map> #include <map>

View File

@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/ * along with this program. If not, see <http://www.gnu.org/licenses/
*/ */
#include "FileLister.h" #include "filelister.h"
#include <sstream> #include <sstream>
#include <vector> #include <vector>
#include <string> #include <string>

View File

@ -1,53 +1,53 @@
/* /*
* c++check - c/c++ syntax checking * c++check - c/c++ syntax checking
* Copyright (C) 2008 Daniel Marjamäki and Reijo Tomperi * Copyright (C) 2008 Daniel Marjamäki and Reijo Tomperi
* *
* This program is free software: you can redistribute it and/or modify * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version. * (at your option) any later version.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/ * along with this program. If not, see <http://www.gnu.org/licenses/
*/ */
#include <string> #include <string>
#include "testsuite.h" #include "testsuite.h"
#include "filelister.h" #include "filelister.h"
class TestFileLister : public TestFixture class TestFileLister : public TestFixture
{ {
public: public:
TestFileLister() : TestFixture("TestFileLister") TestFileLister() : TestFixture("TestFileLister")
{ } { }
private: private:
void run() void run()
{ {
TEST_CASE( simplify_path ); TEST_CASE( simplify_path );
} }
void simplify_path() void simplify_path()
{ {
ASSERT_EQUALS( std::string( "index.h" ), FileLister::simplifyPath( "index.h" ) ); ASSERT_EQUALS( std::string( "index.h" ), FileLister::simplifyPath( "index.h" ) );
ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/index.h" ) ); ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/index.h" ) );
ASSERT_EQUALS( std::string( "/path/" ), FileLister::simplifyPath( "/path/" ) ); ASSERT_EQUALS( std::string( "/path/" ), FileLister::simplifyPath( "/path/" ) );
ASSERT_EQUALS( std::string( "/" ), FileLister::simplifyPath( "/" ) ); ASSERT_EQUALS( std::string( "/" ), FileLister::simplifyPath( "/" ) );
ASSERT_EQUALS( std::string( "./index.h" ), FileLister::simplifyPath( "./index.h" ) ); ASSERT_EQUALS( std::string( "./index.h" ), FileLister::simplifyPath( "./index.h" ) );
ASSERT_EQUALS( std::string( "../index.h" ), FileLister::simplifyPath( "../index.h" ) ); ASSERT_EQUALS( std::string( "../index.h" ), FileLister::simplifyPath( "../index.h" ) );
ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/path/../index.h" ) ); ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/path/../index.h" ) );
ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/path/../other/../index.h" ) ); ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/path/../other/../index.h" ) );
ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/path/../other///././../index.h" ) ); ASSERT_EQUALS( std::string( "/index.h" ), FileLister::simplifyPath( "/path/../other///././../index.h" ) );
ASSERT_EQUALS( std::string( "../path/index.h" ), FileLister::simplifyPath( "../path/other/../index.h" ) ); ASSERT_EQUALS( std::string( "../path/index.h" ), FileLister::simplifyPath( "../path/other/../index.h" ) );
} }
}; };
REGISTER_TEST( TestFileLister ) REGISTER_TEST( TestFileLister )