src/shared_conversions.h tests/bindingstest.cpp

[Christian Mollekopf]

 src/shared_conversions.h |    2 +-
 tests/bindingstest.cpp   |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 7a5bd34d578d65962556efc2e17d214f03caa625
Author: Christian Mollekopf <mollekopf at kolabsys.com>
Date:   Sat May 12 17:07:45 2012 +0200

    It's perfectly valid to pass in a non-urn uid. + test cleanup

diff --git a/src/shared_conversions.h b/src/shared_conversions.h
index 6165058..a19cd88 100644
--- a/src/shared_conversions.h
+++ b/src/shared_conversions.h
@@ -81,7 +81,7 @@ std::string toURN(const std::string &uid)
 std::string fromURN(const std::string &uri)
 {
     if (uri.substr(0, 9) != std::string("urn:uuid:")) {
-        WARNING("not a urn");
+        LOG("not a urn");
         return uri;
     }
     return uri.substr(9);
diff --git a/tests/bindingstest.cpp b/tests/bindingstest.cpp
index ba71757..3bd9ff3 100644
--- a/tests/bindingstest.cpp
+++ b/tests/bindingstest.cpp
@@ -120,6 +120,8 @@ void setIncidence(T &ev)
         attach3.setData(string(memblock, size), "mimetype");
 
         delete[] memblock;
+    } else {
+        qWarning() << "Testfile not found";
     }
     attach3.setLabel("labe3l");
     attachments.push_back(attach3);
@@ -294,6 +296,8 @@ void BindingsTest::journalCompletness()
         attach3.setData(string(memblock, size), "mimetype");
 
         delete[] memblock;
+    } else {
+        qWarning() << "Testfile not found";
     }
     attach3.setLabel("labe3l");
     attachments.push_back(attach3);
@@ -443,7 +447,7 @@ void BindingsTest::contactCompletness()
     
     const std::string result = Kolab::writeContact(c);
     QVERIFY(Kolab::error() == Kolab::NoError);
-    std::cout << result << endl;
+//     std::cout << result << endl;
     Kolab::Contact e = Kolab::readContact(result, false);
     QVERIFY(Kolab::error() == Kolab::NoError);
     QCOMPARE(e.uid(), c.uid());