From aa714b0076c06d7133c625ab22c86114d4f17e23 Mon Sep 17 00:00:00 2001 From: geronimo Date: Sun, 29 Jul 2012 16:00:29 +0200 Subject: cleanup --- .../ConnectionHandlerTest.layout.save | 9 -- .../CredentialPersistence.cbp.save | 67 ---------- .../CredentialPersistence.layout.save | 9 -- tests/FilesystemTest/FilesystemTest.cbp | 74 +++++++++++ .../FilesystemTest/FilesystemTest.cscope_file_list | 1 + tests/FilesystemTest/FilesystemTest.depend | 1 + tests/FilesystemTest/FilesystemTest.layout | 9 ++ tests/FilesystemTest/src/File.cc | 11 -- tests/JSonTest/JSonTest.cbp.save | 66 --------- tests/MetaScanTest/MetaScanTest.cbp | 69 ++++++++++ tests/MetaScanTest/MetaScanTest.depend | 28 ++++ tests/MetaScanTest/MetaScanTest.layout | 9 ++ tests/MetaScanTest/main.cpp | 147 +++++++++++++++++++++ tests/StringBuilderTest/StringBuilderTest.cbp | 67 ++++++++++ tests/StringBuilderTest/StringBuilderTest.depend | 1 + tests/StringBuilderTest/StringBuilderTest.layout | 9 ++ tests/StringBuilderTest/main.cpp | 76 +++++++++++ tests/StringBuilderTest/srclient.conf | 1 + 18 files changed, 492 insertions(+), 162 deletions(-) delete mode 100644 tests/ConnectionHandlerTest/ConnectionHandlerTest.layout.save delete mode 100644 tests/CredentialPersistence/CredentialPersistence.cbp.save delete mode 100644 tests/CredentialPersistence/CredentialPersistence.layout.save create mode 100644 tests/FilesystemTest/FilesystemTest.cbp create mode 100644 tests/FilesystemTest/FilesystemTest.cscope_file_list create mode 100644 tests/FilesystemTest/FilesystemTest.depend create mode 100644 tests/FilesystemTest/FilesystemTest.layout delete mode 100644 tests/FilesystemTest/src/File.cc delete mode 100644 tests/JSonTest/JSonTest.cbp.save create mode 100644 tests/MetaScanTest/MetaScanTest.cbp create mode 100644 tests/MetaScanTest/MetaScanTest.depend create mode 100644 tests/MetaScanTest/MetaScanTest.layout create mode 100644 tests/MetaScanTest/main.cpp create mode 100644 tests/StringBuilderTest/StringBuilderTest.cbp create mode 100644 tests/StringBuilderTest/StringBuilderTest.depend create mode 100644 tests/StringBuilderTest/StringBuilderTest.layout create mode 100644 tests/StringBuilderTest/main.cpp create mode 120000 tests/StringBuilderTest/srclient.conf (limited to 'tests') diff --git a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout.save b/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout.save deleted file mode 100644 index 130e1dc..0000000 --- a/tests/ConnectionHandlerTest/ConnectionHandlerTest.layout.save +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/CredentialPersistence/CredentialPersistence.cbp.save b/tests/CredentialPersistence/CredentialPersistence.cbp.save deleted file mode 100644 index 0a5cfce..0000000 --- a/tests/CredentialPersistence/CredentialPersistence.cbp.save +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - diff --git a/tests/CredentialPersistence/CredentialPersistence.layout.save b/tests/CredentialPersistence/CredentialPersistence.layout.save deleted file mode 100644 index f0df7b3..0000000 --- a/tests/CredentialPersistence/CredentialPersistence.layout.save +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/tests/FilesystemTest/FilesystemTest.cbp b/tests/FilesystemTest/FilesystemTest.cbp new file mode 100644 index 0000000..43f5b5c --- /dev/null +++ b/tests/FilesystemTest/FilesystemTest.cbp @@ -0,0 +1,74 @@ + + + + + + diff --git a/tests/FilesystemTest/FilesystemTest.cscope_file_list b/tests/FilesystemTest/FilesystemTest.cscope_file_list new file mode 100644 index 0000000..7ac8741 --- /dev/null +++ b/tests/FilesystemTest/FilesystemTest.cscope_file_list @@ -0,0 +1 @@ +"/d/linux/CMP/tests/FilesystemTest/main.cpp" diff --git a/tests/FilesystemTest/FilesystemTest.depend b/tests/FilesystemTest/FilesystemTest.depend new file mode 100644 index 0000000..c4ac310 --- /dev/null +++ b/tests/FilesystemTest/FilesystemTest.depend @@ -0,0 +1 @@ +# depslib dependency file v1.0 diff --git a/tests/FilesystemTest/FilesystemTest.layout b/tests/FilesystemTest/FilesystemTest.layout new file mode 100644 index 0000000..68e17b2 --- /dev/null +++ b/tests/FilesystemTest/FilesystemTest.layout @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/FilesystemTest/src/File.cc b/tests/FilesystemTest/src/File.cc deleted file mode 100644 index 8f3b528..0000000 --- a/tests/FilesystemTest/src/File.cc +++ /dev/null @@ -1,11 +0,0 @@ -#include "File.h" - -File::File(const char *Path) -{ - //ctor -} - -File::~File() -{ - //dtor -} diff --git a/tests/JSonTest/JSonTest.cbp.save b/tests/JSonTest/JSonTest.cbp.save deleted file mode 100644 index 9328615..0000000 --- a/tests/JSonTest/JSonTest.cbp.save +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - diff --git a/tests/MetaScanTest/MetaScanTest.cbp b/tests/MetaScanTest/MetaScanTest.cbp new file mode 100644 index 0000000..832ce4a --- /dev/null +++ b/tests/MetaScanTest/MetaScanTest.cbp @@ -0,0 +1,69 @@ + + + + + + diff --git a/tests/MetaScanTest/MetaScanTest.depend b/tests/MetaScanTest/MetaScanTest.depend new file mode 100644 index 0000000..aa86b49 --- /dev/null +++ b/tests/MetaScanTest/MetaScanTest.depend @@ -0,0 +1,28 @@ +# depslib dependency file v1.0 +1343547065 source:/d/linux/CMP/tests/MetaScanTest/main.cpp + + + + + + + + + + + + + + +1343485153 /d/linux/CMP/libs/IO/include/File.h + + + +1343485153 /d/linux/CMP/libs/IO/include/FileReader.h + +1343485153 /d/linux/CMP/libs/IO/include/LineReader.h + +1343538490 /d/linux/CMP/libs/IO/include/ConfigReader.h + + + diff --git a/tests/MetaScanTest/MetaScanTest.layout b/tests/MetaScanTest/MetaScanTest.layout new file mode 100644 index 0000000..c9eeb3d --- /dev/null +++ b/tests/MetaScanTest/MetaScanTest.layout @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/MetaScanTest/main.cpp b/tests/MetaScanTest/main.cpp new file mode 100644 index 0000000..62c1bda --- /dev/null +++ b/tests/MetaScanTest/main.cpp @@ -0,0 +1,147 @@ +/* + * test case for scanning of meta data + */ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +//static const char *mediaInfo = NULL; +//static const char *ffmpeg = NULL; +static void testPipe(const char *chk = NULL); + +#define ASSERT_IS(rv, x) if (x != rv) { fprintf(stderr, "assertation failed at %s #%d\n",__FILE__,__LINE__); exit(-1); } +#define ASSERT_NOT(rv, x) if (x == rv) { fprintf(stderr, "assertation failed at %s #%d\n",__FILE__,__LINE__); exit(-1); } +#define FAIL(s) fprintf(stderr, s); + +static void parseConfig(const char *FileName) +{ + cConfigReader *cr = new cConfigReader(new cLineReader(new cFileReader(new cFile(FileName)))); + cConfigReader::ConfigEntry *ce; + + while ((ce = cr->ReadValue())) { + std::cout << "config entry [" << std::get<0>(*ce) << "] => " << std::get<1>(*ce) << std::endl; + delete ce; + } + cr->Close(); + delete cr; +} + +static void testMediaFiles(const char *FileName) +{ + cLineReader *lr = new cLineReader(new cFileReader(new cFile(FileName))); + const char *line; + + while ((line = lr->ReadLine())) { + std::cout << "media-test-file: " << line << std::endl; + testPipe(line); + } + lr->Close(); + delete lr; +} + +static const short BufferSize = 100; +enum PipeFileDescriptors { + READ_FD = 0, + WRITE_FD = 1 +}; + +static void testPipe(const char *chk) +{ + int parent2Child[2]; + int child2Parent[2]; + pid_t pid; + std::string dataReadFromChild; + char buffer[BufferSize + 1]; + ssize_t readResult; + bool run = true; + int status; + + ASSERT_IS(0, pipe(parent2Child)); + ASSERT_IS(0, pipe(child2Parent)); + + switch (pid = fork()) { + case -1: + FAIL("fork failed"); + exit(-1); + + case 0: /* child */ + ASSERT_NOT(-1, dup2(parent2Child[READ_FD], STDIN_FILENO)); + ASSERT_NOT(-1, dup2(child2Parent[WRITE_FD], STDOUT_FILENO)); + ASSERT_NOT(-1, dup2(child2Parent[WRITE_FD], STDERR_FILENO)); + ASSERT_IS(0, close(parent2Child[WRITE_FD])); + ASSERT_IS(0, close(child2Parent[READ_FD])); + + if (chk) { + execlp("mediainfo", "mediainfo", chk, NULL); + } + else execlp("ls", "ls", "-al", "--color", NULL); + FAIL("this line should never be reached!"); + exit(-1); + + default: /* parent */ + std::cout << "child " << pid << " process running ..." << std::endl; + + ASSERT_IS(0, close(parent2Child[READ_FD])); + ASSERT_IS(0, close(child2Parent[WRITE_FD])); + + while (run) { + switch (readResult = read(child2Parent[READ_FD], buffer, BufferSize)) { + case 0: /* end of file, or non-blocking read. */ + std::cout << "End of File reached ..." << std::endl + << "Data received was (" + << dataReadFromChild.size() << "):" << std::endl + << dataReadFromChild << std::endl; + ASSERT_IS(pid, waitpid(pid, &status, 0)); + + std::cout << std::endl + << "child exit status is: " << WEXITSTATUS(status) << std::endl << std::endl; +// exit(0); + run = false; + break; + + case -1: + if ((errno == EINTR) || (errno == EAGAIN)) { + errno = 0; + } + else { + FAIL("read() failed"); + run = false; + } break; + + default: + dataReadFromChild.append(buffer, readResult); + break; + } + } + } +} + + +// mediainfo ${media} | grep "Scan type" +// ffmpeg -i ${media} +int main() +{ + parseConfig("srclient.conf"); + + std::cout << std::endl << "===========================================" << std::endl << std::endl; + parseConfig("srserver.conf"); + + std::cout << std::endl << "===========================================" << std::endl << std::endl; + testPipe(); + + std::cout << std::endl << "===========================================" << std::endl << std::endl; + testMediaFiles("testMedia.files"); + + cFile::Cleanup(); + return 0; +} diff --git a/tests/StringBuilderTest/StringBuilderTest.cbp b/tests/StringBuilderTest/StringBuilderTest.cbp new file mode 100644 index 0000000..bc86f1b --- /dev/null +++ b/tests/StringBuilderTest/StringBuilderTest.cbp @@ -0,0 +1,67 @@ + + + + + + diff --git a/tests/StringBuilderTest/StringBuilderTest.depend b/tests/StringBuilderTest/StringBuilderTest.depend new file mode 100644 index 0000000..c4ac310 --- /dev/null +++ b/tests/StringBuilderTest/StringBuilderTest.depend @@ -0,0 +1 @@ +# depslib dependency file v1.0 diff --git a/tests/StringBuilderTest/StringBuilderTest.layout b/tests/StringBuilderTest/StringBuilderTest.layout new file mode 100644 index 0000000..a2754af --- /dev/null +++ b/tests/StringBuilderTest/StringBuilderTest.layout @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/tests/StringBuilderTest/main.cpp b/tests/StringBuilderTest/main.cpp new file mode 100644 index 0000000..c06034a --- /dev/null +++ b/tests/StringBuilderTest/main.cpp @@ -0,0 +1,76 @@ +/* + * small tests for class StringBuilder + */ +#include +#include +#include +#include +#include +#include + +#define NEW_LINE '\n' + +void rangeTests() +{ // 12345678901 + static const char *sample = "Hello World"; + cStringBuilder *sb; + int chunkSize = strlen(sample) - 4; + char *result; + + std::cout << sample << " has length: " << strlen(sample) << std::endl; + + for (int i=0; i < 6; ++i) { + std::cout << "check chunkSize of " << chunkSize + i << std::endl; + sb = new cStringBuilder(chunkSize + i); + + sb->Append(sample).Append(NEW_LINE); + result = sb->toString(); + + std::cout << "assembled text looks like: " << std::endl << result; + free(result); + delete sb; + } +} + +void basicTests() +{ + cStringBuilder sb(179); + + sb.Append("hello World").Append(NEW_LINE); + sb.Append("logical default true: ").Append(true).Append(NEW_LINE); + sb.Append("logical default false: ").Append(false).Append(NEW_LINE); + sb.Append("logical true value: ").Append(true, "true", "false").Append(NEW_LINE); + sb.Append("logical false value: ").Append(false, "true", "false").Append(NEW_LINE); + sb.Append("double: ").Append(3.1456789).Append(NEW_LINE); + sb.Append("unsigned long: ").Append((size_t) 91237485l).Append(NEW_LINE); + sb.Append("long: ").Append(1234567890l).Append(NEW_LINE); + sb.Append("int: ").Append(512).Append(NEW_LINE); + + char *result = sb.toString(); + + std::cout << "sizeof assembled text: " << sb.Size() << std::endl; + std::cout << "assembled text looks like:" << std::endl << result; + + free(result); +} + +void lineReaderTest() +{ + cLineReader lr(new cFileReader(new cFile("srclient.conf"))); + const char *line = NULL; + + while ((line = lr.ReadLine())) { + std::cout << "line: " << line << std::endl; + } + lr.Close(); + cFile::Cleanup(); +} + +int main() +{ + lineReaderTest(); + basicTests(); + rangeTests(); + + return 0; +} diff --git a/tests/StringBuilderTest/srclient.conf b/tests/StringBuilderTest/srclient.conf new file mode 120000 index 0000000..a159926 --- /dev/null +++ b/tests/StringBuilderTest/srclient.conf @@ -0,0 +1 @@ +/home/django/.cmp/srclient.conf \ No newline at end of file -- cgit v1.2.3