josh/jes-ruby
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename FileReader to FileLoader

Browse Source
This commit is contained in:
Josh Holtrop 2014-06-23 15:46:56 -04:00
parent 29520933f7
commit f7937c1bea
3 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/include/jes/FileReader.h → src/lib/include/jes/FileLoader.h
View File

@ -8,7 +8,7 @@
namespace jes namespace jes
{ {
class FileReader class FileLoader
{ {
public: public:
enum enum
@ -19,8 +19,8 @@ namespace jes
LINE_ENDING_COUNT LINE_ENDING_COUNT
}; };
FileReader(); FileLoader();
~FileReader(); ~FileLoader();
bool load(const char * fname); bool load(const char * fname);
unsigned int num_lines() unsigned int num_lines()
{ {
@ -45,7 +45,7 @@ namespace jes
int m_line_endings; int m_line_endings;
LineIndexPairVectorRef m_lines; LineIndexPairVectorRef m_lines;
}; };
typedef Ref<FileReader> FileReaderRef; typedef Ref<FileLoader> FileLoaderRef;
} }
#endif #endif

12
src/lib/src/FileReader.cc → src/lib/src/FileLoader.cc
View File

@ -1,5 +1,5 @@
#include "jes.h" #include "jes.h"
#include "jes/FileReader.h" #include "jes/FileLoader.h"
#include "jes/Text.h" #include "jes/Text.h"
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
@ -9,7 +9,7 @@
namespace jes namespace jes
{ {
FileReader::FileReader() FileLoader::FileLoader()
{ {
m_fd = 0; m_fd = 0;
m_buf = NULL; m_buf = NULL;
@ -17,7 +17,7 @@ namespace jes
m_lines = NULL; m_lines = NULL;
} }
FileReader::~FileReader() FileLoader::~FileLoader()
{ {
if (m_buf != NULL) if (m_buf != NULL)
{ {
@ -26,7 +26,7 @@ namespace jes
} }
} }
bool FileReader::load(const char * fname) bool FileLoader::load(const char * fname)
{ {
struct stat st; struct stat st;
if (stat(fname, &st) != 0) if (stat(fname, &st) != 0)
@ -78,7 +78,7 @@ namespace jes
return true; return true;
} }
void FileReader::load_buf(size_t size) void FileLoader::load_buf(size_t size)
{ {
LineIndexPairVectorRef lines[LINE_ENDING_COUNT]; LineIndexPairVectorRef lines[LINE_ENDING_COUNT];
size_t line_start[LINE_ENDING_COUNT] = {0}; size_t line_start[LINE_ENDING_COUNT] = {0};
@ -137,7 +137,7 @@ namespace jes
} }
} }
TextRef FileReader::get_line(unsigned int line_no) TextRef FileLoader::get_line(unsigned int line_no)
{ {
return new Text((*m_lines)[line_no].first, (*m_lines)[line_no].second); return new Text((*m_lines)[line_no].first, (*m_lines)[line_no].second);
} }

32
test/src/test_FileReader.cc → test/src/test_FileLoader.cc
View File

@ -1,52 +1,52 @@
#include "gtest/gtest.h" #include "gtest/gtest.h"
#include "jes/FileReader.h" #include "jes/FileLoader.h"
using namespace jes; using namespace jes;
TEST(FileReaderTest, num_lines_defaults_to_0) TEST(FileLoaderTest, num_lines_defaults_to_0)
{ {
FileReader fr; FileLoader fr;
EXPECT_EQ(0, fr.num_lines()); EXPECT_EQ(0, fr.num_lines());
} }
TEST(FileReaderTest, load_returns_false_for_nonexistent_file) TEST(FileLoaderTest, load_returns_false_for_nonexistent_file)
{ {
FileReader fr; FileLoader fr;
EXPECT_FALSE(fr.load("this/file/does/not/exist.txt")); EXPECT_FALSE(fr.load("this/file/does/not/exist.txt"));
} }
TEST(FileReaderTest, loading_empty_file) TEST(FileLoaderTest, loading_empty_file)
{ {
FileReader fr; FileLoader fr;
EXPECT_TRUE(fr.load("test/files/empty.txt")); EXPECT_TRUE(fr.load("test/files/empty.txt"));
EXPECT_EQ(0, fr.num_lines()); EXPECT_EQ(0, fr.num_lines());
} }
TEST(FileReaderTest, reads_lf_format_file) TEST(FileLoaderTest, reads_lf_format_file)
{ {
FileReader fr; FileLoader fr;
EXPECT_TRUE(fr.load("test/files/line_endings/unix_format.txt")); EXPECT_TRUE(fr.load("test/files/line_endings/unix_format.txt"));
EXPECT_EQ(FileReader::LINE_ENDING_LF, fr.get_line_endings()); EXPECT_EQ(FileLoader::LINE_ENDING_LF, fr.get_line_endings());
EXPECT_EQ(2, fr.num_lines()); EXPECT_EQ(2, fr.num_lines());
EXPECT_EQ("Hello.", fr.get_line(0)->to_s()); EXPECT_EQ("Hello.", fr.get_line(0)->to_s());
EXPECT_EQ("This file is in UNIX line ending format.", fr.get_line(1)->to_s()); EXPECT_EQ("This file is in UNIX line ending format.", fr.get_line(1)->to_s());
} }
TEST(FileReaderTest, reads_cr_format_file) TEST(FileLoaderTest, reads_cr_format_file)
{ {
FileReader fr; FileLoader fr;
EXPECT_TRUE(fr.load("test/files/line_endings/mac_format.txt")); EXPECT_TRUE(fr.load("test/files/line_endings/mac_format.txt"));
EXPECT_EQ(FileReader::LINE_ENDING_CR, fr.get_line_endings()); EXPECT_EQ(FileLoader::LINE_ENDING_CR, fr.get_line_endings());
EXPECT_EQ(2, fr.num_lines()); EXPECT_EQ(2, fr.num_lines());
EXPECT_EQ("Hello.", fr.get_line(0)->to_s()); EXPECT_EQ("Hello.", fr.get_line(0)->to_s());
EXPECT_EQ("This file is in MAC line ending format.", fr.get_line(1)->to_s()); EXPECT_EQ("This file is in MAC line ending format.", fr.get_line(1)->to_s());
} }
TEST(FileReaderTest, reads_crlf_format_file) TEST(FileLoaderTest, reads_crlf_format_file)
{ {
FileReader fr; FileLoader fr;
EXPECT_TRUE(fr.load("test/files/line_endings/dos_format.txt")); EXPECT_TRUE(fr.load("test/files/line_endings/dos_format.txt"));
EXPECT_EQ(FileReader::LINE_ENDING_CRLF, fr.get_line_endings()); EXPECT_EQ(FileLoader::LINE_ENDING_CRLF, fr.get_line_endings());
EXPECT_EQ(2, fr.num_lines()); EXPECT_EQ(2, fr.num_lines());
EXPECT_EQ("Hello.", fr.get_line(0)->to_s()); EXPECT_EQ("Hello.", fr.get_line(0)->to_s());
EXPECT_EQ("This file is in DOS line ending format.", fr.get_line(1)->to_s()); EXPECT_EQ("This file is in DOS line ending format.", fr.get_line(1)->to_s());