no more need for separated tests for code::blocks - netbeans is smarter in handling testcases

4 files changed, 105 insertions, 173 deletions

diff --git a/cmps/tests/ConnectionHandlerTest.cc b/cmps/tests/ConnectionHandlerTest.cc
index 8ff3cce..c9e1099 100644
--- a/cmps/tests/ConnectionHandlerTest.cc
+++ b/cmps/tests/ConnectionHandlerTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      ConnectionHandlerTest.cc
- * Created:   10.07.2012, 05
+ * Created:   10.07.2012, 05:48:23
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
@@ -58,7 +58,7 @@ private:
 };
 
 cTestUnit::cTestUnit(const char* Name, cConnectionPoint &cp)
- : config(12345)
+ : config("/var/lib/cmp")
  , ch(cp, config)
  , name(Name)
  , scanner(NULL)
@@ -72,9 +72,9 @@ cTestUnit::cTestUnit(const char* Name, cConnectionPoint &cp)
      fprintf(stderr, "could not initialize application! (1)");
      exit(-1);
      }
-  scanner->SetMediaFactory(new cMediaFactory(config.DocumentRoot()));
+  scanner->SetMediaFactory(new cMediaFactory(config));
 
-  cAbstractMediaRequestHandler::SetFilesystemScanner(scanner);
+  cAbstractMediaRequestHandler::SetFSMediaScanner(scanner);
   cConnectionHandler::RegisterRequestHandler("/cmd", new cCommandHandler());
   cMediaListHandler *listHandler = new cMediaListHandler();
 
@@ -148,6 +148,9 @@ int main(int argc, char** argv)
 
   std::cout << "%SUITE_FINISHED% time=" << (double)(cTimeMs::Now() - t0) / 1000 << std::endl;
 
+  cFile::Cleanup();
+  cUrl::Cleanup();
+
   return (EXIT_SUCCESS);
 }
 
diff --git a/cmps/tests/JSonTest.cc b/cmps/tests/JSonTest.cc
index 422a845..777b8b5 100644
--- a/cmps/tests/JSonTest.cc
+++ b/cmps/tests/JSonTest.cc
@@ -2,7 +2,7 @@
  * ======================== legal notice ======================
  * 
  * File:      JSonTest.cc
- * Created:   12.07.2012, 07
+ * Created:   12.07.2012, 07:31
  * Author:    <a href="mailto:geronimo013@gmx.de">Geronimo</a>
  * Project:   cmps - the backend (server) part of compound media player
  * 
diff --git a/cmps/tests/MetaScanTest.cc b/cmps/tests/MetaScanTest.cc
index 8b293f9..918ad9f 100644
--- a/cmps/tests/MetaScanTest.cc
+++ b/cmps/tests/MetaScanTest.cc
@@ -26,18 +26,14 @@
 #include <FileReader.h>
 #include <LineReader.h>
 #include <ConfigReader.h>
+#include <CommandReader.h>
+#include <MediainfoReader.h>
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
-#include <errno.h>
-#include <fcntl.h>
 #include <stdio.h>
 #include <unistd.h>
-#include <wait.h>
 #include <tr1/tuple>
-#include <util.h>
-
-static void testPipe(const char *chk = NULL);
 
 static void parseConfig(const char *FileName)
 {
@@ -52,11 +48,43 @@ static void parseConfig(const char *FileName)
   delete cr;
 }
 
