Refactoring and fix to previous commits by me, forgot to actually rename the files before ...
This commit is contained in:
parent
24c978d5d2
commit
06b8cc48e8
|
@ -20,7 +20,7 @@
|
|||
// Buffer overrun..
|
||||
//---------------------------------------------------------------------------
|
||||
|
||||
#include "CheckBufferOverrun.h"
|
||||
#include "checkbufferoverrun.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <sstream>
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
#include "CheckClass.h"
|
||||
#include "checkclass.h"
|
||||
|
||||
#include <locale>
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
#include "CheckFunctionUsage.h"
|
||||
#include "checkfunctionusage.h"
|
||||
#include "tokenize.h"
|
||||
#include <sstream>
|
||||
//---------------------------------------------------------------------------
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
#include "CheckHeaders.h"
|
||||
#include "checkheaders.h"
|
||||
#include "tokenize.h"
|
||||
|
||||
#include <algorithm>
|
|
@ -17,7 +17,7 @@
|
|||
*/
|
||||
|
||||
|
||||
#include "CheckMemoryLeak.h"
|
||||
#include "checkmemoryleak.h"
|
||||
|
||||
#include <stdlib.h> // free
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
#include "CheckOther.h"
|
||||
#include "checkother.h"
|
||||
|
||||
#include <list>
|
||||
#include <map>
|
|
@ -16,7 +16,7 @@
|
|||
* along with this program. If not, see <http://www.gnu.org/licenses/
|
||||
*/
|
||||
|
||||
#include "FileLister.h"
|
||||
#include "filelister.h"
|
||||
#include <sstream>
|
||||
#include <vector>
|
||||
#include <string>
|
|
@ -1,53 +1,53 @@
|
|||
/*
|
||||
* c++check - c/c++ syntax checking
|
||||
* Copyright (C) 2008 Daniel Marjamäki and Reijo Tomperi
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/
|
||||
*/
|
||||
|
||||
#include <string>
|
||||
#include "testsuite.h"
|
||||
#include "filelister.h"
|
||||
|
||||
class TestFileLister : public TestFixture
|
||||
{
|
||||
public:
|
||||
TestFileLister() : TestFixture("TestFileLister")
|
||||
{ }
|
||||
|
||||
private:
|
||||
|
||||
void run()
|
||||
{
|
||||
TEST_CASE( 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( "/path/" ), FileLister::simplifyPath( "/path/" ) );
|
||||
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( "/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( "../path/index.h" ), FileLister::simplifyPath( "../path/other/../index.h" ) );
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
REGISTER_TEST( TestFileLister )
|
||||
/*
|
||||
* c++check - c/c++ syntax checking
|
||||
* Copyright (C) 2008 Daniel Marjamäki and Reijo Tomperi
|
||||
*
|
||||
* 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
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/
|
||||
*/
|
||||
|
||||
#include <string>
|
||||
#include "testsuite.h"
|
||||
#include "filelister.h"
|
||||
|
||||
class TestFileLister : public TestFixture
|
||||
{
|
||||
public:
|
||||
TestFileLister() : TestFixture("TestFileLister")
|
||||
{ }
|
||||
|
||||
private:
|
||||
|
||||
void run()
|
||||
{
|
||||
TEST_CASE( 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( "/path/" ), FileLister::simplifyPath( "/path/" ) );
|
||||
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( "/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( "../path/index.h" ), FileLister::simplifyPath( "../path/other/../index.h" ) );
|
||||
}
|
||||
|
||||
|
||||
};
|
||||
|
||||
REGISTER_TEST( TestFileLister )
|
||||
|
|
Loading…
Reference in New Issue