changeset 139:3ad78369fcc4

start threaded messages
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 10 Oct 2012 17:57:03 +0200
parents f333c0398f6e
children 4d863c7b2f44
files CMakeLists.txt Core/DicomFormat/DicomValue.h Core/IDynamicObject.h UnitTests/MessageWithDestination.cpp
diffstat 4 files changed, 104 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Wed Oct 10 16:53:03 2012 +0200
+++ b/CMakeLists.txt	Wed Oct 10 17:57:03 2012 +0200
@@ -154,6 +154,7 @@
   add_executable(UnitTests
     ${GTEST_SOURCES}
     UnitTests/main.cpp
+    UnitTests/MessageWithDestination.cpp
     UnitTests/SQLite.cpp
     UnitTests/SQLiteChromium.cpp
     UnitTests/Versions.cpp
--- a/Core/DicomFormat/DicomValue.h	Wed Oct 10 16:53:03 2012 +0200
+++ b/Core/DicomFormat/DicomValue.h	Wed Oct 10 17:57:03 2012 +0200
@@ -32,18 +32,15 @@
 
 #pragma once
 
-#include <boost/noncopyable.hpp>
+#include "../IDynamicObject.h"
+
 #include <string>
 
 namespace Orthanc
 {
-  class DicomValue : public boost::noncopyable
+  class DicomValue : public IDynamicObject
   {
   public:
-    virtual ~DicomValue()
-    {
-    }
-
     virtual DicomValue* Clone() const = 0;
 
     virtual std::string AsString() const = 0;
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Core/IDynamicObject.h	Wed Oct 10 17:57:03 2012 +0200
@@ -0,0 +1,50 @@
+/**
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012 Medical Physics Department, CHU of Liege,
+ * Belgium
+ *
+ * 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.
+ *
+ * In addition, as a special exception, the copyright holders of this
+ * program give permission to link the code of its release with the
+ * OpenSSL project's "OpenSSL" library (or with modified versions of it
+ * that use the same license as the "OpenSSL" library), and distribute
+ * the linked executables. You must obey the GNU General Public License
+ * in all respects for all of the code used other than "OpenSSL". If you
+ * modify file(s) with this exception, you may extend this exception to
+ * your version of the file(s), but you are not obligated to do so. If
+ * you do not wish to do so, delete this exception statement from your
+ * version. If you delete this exception statement from all source files
+ * in the program, then also delete it here.
+ * 
+ * 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/>.
+ **/
+
+
+#pragma once
+
+#include <boost/noncopyable.hpp>
+
+namespace Orthanc
+{
+  /**
+   * This class should be the ancestor to any class whose type is
+   * determined at the runtime, and that can be dynamically allocated.
+   **/
+  class IDynamicObject : public boost::noncopyable
+  {
+  public:
+    virtual ~IDynamicObject()
+    {
+    }
+  };
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/UnitTests/MessageWithDestination.cpp	Wed Oct 10 17:57:03 2012 +0200
@@ -0,0 +1,50 @@
+#include "../Core/IDynamicObject.h"
+
+#include <gtest/gtest.h>
+#include <string>
+
+namespace Orthanc
+{
+  /**
+   * This class represents a message that is to be sent to some destination.
+   **/
+  class MessageWithDestination : public boost::noncopyable
+  {
+  private:
+    IDynamicObject* message_;
+    std::string destination_;
+
+  public:
+    /**
+     * Create a new message with a destination.
+     * \param message The content of the message (takes the ownership)
+     * \param destination The destination of the message
+     **/
+    MessageWithDestination(IDynamicObject* message,
+                           const char* destination)
+    {
+      message_ = message;
+      destination_ = destination;
+    }
+
+    ~MessageWithDestination()
+    {
+      if (message_)
+      {
+        delete message_;
+      }
+    }
+  };
+}
+
+
+
+#include "../Core/DicomFormat/DicomString.h"
+
+using namespace Orthanc;
+
+TEST(MessageWithDestination, A)
+{
+  MessageWithDestination a(new DicomString("coucou"), "pukkaj");
+}
+