Unit tests upate with JSONUtility deserialization

Author: konraddysput

Runtime/BacktraceDatabase.cs

@@ -292,7 +292,7 @@ private void FlushRecord(BacktraceDatabaseRecord record)
             {
                 return;
             }
-            var backtraceData = record.BacktraceDataJson;
+            var backtraceData = record.BacktraceDataJson();
             Delete(record);
             if (backtraceData == null)
             {
@@ -308,7 +308,7 @@ record = BacktraceDatabaseContext.FirstOrDefault();
 
         private void SendData(BacktraceDatabaseRecord record)
         {
-            var backtraceData = record != null ? record.BacktraceDataJson : null;
+            var backtraceData = record != null ? record.BacktraceDataJson() : null;
             //check if report exists on hard drive 
             // to avoid situation when someone manually remove data
             if (string.IsNullOrEmpty(backtraceData))
@@ -340,7 +340,6 @@ record = BacktraceDatabaseContext.FirstOrDefault();
                          SendData(record);
                      }));
             }
-
         }
 
         /// <summary>

Runtime/Json/BacktraceJObject.cs

@@ -49,17 +49,19 @@ public string ToJson()
 
             foreach (var entry in Source)
             {
+                // add to each property (expect first one) 
+                // ,\n for fomarring reasons. 
+                // without adding this condition at the beginning of the string builder,
+                // we will generate invalid json with `,` character in the end of the json properties.
                 if (stringBuilder.Length != 3)
                 {
                     stringBuilder.Append(",");
                     stringBuilder.AppendLine();
                 }
-                var key = EscapeKey(entry.Key);
-                stringBuilder.AppendFormat("\"{0}\":", key);
-
-                var value = entry.Value;
-                var jsonValue = ConvertValue(value);
-                stringBuilder.Append(jsonValue);
+                // add key
+                stringBuilder.AppendFormat("\"{0}\":", EscapeString(entry.Key));
+                // add value to key
+                stringBuilder.Append(ConvertValue(entry.Value));
             }
 
             stringBuilder.AppendLine();
@@ -73,7 +75,7 @@ public string ToJson()
         /// </summary>
         /// <param name="value">string to escape</param>
         /// <returns>escaped string</returns>
-        private string EscapeKey(string value)
+        private string EscapeString(string value)
         {
             var output = new StringBuilder(value.Length);
             foreach (char c in value)
@@ -132,11 +134,11 @@ private string ConvertValue(object value)
             }
             else if (analysedType == typeof(double))
             {
-                return Convert.ToDouble(value, CultureInfo.CurrentCulture).ToString();
+                return Convert.ToDouble(value, CultureInfo.CurrentCulture).ToString(CultureInfo.InvariantCulture);
             }
             else if (analysedType == typeof(float))
             {
-                return Convert.ToDouble(value, CultureInfo.CurrentCulture).ToString();
+                return Convert.ToDouble(value, CultureInfo.CurrentCulture).ToString(CultureInfo.InvariantCulture);
             }
             else if (analysedType == typeof(int))
             {
@@ -148,9 +150,9 @@ private string ConvertValue(object value)
             }
             else if (analysedType == typeof(string))
             {
-                return string.Format("\"{0}\"", EscapeKey(value as string));
+                return string.Format("\"{0}\"", EscapeString(value as string));
             }
-            else if (value is IEnumerable)
+            else if (value is IEnumerable && !(value is IDictionary))
             {
                 var collection = (value as IEnumerable);
                 var builder = new StringBuilder();

Runtime/Model/BacktraceStackFrame.cs

@@ -98,13 +98,31 @@ public BacktraceStackFrame(StackFrame frame, bool generatedByException)
                 InvalidFrame = true;
                 return;
             }
+
+            var declaringType = method.DeclaringType;
+            string assembly = "unknown";
+            if(declaringType != null)
+            {
+                var assemblyName = declaringType.Assembly.GetName().Name;
+                if (assemblyName!= null)
+                {
+                    assembly = assemblyName;
+                    if(assemblyName == "Backtrace.Unity")
+                    {
+                        InvalidFrame = true;
+                        return;
+                    }
+                } 
+            }
+
+
             SourceCodeFullPath = frame.GetFileName();
 
             FunctionName = GetMethodName(method);
             Line = frame.GetFileLineNumber();
             Il = frame.GetILOffset();
             ILOffset = Il;
