From 7c1e566113d59699af1624186c64eca67f063fc6 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Mon, 20 Apr 2020 19:09:33 -0400 Subject: Upgraded Unity --- .../Assertions/LogScope/ILogScope.cs | 22 -- .../Assertions/LogScope/ILogScope.cs.meta | 11 - .../Assertions/LogScope/LogEvent.cs | 18 -- .../Assertions/LogScope/LogEvent.cs.meta | 11 - .../Assertions/LogScope/LogMatch.cs | 103 ---------- .../Assertions/LogScope/LogMatch.cs.meta | 11 - .../Assertions/LogScope/LogScope.cs | 223 --------------------- .../Assertions/LogScope/LogScope.cs.meta | 11 - 8 files changed, 410 deletions(-) delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs.meta delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs delete mode 100644 Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs.meta (limited to 'Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope') diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs deleted file mode 100644 index efd00f7..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace UnityEngine.TestTools.Logging -{ - internal interface ILogScope : IDisposable - { - Queue ExpectedLogs { get; set; } - List AllLogs { get; } - List FailingLogs { get; } - bool IgnoreFailingMessages { get; set; } - bool IsNUnitException { get; } - bool IsNUnitSuccessException { get; } - bool IsNUnitInconclusiveException { get; } - bool IsNUnitIgnoreException { get; } - string NUnitExceptionMessage { get; } - void AddLog(string message, string stacktrace, LogType type); - bool AnyFailingLogs(); - void ProcessExpectedLogs(); - void NoUnexpectedReceived(); - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs.meta deleted file mode 100644 index 97b0e2c..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/ILogScope.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3504aa04cda851b44a65973f9aead6f7 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs deleted file mode 100644 index 49f58cb..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs +++ /dev/null @@ -1,18 +0,0 @@ -namespace UnityEngine.TestTools.Logging -{ - internal class LogEvent - { - public string Message { get; set; } - - public string StackTrace { get; set; } - - public LogType LogType { get; set; } - - public bool IsHandled { get; set; } - - public override string ToString() - { - return string.Format("[{0}] {1}", LogType, Message); - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs.meta deleted file mode 100644 index 1609325..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogEvent.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0c56471f08a0f6846afc792f0b4205b9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs deleted file mode 100644 index 05df048..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs +++ /dev/null @@ -1,103 +0,0 @@ -using System; -using System.Text.RegularExpressions; - -namespace UnityEngine.TestTools.Logging -{ - [Serializable] - internal class LogMatch - { - [SerializeField] - private bool m_UseRegex; - [SerializeField] - private string m_Message; - [SerializeField] - private string m_MessageRegex; - [SerializeField] - private string m_LogType; - - public string Message - { - get { return m_Message; } - set - { - m_Message = value; - m_UseRegex = false; - } - } - - public Regex MessageRegex - { - get - { - if (!m_UseRegex) - { - return null; - } - - return new Regex(m_MessageRegex); - } - set - { - if (value != null) - { - m_MessageRegex = value.ToString(); - m_UseRegex = true; - } - else - { - m_MessageRegex = null; - m_UseRegex = false; - } - } - } - - public LogType? LogType - { - get - { - if (!string.IsNullOrEmpty(m_LogType)) - { - return Enum.Parse(typeof(LogType), m_LogType) as LogType ? ; - } - - return null; - } - set - { - if (value != null) - { - m_LogType = value.Value.ToString(); - } - else - { - m_LogType = null; - } - } - } - - public bool Matches(LogEvent log) - { - if (LogType != null && LogType != log.LogType) - { - return false; - } - - if (m_UseRegex) - { - return MessageRegex.IsMatch(log.Message); - } - else - { - return Message.Equals(log.Message); - } - } - - public override string ToString() - { - if (m_UseRegex) - return string.Format("[{0}] Regex: {1}", LogType, MessageRegex); - else - return string.Format("[{0}] {1}", LogType, Message); - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs.meta deleted file mode 100644 index 12f2cf8..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogMatch.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9945ffed4692c6044b6d3acf81efd694 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs deleted file mode 100644 index 6f429c9..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs +++ /dev/null @@ -1,223 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using UnityEngine.TestTools.TestRunner; - -namespace UnityEngine.TestTools.Logging -{ - sealed class LogScope : ILogScope - { - static List s_ActiveScopes = new List(); - - readonly object m_Lock = new object(); - bool m_Disposed; - bool m_NeedToProcessLogs; - - public Queue ExpectedLogs { get; set; } - public List AllLogs { get; } - public List FailingLogs { get; } - public bool IgnoreFailingMessages { get; set; } - public bool IsNUnitException { get; private set; } - public bool IsNUnitSuccessException { get; private set; } - public bool IsNUnitInconclusiveException { get; private set; } - public bool IsNUnitIgnoreException { get; private set; } - public string NUnitExceptionMessage { get; private set; } - - public static LogScope Current - { - get - { - if (s_ActiveScopes.Count == 0) - throw new InvalidOperationException("No log scope is available"); - return s_ActiveScopes[0]; - } - } - - public static bool HasCurrentLogScope() - { - return s_ActiveScopes.Count > 0; - } - - public LogScope() - { - AllLogs = new List(); - FailingLogs = new List(); - ExpectedLogs = new Queue(); - IgnoreFailingMessages = false; - Activate(); - } - - void Activate() - { - s_ActiveScopes.Insert(0, this); - RegisterScope(this); - Application.logMessageReceivedThreaded -= AddLog; - Application.logMessageReceivedThreaded += AddLog; - } - - void Deactivate() - { - Application.logMessageReceivedThreaded -= AddLog; - s_ActiveScopes.Remove(this); - UnregisterScope(this); - } - - static void RegisterScope(LogScope logScope) - { - Application.logMessageReceivedThreaded += logScope.AddLog; - } - - static void UnregisterScope(LogScope logScope) - { - Application.logMessageReceivedThreaded -= logScope.AddLog; - } - - public void AddLog(string message, string stacktrace, LogType type) - { - lock (m_Lock) - { - m_NeedToProcessLogs = true; - var log = new LogEvent - { - LogType = type, - Message = message, - StackTrace = stacktrace, - }; - - AllLogs.Add(log); - - if (IsNUnitResultStateException(stacktrace, type)) - { - if (message.StartsWith("SuccessException")) - { - IsNUnitException = true; - IsNUnitSuccessException = true; - if (message.StartsWith("SuccessException: ")) - { - NUnitExceptionMessage = message.Substring("SuccessException: ".Length); - return; - } - } - else if (message.StartsWith("InconclusiveException")) - { - IsNUnitException = true; - IsNUnitInconclusiveException = true; - if (message.StartsWith("InconclusiveException: ")) - { - NUnitExceptionMessage = message.Substring("InconclusiveException: ".Length); - return; - } - } - else if (message.StartsWith("IgnoreException")) - { - IsNUnitException = true; - IsNUnitIgnoreException = true; - if (message.StartsWith("IgnoreException: ")) - { - NUnitExceptionMessage = message.Substring("IgnoreException: ".Length); - return; - } - } - } - - if (IsFailingLog(type) && !IgnoreFailingMessages) - { - FailingLogs.Add(log); - } - } - } - - static bool IsNUnitResultStateException(string stacktrace, LogType logType) - { - if (logType != LogType.Exception) - return false; - - return string.IsNullOrEmpty(stacktrace) || stacktrace.StartsWith("NUnit.Framework.Assert."); - } - - static bool IsFailingLog(LogType type) - { - switch (type) - { - case LogType.Assert: - case LogType.Error: - case LogType.Exception: - return true; - default: - return false; - } - } - - public void Dispose() - { - Dispose(true); - GC.SuppressFinalize(this); - } - - void Dispose(bool disposing) - { - if (m_Disposed) - { - return; - } - - m_Disposed = true; - - if (disposing) - { - Deactivate(); - } - } - - public bool AnyFailingLogs() - { - ProcessExpectedLogs(); - return FailingLogs.Any(); - } - - public void ProcessExpectedLogs() - { - lock (m_Lock) - { - if (!m_NeedToProcessLogs || !ExpectedLogs.Any()) - return; - - LogMatch expectedLog = null; - foreach (var logEvent in AllLogs) - { - if (!ExpectedLogs.Any()) - break; - if (expectedLog == null && ExpectedLogs.Any()) - expectedLog = ExpectedLogs.Peek(); - - if (expectedLog != null && expectedLog.Matches(logEvent)) - { - ExpectedLogs.Dequeue(); - logEvent.IsHandled = true; - if (FailingLogs.Any(expectedLog.Matches)) - { - var failingLog = FailingLogs.First(expectedLog.Matches); - FailingLogs.Remove(failingLog); - } - expectedLog = null; - } - } - m_NeedToProcessLogs = false; - } - } - - public void NoUnexpectedReceived() - { - lock (m_Lock) - { - ProcessExpectedLogs(); - - var unhandledLog = AllLogs.FirstOrDefault(x => !x.IsHandled); - if (unhandledLog != null) - { - throw new UnhandledLogMessageException(unhandledLog); - } - } - } - } -} diff --git a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs.meta b/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs.meta deleted file mode 100644 index 876c080..0000000 --- a/Library/PackageCache/com.unity.test-framework@1.1.11/UnityEngine.TestRunner/Assertions/LogScope/LogScope.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4bbc17b35884fdf468e4b52ae4222882 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: -- cgit v1.2.3