1 files changed, 56 insertions, 54 deletions
diff --git a/Swiften/LinkLocal/UnitTest/LinkLocalServiceTest.cpp b/Swiften/LinkLocal/UnitTest/LinkLocalServiceTest.cpp
index 2e3e1bb..cb5f40a 100644
--- a/Swiften/LinkLocal/UnitTest/LinkLocalServiceTest.cpp
+++ b/Swiften/LinkLocal/UnitTest/LinkLocalServiceTest.cpp
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #include <cppunit/extensions/HelperMacros.h>
@@ -12,57 +12,59 @@
 using namespace Swift;
 
 class LinkLocalServiceTest : public CppUnit::TestFixture {
-		CPPUNIT_TEST_SUITE(LinkLocalServiceTest);
-		CPPUNIT_TEST(testGetDescription_WithNick);
-		CPPUNIT_TEST(testGetDescription_WithFirstName);
-		CPPUNIT_TEST(testGetDescription_WithLastName);
-		CPPUNIT_TEST(testGetDescription_WithFirstAndLastName);
-		CPPUNIT_TEST(testGetDescription_NoInfo);
-		CPPUNIT_TEST_SUITE_END();
-
-	public:
-		void testGetDescription_WithNick() {
-			LinkLocalService testling = createService("alice@wonderland", "Alice", "Alice In", "Wonderland");
-
-			CPPUNIT_ASSERT_EQUAL(std::string("Alice"), testling.getDescription());
-		}
-
-		void testGetDescription_WithFirstName() {
-			LinkLocalService testling = createService("alice@wonderland", "", "Alice In");
-
-			CPPUNIT_ASSERT_EQUAL(std::string("Alice In"), testling.getDescription());
-		}
-
-		void testGetDescription_WithLastName() {
-			LinkLocalService testling = createService("alice@wonderland", "", "", "Wonderland");
-
-			CPPUNIT_ASSERT_EQUAL(std::string("Wonderland"), testling.getDescription());
-		}
-
-		void testGetDescription_WithFirstAndLastName() {
-			LinkLocalService testling = createService("alice@wonderland", "", "Alice In", "Wonderland");
-
-			CPPUNIT_ASSERT_EQUAL(std::string("Alice In Wonderland"), testling.getDescription());
-		}
-
-		void testGetDescription_NoInfo() {
-			LinkLocalService testling = createService("alice@wonderland");
-
-			CPPUNIT_ASSERT_EQUAL(std::string("alice@wonderland"), testling.getDescription());
-		}
-	
-	private:
-		LinkLocalService createService(const std::string& name, const std::string& nickName = std::string(), const std::string& firstName = std::string(), const std::string& lastName = std::string()) {
-			DNSSDServiceID service(name, "local.");
-			LinkLocalServiceInfo info;
-			info.setFirstName(firstName);
-			info.setLastName(lastName);
-			info.setNick(nickName);
-			return LinkLocalService(service, 
-					DNSSDResolveServiceQuery::Result(
-						name + "._presence._tcp.local", "rabbithole.local", 1234, 
-						info.toTXTRecord()));
-		}
+        CPPUNIT_TEST_SUITE(LinkLocalServiceTest);
+        CPPUNIT_TEST(testGetDescription_WithNick);
+        CPPUNIT_TEST(testGetDescription_WithFirstName);
+        CPPUNIT_TEST(testGetDescription_WithLastName);
+        CPPUNIT_TEST(testGetDescription_WithFirstAndLastName);
+        CPPUNIT_TEST(testGetDescription_NoInfo);
+        CPPUNIT_TEST_SUITE_END();
+
+    public:
+        void testGetDescription_WithNick() {
+            LinkLocalService testling = createService("alice@wonderland", "Alice", "Alice In", "Wonderland");
+
+            CPPUNIT_ASSERT_EQUAL(std::string("Alice"), testling.getDescription());
+        }
+
+        void testGetDescription_WithFirstName() {
+            LinkLocalService testling = createService("alice@wonderland", "", "Alice In");
+
+            CPPUNIT_ASSERT_EQUAL(std::string("Alice In"), testling.getDescription());
+        }
+
+        void testGetDescription_WithLastName() {
+            LinkLocalService testling = createService("alice@wonderland", "", "", "Wonderland");
+
+            CPPUNIT_ASSERT_EQUAL(std::string("Wonderland"), testling.getDescription());
+        }
+
+        void testGetDescription_WithFirstAndLastName() {
+            LinkLocalService testling = createService("alice@wonderland", "", "Alice In", "Wonderland");
+
+            CPPUNIT_ASSERT_EQUAL(std::string("Alice In Wonderland"), testling.getDescription());
+        }
+
+        void testGetDescription_NoInfo() {
+            LinkLocalService testling = createService("alice@wonderland");
+
+            CPPUNIT_ASSERT_EQUAL(std::string("alice@wonderland"), testling.getDescription());
+        }
+
+    private:
+        LinkLocalService createService(const std::string& name, const std::string& nickName = std::string(), const std::string& firstName = std::string(), const std::string& lastName = std::string()) {
+            DNSSDServiceID service(name, "local.");
+            LinkLocalServiceInfo info;
+            info.setFirstName(firstName);
+            info.setLastName(lastName);
+            info.setNick(nickName);
+            auto txtRecord = info.toTXTRecord();
+            CPPUNIT_ASSERT(txtRecord);
+            return LinkLocalService(service,
+                    DNSSDResolveServiceQuery::Result(
+                        name + "._presence._tcp.local", "rabbithole.local", 1234,
+                        *txtRecord));
+        }
 };
 
 CPPUNIT_TEST_SUITE_REGISTRATION(LinkLocalServiceTest);