Update unit tests

- removes obsolete benchmark tests
- removes known broken main loop test

4 files changed, 4 insertions, 280 deletions

diff --git a/Makefile.am b/Makefile.am
index f0af9f9..15dd21f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -121,7 +121,6 @@ check_PROGRAMS = \
         DBusDaemonProxyTest \
         DBusCommunicationTest \
         DBusMultipleConnectionTest \
-        DBusBenchmarkingTest \
         DBusServicePublisherTest
 
 
@@ -164,11 +163,6 @@ DBusVariantOutputStreamTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
 DBusVariantOutputStreamTest_CXXFLAGS = ${GTEST_CXXFLAGS}
 DBusVariantOutputStreamTest_LDADD = ${LDADD_FOR_GTEST}
 
-DBusBenchmarkingTest_SOURCES = src/test/DBusBenchmarkingTest.cpp
-DBusBenchmarkingTest_CPPFLAGS = ${AM_CPPFLAGS} ${GTEST_CPPFLAGS}
-DBusBenchmarkingTest_CXXFLAGS = ${GTEST_CXXFLAGS}
-DBusBenchmarkingTest_LDADD = ${LDADD_FOR_GTEST}
-
 DBusCommunicationTest_SOURCES = \
         src/test/DBusCommunicationTest.cpp \
         ${TestInterfaceSources}