-            Assembly = method.DeclaringType.Assembly.GetName().Name ?? "unknown";
+            Assembly = assembly;
             Library = string.IsNullOrEmpty(SourceCodeFullPath) ? method.DeclaringType.ToString() : SourceCodeFullPath;
 
             SourceCode = generatedByException

Runtime/Model/BacktraceStackTrace.cs

@@ -63,16 +63,6 @@ private void SetStacktraceInformation(StackFrame[] frames, bool generatedByExcep
             int startingIndex = 0;
             foreach (var frame in frames)
             {
-                string name;
-                if (frame == null || frame.GetMethod() == null)
-                    name = string.Empty;
-                else
-                    name = frame.GetMethod().DeclaringType.ToString() ?? string.Empty;
-
-                if (name.ToLower().Contains("backtrace.unity"))
-                {
-                    continue;
-                }
                 var backtraceFrame = new BacktraceStackFrame(frame, generatedByException);
                 if (backtraceFrame.InvalidFrame)
                 {

Runtime/Model/Database/BacktraceDatabaseRecord.cs

@@ -73,20 +73,17 @@ public int Count
         /// </summary>
         internal IBacktraceDatabaseRecordWriter RecordWriter;
 
-        public string BacktraceDataJson
+        public string BacktraceDataJson()
         {
-            get
+            if (Record != null)
             {
-                if (Record != null)
-                {
-                    return Record.ToJson();
-                }
-                if (string.IsNullOrEmpty(DiagnosticDataPath))
-                {
-                    return null;
-                }
-                return File.ReadAllText(DiagnosticDataPath);
+                return Record.ToJson();
+            }
+            if (string.IsNullOrEmpty(DiagnosticDataPath))
+            {
+                return null;
             }
+            return File.ReadAllText(DiagnosticDataPath);
         }
 
         /// <summary>
@@ -122,22 +119,19 @@ public string ToJson()
         public static BacktraceDatabaseRecord Deserialize(string json)
         {
             var rawRecord = JsonUtility.FromJson<BacktraceDatabaseRawRecord>(json);
-            return new BacktraceDatabaseRecord()
-            {
-                Id = Guid.Parse(rawRecord.Id),
-                RecordPath = rawRecord.recordName,
-                DiagnosticDataPath = rawRecord.dataPath,
-                MiniDumpPath = rawRecord.minidumpPath,
-                Size = rawRecord.size,
-                Hash = rawRecord.hash
-            };
+            return new BacktraceDatabaseRecord(rawRecord);
         }
         /// <summary>
         /// Constructor for serialization purpose
         /// </summary>
-        internal BacktraceDatabaseRecord()
+        private BacktraceDatabaseRecord(BacktraceDatabaseRawRecord rawRecord)
         {
-            RecordPath = string.Format("{0}-record.json", Id);
+            Id = Guid.Parse(rawRecord.Id);
+            RecordPath = rawRecord.recordName;
+            DiagnosticDataPath = rawRecord.dataPath;
+            MiniDumpPath = rawRecord.minidumpPath;
+            Size = rawRecord.size;
+            Hash = rawRecord.hash;
         }
 
         /// <summary>

Tests/Runtime/BacktraceAttributeTests.cs

@@ -6,7 +6,7 @@
 using System.IO;
 using System.Linq;
 using UnityEngine.TestTools;
-namespace Tests
+namespace Backtrace.Unity.Tests.Runtime
 {
     public class BacktraceAttributeTests
     {

Tests/Runtime/BacktraceClientTests.cs

@@ -6,7 +6,7 @@
 using UnityEngine;
 using UnityEngine.TestTools;
 
-namespace Tests
+namespace Backtrace.Unity.Tests.Runtime
 {
     public class BacktraceClientTests: BacktraceBaseTest
     {

Tests/Runtime/BacktraceCredentialsTests.cs

@@ -2,7 +2,7 @@
 using NUnit.Framework;
 using System;
 
-namespace Tests
+namespace Backtrace.Unity.Tests.Runtime
 {
     internal class BacktraceCredentialsTests
     {

Tests/Runtime/BacktraceDatabaseTests.cs

@@ -5,7 +5,7 @@
 using UnityEngine;
 using UnityEngine.TestTools;
 
-namespace Tests
+namespace Backtrace.Unity.Tests.Runtime
 {
     public class BacktraceDatabaseTests: BacktraceBaseTest
     {