Fix unit test cases

Author: Hongyan Jiang

Tests/InstanaAgentTests/Beacons/ReporterTests.swift

@@ -816,7 +816,7 @@ class ReporterTests: InstanaTestCase {
         AssertTrue(beacon.viewName == nil)
         AssertTrue(mockSession.propertyHandler.properties.view == nil)
         AssertTrue(mockSession.propertyHandler.properties.user == nil)
-        AssertTrue(mockSession.propertyHandler.properties.metaData.isEmpty)
+        AssertTrue(mockSession.propertyHandler.properties.getMetaData().isEmpty)
         AssertTrue(reporter.preQueue.count == 1)
 
         // When

Tests/InstanaAgentTests/Configuration/InstanaPropertyHandlerTests.swift

@@ -33,8 +33,8 @@ class InstanaPropertyHandlerTests: InstanaTestCase {
         }
 
         // Then
-        AssertTrue(properties.metaData.keys.count == max)
-        AssertTrue(properties.metaData.values.count == max)
+        AssertTrue(properties.getMetaData().keys.count == max)
+        AssertTrue(properties.getMetaData().values.count == max)
     }
 
     func test_validate_keys_one_overflow() {
@@ -50,8 +50,8 @@ class InstanaPropertyHandlerTests: InstanaTestCase {
         }
 
         // Then
-        AssertTrue(properties.metaData.keys.count == keys.count - 1)
-        AssertTrue(properties.metaData.keys.count == max)
+        AssertTrue(properties.getMetaData().keys.count == keys.count - 1)
+        AssertTrue(properties.getMetaData().keys.count == max)
     }
 
     func test_validate_value_valid() {
@@ -94,8 +94,8 @@ class InstanaPropertiesTests: XCTestCase {
         properties.appendMetaData("Key", "Value")
 
         // Then
-        XCTAssertEqual(properties.metaData["Key"], "Value")
-        XCTAssertTrue(properties.metaData.count == 1)
+        XCTAssertEqual(properties.getMetaData()["Key"], "Value")
+        XCTAssertTrue(properties.getMetaData().count == 1)
     }
 
     func test_appendMetaData_exceeds_length() {
@@ -111,9 +111,9 @@ class InstanaPropertiesTests: XCTestCase {
         // Then
         let expectedKey = key.cleanEscapeAndTruncate(at: key.count - 1)
         let expectedValue = value.cleanEscapeAndTruncate(at: value.count - 1)
-        XCTAssertEqual(properties.metaData[expectedKey], expectedValue)
-        XCTAssertEqual(properties.metaData[expectedKey]?.last, "…")
-        XCTAssertTrue(properties.metaData.count == 1)
+        XCTAssertEqual(properties.getMetaData()[expectedKey], expectedValue)
+        XCTAssertEqual(properties.getMetaData()[expectedKey]?.last, "…")
+        XCTAssertTrue(properties.getMetaData().count == 1)
     }
 
     func test_view_valid_length() {

Tests/InstanaAgentTests/InstanaTests.swift

@@ -306,7 +306,7 @@ class InstanaTests: InstanaTestCase {
         Instana.setMeta(value: given["Key2"]!, key: "Key2")
 
         // Then
-        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.metaData, given)
+        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.getMetaData(), given)
     }
 
     func test_setMetaData_value_exceeds_max() {
@@ -320,9 +320,9 @@ class InstanaTests: InstanaTestCase {
         Instana.setMeta(value: exceeds, key: "exceeds")
 
         // Then
-        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.metaData["valid"], valid)
-        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.metaData["exceeds"], exceeds.cleanEscapeAndTruncate(at: max))
-        AssertTrue(Instana.current?.session.propertyHandler.properties.metaData.count == 2)
+        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.getMetaData()["valid"], valid)
+        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.getMetaData()["exceeds"], exceeds.cleanEscapeAndTruncate(at: max))
+        AssertTrue(Instana.current?.session.propertyHandler.properties.getMetaData().count == 2)
     }
 
     func test_setMetaData_key_exceeds_max() {
@@ -336,9 +336,9 @@ class InstanaTests: InstanaTestCase {
         Instana.setMeta(value: "exceeds", key: exceeds)
 
         // Then
-        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.metaData[valid], "valid")
-        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.metaData[exceeds.cleanEscapeAndTruncate(at: max)], "exceeds")
-        AssertTrue(Instana.current?.session.propertyHandler.properties.metaData.count == 2)
+        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.getMetaData()[valid], "valid")
+        AssertEqualAndNotNil(Instana.current?.session.propertyHandler.properties.getMetaData()[exceeds.cleanEscapeAndTruncate(at: max)], "exceeds")
+        AssertTrue(Instana.current?.session.propertyHandler.properties.getMetaData().count == 2)
     }
 
     func test_setMetaData_ignore_too_many_fields() {
@@ -351,14 +351,14 @@ class InstanaTests: InstanaTestCase {
         }
 
         // Then
-        let values = Array(Instana.current!.session.propertyHandler.properties.metaData.values)
-        let keys = Array(Instana.current!.session.propertyHandler.properties.metaData.keys)
+        let values = Array(Instana.current!.session.propertyHandler.properties.getMetaData().values)
+        let keys = Array(Instana.current!.session.propertyHandler.properties.getMetaData().keys)
         AssertTrue(values.contains("V-0") == true)
         AssertTrue(values.contains("V-63") == true)
         AssertTrue(values.contains("V-64") == false)
         AssertTrue(keys.contains("63") == true)
         AssertTrue(keys.contains("64") == false)
-        AssertTrue(Instana.current!.session.propertyHandler.properties.metaData.count == max)
+        AssertTrue(Instana.current!.session.propertyHandler.properties.getMetaData().count == max)
     }
 
     func test_setIgnoreURLs() {