diff --git a/src/test/DBusBenchmarkingTest.cpp b/src/test/DBusBenchmarkingTest.cpp
deleted file mode 100644
index ddce610..0000000
--- a/src/test/DBusBenchmarkingTest.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-/* Copyright (C) 2013 BMW Group
- * Author: Manfred Bathelt (manfred.bathelt@bmw.de)
- * Author: Juergen Gehring (juergen.gehring@bmw.de)
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-#include <CommonAPI/SerializableStruct.h>
-#include <CommonAPI/DBus/DBusInputStream.h>
-#include <CommonAPI/DBus/DBusOutputStream.h>
-
-#include <unordered_map>
-#include <bits/functional_hash.h>
-
-#include <gtest/gtest.h>
-
-#include <dbus/dbus.h>
-
-#include <chrono>
-#include <cstdint>
-#include <vector>
-#include <unordered_map>
-#include <bits/functional_hash.h>
-
-
-class BenchmarkingTest: public ::testing::Test {
-  protected:
-    DBusMessage* libdbusMessage;
-    DBusMessageIter libdbusMessageWriteIter;
-    size_t numOfElements;
-
-    void SetUp() {
-        numOfElements = 2;
-        libdbusMessage = dbus_message_new_method_call("no.bus.here", "/no/object/here", NULL, "noMethodHere");
-        ASSERT_TRUE(libdbusMessage != NULL);
-        dbus_message_iter_init_append(libdbusMessage, &libdbusMessageWriteIter);
-    }
-
-    void TearDown() {
-        dbus_message_unref(libdbusMessage);
-    }
-};
-
-template <typename _ArrayElementLibdbusType, typename _ArrayElementCommonApiType>
-void prepareLibdbusArray(DBusMessage* libdbusMessage,
-                         const int arrayElementLibdbusType,
-                         const char* arrayElementLibdbusTypeAsString,
-                         const _ArrayElementLibdbusType& arrayInitElementValue,
-                         const uint32_t arrayInitTime,
-                         size_t& libdbusInitElementCount) {
-
-    DBusMessageIter libdbusMessageIter;
-    DBusMessageIter libdbusMessageContainerIter;
-
-    dbus_message_iter_init_append(libdbusMessage, &libdbusMessageIter);
-
-    dbus_bool_t libdbusSuccess = dbus_message_iter_open_container(&libdbusMessageIter,
-                                                                  DBUS_TYPE_ARRAY,
-                                                                  arrayElementLibdbusTypeAsString,
-                                                                  &libdbusMessageContainerIter);
-    ASSERT_TRUE(libdbusSuccess);
-
-
-    std::chrono::milliseconds libdbusInitTime;
-    std::chrono::time_point<std::chrono::high_resolution_clock> clockStart = std::chrono::high_resolution_clock::now();
-
-    do {
-        for (int i = 0; i < 1000; i++)
-            dbus_message_iter_append_basic(&libdbusMessageContainerIter,
-                                           arrayElementLibdbusType,
-                                           &arrayInitElementValue);
-
-        libdbusInitElementCount += 1000;
-
-        libdbusInitTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-                std::chrono::high_resolution_clock::now() - clockStart);
-    } while (libdbusInitTime.count() < arrayInitTime);
-
-    libdbusSuccess = dbus_message_iter_close_container(&libdbusMessageIter, &libdbusMessageContainerIter);
-    ASSERT_TRUE(libdbusSuccess);
-
-    std::cout << "LibdbusInitTime = " << libdbusInitTime.count() << std::endl;
-    std::cout << "LibdbusInitElementCount = " << libdbusInitElementCount << std::endl;
-}
-
-
-template <typename _ArrayElementLibdbusType, typename _ArrayElementCommonApiType>
-void measureLibdbusArrayReadTime(DBusMessage* libdbusMessage,
-                                 size_t& libdbusInitElementCount,
-                                 std::chrono::milliseconds& libdbusArrayReadTime) {
-
-    DBusMessageIter libdbusMessageIter;
-    DBusMessageIter libdbusMessageContainerIter;
-
-    dbus_bool_t libdbusSuccess;
-
-    libdbusSuccess = dbus_message_iter_init(libdbusMessage, &libdbusMessageIter);
-    ASSERT_TRUE(libdbusSuccess);
-
-    dbus_message_iter_recurse(&libdbusMessageIter, &libdbusMessageContainerIter);
-
-    size_t libdbusReadElementCount = 0;
-    std::chrono::time_point<std::chrono::high_resolution_clock> clockStart = std::chrono::high_resolution_clock::now();
-
-    do {
-        _ArrayElementLibdbusType libdbusValue;
-
-        dbus_message_iter_get_basic(&libdbusMessageContainerIter, &libdbusValue);
-
-        ++libdbusReadElementCount;
-    } while (dbus_message_iter_next(&libdbusMessageContainerIter));
-
-    libdbusArrayReadTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-            std::chrono::high_resolution_clock::now() - clockStart);
-
-    ASSERT_EQ(libdbusInitElementCount, libdbusReadElementCount);
-}
-
-
-template <typename _ArrayElementLibdbusType, typename _ArrayElementCommonApiType>
-void measureCommonApiArrayReadTime(DBusMessage* libdbusMessage,
-                                   std::chrono::milliseconds& commonArrayApiReadTime,
-                                   size_t& libdbusInitElementCount) {
-
-    CommonAPI::DBus::DBusMessage dbusMessage(libdbusMessage);
-    CommonAPI::DBus::DBusInputStream DBusInputStream(dbusMessage);
-    std::vector<_ArrayElementCommonApiType> commonApiVector;
-
-    std::chrono::time_point<std::chrono::high_resolution_clock> clockStart = std::chrono::high_resolution_clock::now();
-
-    DBusInputStream >> commonApiVector;
-
-    commonArrayApiReadTime = std::chrono::duration_cast<std::chrono::milliseconds>(
-            std::chrono::high_resolution_clock::now() - clockStart);
-
-    ASSERT_EQ(libdbusInitElementCount, commonApiVector.size());
-}
-
-
-template <typename _ArrayElementLibdbusType, typename _ArrayElementCommonApiType>
-void measureArrayReadTime(
-		const int arrayElementLibdbusType,
-		const char* arrayElementLibdbusTypeAsString,
-		const _ArrayElementLibdbusType arrayInitElementValue,
-		const uint32_t arrayInitTime,
-		std::chrono::milliseconds& libdbusArrayReadTime,
-		std::chrono::milliseconds& commonArrayApiReadTime) {
-
-	DBusMessage* libdbusMessage;
-    dbus_bool_t libdbusSuccess;
-    size_t libdbusInitElementCount = 0;
-
-    libdbusMessage = dbus_message_new_method_call("no.bus.here", "/no/object/here", NULL, "noMethodHere");
-    ASSERT_TRUE(libdbusMessage != NULL);
-
-    prepareLibdbusArray<_ArrayElementLibdbusType, _ArrayElementCommonApiType>(
-                                libdbusMessage,
-                                arrayElementLibdbusType,
-                                arrayElementLibdbusTypeAsString,
-                                arrayInitElementValue,
-                                arrayInitTime,
-                                libdbusInitElementCount);
-
-    measureLibdbusArrayReadTime<_ArrayElementLibdbusType, _ArrayElementCommonApiType>(
-                                libdbusMessage,
-                                libdbusInitElementCount,
-                                libdbusArrayReadTime);
-
-    measureCommonApiArrayReadTime<_ArrayElementLibdbusType, _ArrayElementCommonApiType>(
-                                libdbusMessage,
-                                commonArrayApiReadTime,
-                                libdbusInitElementCount);
-}
-
-
-TEST_F(BenchmarkingTest, InputStreamReadsIntegerArrayFasterThanLibdbus) {
-	std::chrono::milliseconds libdbusArrayReadTime;
-	std::chrono::milliseconds commonApiArrayReadTime;
-
-	measureArrayReadTime<int32_t, int32_t>(DBUS_TYPE_INT32,
-										   DBUS_TYPE_INT32_AS_STRING,
-										   1234567890,
-										   1000,
-										   libdbusArrayReadTime,
-										   commonApiArrayReadTime);
-
-	RecordProperty("LibdbusArrayReadTime", libdbusArrayReadTime.count());
-	RecordProperty("CommonApiArrayReadTime", commonApiArrayReadTime.count());
-
-	std::cout << "LibdbusArrayReadTime = " << libdbusArrayReadTime.count() << std::endl;
-	std::cout << "CommonApiArrayReadTime = " << commonApiArrayReadTime.count() << std::endl;
-
-    ASSERT_LT(commonApiArrayReadTime.count(), libdbusArrayReadTime.count() * 0.30)
-    	<< "CommonAPI::DBus::DBusInputStream must be at least 70% faster than libdbus!";
-}
-
-TEST_F(BenchmarkingTest, InputStreamReadsStringArrayFasterThanLibdbus) {
-	std::chrono::milliseconds libdbusArrayReadTime;
-	std::chrono::milliseconds commonApiArrayReadTime;
-
-	measureArrayReadTime<char*, std::string>(DBUS_TYPE_STRING,
-											 DBUS_TYPE_STRING_AS_STRING,
-											 const_cast<char*>("01234567890123456789"),
-											 1000,
-											 libdbusArrayReadTime,
-											 commonApiArrayReadTime);
-
-	RecordProperty("LibdbusArrayReadTime", libdbusArrayReadTime.count());
-	RecordProperty("CommonApiArrayReadTime", commonApiArrayReadTime.count());
-
-	std::cout << "LibdbusArrayReadTime = " << libdbusArrayReadTime.count() << std::endl;
-	std::cout << "CommonApiArrayReadTime = " << commonApiArrayReadTime.count() << std::endl;
-
-    ASSERT_LT(commonApiArrayReadTime.count(), libdbusArrayReadTime.count() * 0.30)
-    	<< "CommonAPI::DBus::DBusInputStream must be at least 70% faster than libdbus!";
-}
-
-int main(int argc, char** argv) {
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
diff --git a/src/test/DBusMainLoopIntegrationTest.cpp b/src/test/DBusMainLoopIntegrationTest.cpp
index e830c3c..e80913b 100644
--- a/src/test/DBusMainLoopIntegrationTest.cpp
+++ b/src/test/DBusMainLoopIntegrationTest.cpp
@@ -276,59 +276,6 @@ class BigDataTestStub: public commonapi::tests::TestInterfaceStubDefault {
     }
 };
 
-
-TEST_F(DBusMainLoopTest, ProxyAndServiceInSameDemoMainloopCanHandleBigData) {
-    std::shared_ptr<BigDataTestStub> stub = std::make_shared<
-                    BigDataTestStub>();
-    ASSERT_TRUE(servicePublisher_->registerService(stub, testAddress8, mainloopFactory_));
-
-    auto proxy = mainloopFactory_->buildProxy<commonapi::tests::TestInterfaceProxy>(testAddress8);
-    ASSERT_TRUE((bool) proxy);
-
-    while (!proxy->isAvailable()) {
-        mainLoop_->doSingleIteration();
-        usleep(50000);
-    }
-
-    uint32_t uint32Value = 42;
-    std::string stringValue = "Hai :)";
-    bool running = true;
-
-    commonapi::tests::DerivedTypeCollection::TestEnumExtended2 testEnumExtended2InValue =
-            commonapi::tests::DerivedTypeCollection::TestEnumExtended2::E_OK;
-    commonapi::tests::DerivedTypeCollection::TestMap testMapInValue;
-
-    // Estimated amount of data (differring padding at beginning/end of Map/Array etc. not taken into account):
-    // 4 + 4 + 500 * (4 + (4 + 4 + 100 * (11 + 1 + 4)) + 4 ) = 811008
-    for(uint32_t i = 0; i < 500; ++i) {
-        commonapi::tests::DerivedTypeCollection::TestArrayTestStruct testArrayTestStruct;
-        for(uint32_t j = 0; j < 100; ++j) {
-            commonapi::tests::DerivedTypeCollection::TestStruct testStruct("Hai all (:", j);
-            testArrayTestStruct.push_back(testStruct);
-        }
-        testMapInValue.insert( {i, testArrayTestStruct} );
-    }
-
-    std::future<CommonAPI::CallStatus> futureStatus = proxy->testDerivedTypeMethodAsync(
-            testEnumExtended2InValue,
-            testMapInValue,
-            [&] (const CommonAPI::CallStatus& status,
-                    commonapi::tests::DerivedTypeCollection::TestEnumExtended2 testEnumExtended2OutValue,
-                    commonapi::tests::DerivedTypeCollection::TestMap testMapOutValue) {
-                EXPECT_EQ(toString(CommonAPI::CallStatus::SUCCESS), toString(status));
-                EXPECT_EQ(testEnumExtended2InValue, testEnumExtended2OutValue);
-                EXPECT_EQ(testMapInValue.size(), testMapOutValue.size());
-                mainLoop_->stop();
-            }
-    );
-
-    mainLoop_->run();
-
-    ASSERT_EQ(toString(CommonAPI::CallStatus::SUCCESS), toString(futureStatus.get()));
-
-    servicePublisher_->unregisterService(testAddress8);
-}
-
 TEST_F(DBusMainLoopTest, DemoMainloopClientsHandleNonavailableServices) {
     auto proxy = mainloopFactory_->buildProxy<commonapi::tests::TestInterfaceProxy>(testAddress3);
     ASSERT_TRUE((bool) proxy);
diff --git a/src/test/DBusServiceRegistryTest.cpp b/src/test/DBusServiceRegistryTest.cpp
index 1a409f5..af54a7e 100644
--- a/src/test/DBusServiceRegistryTest.cpp
+++ b/src/test/DBusServiceRegistryTest.cpp
@@ -306,7 +306,10 @@ TEST_F(DBusServiceDiscoveryTestWithPredefinedRemote, FindsInstancesOfExistingTes
                     },
                     serviceName_);
 
-    ASSERT_EQ(1, futureResult.get().size());
+
+    std::vector<std::string> result = futureResult.get();
+
+    ASSERT_EQ(1, result.size());
 }