+static void dumpTextfile(const char *FileName)
+{
+  cLineReader *lr = new cLineReader(new cFileReader(new cFile(FileName)));
+  const char *line;
+
+  while ((line = lr->ReadLine())) {
+        std::cout << "line: " << line << std::endl;
+        }
+  delete lr;
+}
+
+static void setupMediainfoReader(cMediainfoReader *mir)
+{
+  mir->AddValuableKey("Format");
+  //Audio
+  mir->AddValuableKey("Duration");
+  mir->AddValuableKey("Album");
+  mir->AddValuableKey("Track name");
+  mir->AddValuableKey("Performer");
+  mir->AddValuableKey("Bit rate");
+  //Image
+  mir->AddValuableKey("Width");
+  mir->AddValuableKey("Height");
+  //Video
+  mir->AddValuableKey("Display aspect ratio");
+  mir->AddValuableKey("Scan type");
+}
+
 static void testMediaInfo(const char *FileName)
 {
-  cMediainfoReader *mir = new cMediainfoReader(new cLineReader(new cCommandReader("/usr/bin/mediainfo")));
+  cCommandReader *cr = new cCommandReader("/usr/bin/mediainfo");
+//  cFileReader *fr = new cFileReader(new cFile("mi.output"));
+  cMediainfoReader *mir = new cMediainfoReader(new cLineReader(cr));
   cMediainfoReader::InfoEntry *ie;
 
+  cr->AddCommandParameter(FileName);
+  setupMediainfoReader(mir);
   while ((ie = mir->ReadEntry())) {
         std::cout << "media info - [" << std::get<0>(*ie) << "] ==> " << std::get<1>(*ie) << std::endl;
         delete ie;
@@ -65,7 +93,7 @@ static void testMediaInfo(const char *FileName)
   delete mir;
 }
 
-static void testMediaFiles(const char *FileName)
+void testMediaFiles(const char *FileName)
 {
   cLineReader *lr = new cLineReader(new cFileReader(new cFile(FileName)));
   const char *line;
@@ -88,93 +116,21 @@ static void testCommandReader()
 {
   cCommandReader *cr = new cCommandReader("/bin/ls");
   cLineReader *lr = new cLineReader(cr);
-  char *line;
+  const char *line;
 
-  cr.AddCommandParameter("-al");
-  cr.AddCommandParameter("--color");
+  cr->AddCommandParameter("-al");
+  cr->AddCommandParameter("--color");
 
   while ((line = lr->ReadLine())) {
         std::cout << "from command: " << line << std::endl;
         }
+  delete lr;
 };
 
-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");
+//  testMediaInfo("blah");
+  dumpTextfile("srclient.conf");
 
   std::cout << std::endl << "===========================================" << std::endl << std::endl;
   parseConfig("srserver.conf");
@@ -182,8 +138,8 @@ int main()
   std::cout << std::endl << "===========================================" << std::endl << std::endl;
   testCommandReader();
 
-//  std::cout << std::endl << "===========================================" << std::endl << std::endl;
-//  testMediaFiles("testMedia.files");
+  std::cout << std::endl << "===========================================" << std::endl << std::endl;
+  testMediaFiles("testMedia.files");
 
   cFile::Cleanup();
   return 0;
diff --git a/cmps/tests/StringBuilderTest.cc b/cmps/tests/StringBuilderTest.cc
index bb07d2e..9814411 100644
--- a/cmps/tests/StringBuilderTest.cc
+++ b/cmps/tests/StringBuilderTest.cc
@@ -22,103 +22,76 @@
  * 
  * --------------------------------------------------------------
  */
-#include <stdlib.h>
-#include <iostream>
 #include <StringBuilder.h>
+#include <FileReader.h>
+#include <LineReader.h>
+#include <File.h>
+#include <string.h>
+#include <iostream>
 
-/*
- * Simple C++ Test Suite
- */
+#define NEW_LINE '\n'
 
-void test1()
-{
-  cStringBuilder sb(16);
-  char buf[256] = {0};
-  int blah = 0;
+void rangeTests()
+{                           // 12345678901
+  static const char *sample = "Hello World";
+  cStringBuilder *sb;
+  int chunkSize = strlen(sample) - 4;
+  char *result;
 
-  std::cout << "StringBuilderTest test 1" << std::endl;
+  std::cout << sample << " has length: " << strlen(sample) << std::endl;
 
-  sb.Append("Alle ma herhören!\n").Append("Jetzt jibbet wat uff de Ohren!\n");
-  sb.Append("Ausgewählt: ").Append(true, "Ja", "Nein").Append("\n");
-  sb.Append("Dezimal: ").Append(3.1478910).Append("\n");
-  sb.Append("Integer: ").Append(127).Append("\n");
-  sb.Append("große Zahl: ").Append(98765432123456789l).Append("\n");
+  for (int i=0; i < 6; ++i) {
+      std::cout << "check chunkSize of " << chunkSize + i << std::endl;
+      sb = new cStringBuilder(chunkSize + i);
 
-  std::cout << "size of StringBuilder: " << sb.Size() << " bytes" << std::endl;
-  size_t bytesWritten = sb.Copy(buf, sizeof(buf));
+      sb->Append(sample).Append(NEW_LINE);
+      result = sb->toString();
 
-  if (bytesWritten != sb.Size())
-     std::cout << "%TEST_FAILED% time=0 testname=test1 (StringBuilderTest) message=length after copy differ." << std::endl;
-  else std::cout << "OK" << std::endl << "=====================" << std::endl << buf << "===================" << std::endl;
+      std::cout << "assembled text looks like: " << std::endl << result;
+      free(result);
+      delete sb;
+      }
 }
 
-void test2()
+void basicTests()
 {
-  cStringBuilder sb;
-  char buf[512] = {0};
-  int blah=0;
-  std::cout << "StringBuilderTest test 2" << std::endl;
-//  std::cout << "%TEST_FAILED% time=0 testname=test2 (StringBuilderTest) message=error message sample" << std::endl;
+  cStringBuilder sb(179);
 
-  sb.Append("Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore "
-            "et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. "
-            "Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit "
-            "amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna "
-            "aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd "
-            "gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur "
-            "sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam "
-            "voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea "
-            "takimata sanctus est Lorem ipsum dolor sit amet. ");
-  sb.Append("На берегу пустынных волн\n").Append("Стоял он, дум великих полн,\n");
-  sb.Append("И вдаль глядел. Пред ним широко\n").Append("Река неслася; бедный чёлн\n");
-  sb.Append("По ней стремился одиноко.\n").Append("По мшистым, топким берегам\n");
-  sb.Append("Чернели избы здесь и там,\n").Append("Приют убогого чухонца;\n");
-  sb.Append("И лес, неведомый лучам\n").Append("В тумане спрятанного солнца,\n");
-  sb.Append("Кругом шумел.\n");
-  sb.Append("Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore "
-            "eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum "
-            "zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer "
-            "adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. ");
-  sb.Append("Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex "
-            "ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie "
-            "consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim "
-            "qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. ");
-  sb.Append("Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat "
-            "facer possim assum. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh "
-            "euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis "
-            "nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. ");
-  sb.Append("Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore "
-            "eu feugiat nulla facilisis. ");
+  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);
 
-  std::cout << "size of StringBuilder: " << sb.Size() << " bytes" << std::endl;
-  size_t bytesWritten = 0;
-  int chunkWritten = 0;
+  char *result = sb.toString();
 
-  while ((chunkWritten = sb.Copy(buf, sizeof(buf))) > 0) {
-        bytesWritten += chunkWritten;
-        std::cout << "==========================================" << std::endl << buf;
-        std::cout << "==========================================" << std::endl;
-        }
-  if (bytesWritten != sb.Size())
-     std::cout << "%TEST_FAILED% time=0 testname=test2 (StringBuilderTest) message=size mismatch after write" << std::endl;
-  else std::cout << "OK" << std::endl;
+  std::cout << "sizeof assembled text: " << sb.Size() << std::endl;
+  std::cout << "assembled text looks like:" << std::endl << result;
+
+  free(result);
 }
 
-int main(int argc, char** argv)
+void lineReaderTest()
 {
-  std::cout << "%SUITE_STARTING% StringBuilderTest" << std::endl;
-  std::cout << "%SUITE_STARTED%" << std::endl;
+  cLineReader lr(new cFileReader(new cFile("srclient.conf")));
+  const char *line = NULL;
 
-  std::cout << "%TEST_STARTED% test1 (StringBuilderTest)" << std::endl;
-  test1();
-  std::cout << "%TEST_FINISHED% time=0 test1 (StringBuilderTest)" << std::endl;
-
-  std::cout << "%TEST_STARTED% test2 (StringBuilderTest)\n" << std::endl;
-  test2();
-  std::cout << "%TEST_FINISHED% time=0 test2 (StringBuilderTest)" << std::endl;
+  while ((line = lr.ReadLine())) {
+        std::cout << "line: " << line << std::endl;
+        }
+  lr.Close();
+  cFile::Cleanup();
+}
 
-  std::cout << "%SUITE_FINISHED% time=0" << std::endl;
+int main()
+{
+  lineReaderTest();
+  basicTests();
+  rangeTests();
 
-  return (EXIT_SUCCESS);
+  return 0;
 }
-