From 9b3d33c79790f76277abe282df0c93373585db87 Mon Sep 17 00:00:00 2001 From: Junrou Nishida Date: Fri, 21 Jul 2023 15:24:26 +0900 Subject: [PATCH] refactor!: make Status internal (#959) * refactor!: stop returning Status * refactor!: make Status internal --- .../Samples/Common/Scripts/GraphRunner.cs | 51 +++-- .../Face Detection/FaceDetectionGraph.cs | 9 +- .../Samples/Scenes/Face Mesh/FaceMeshGraph.cs | 8 +- .../HairSegmentationGraph.cs | 4 +- .../Scenes/Hand Tracking/HandTrackingGraph.cs | 8 +- .../Scenes/Holistic/HolisticTrackingGraph.cs | 8 +- .../Scenes/Iris Tracking/IrisTrackingGraph.cs | 4 +- .../MediaPipe Video/MediaPipeVideoGraph.cs | 4 +- .../Object Detection/ObjectDetectionGraph.cs | 4 +- .../Scenes/Pose Tracking/PoseTrackingGraph.cs | 8 +- .../SelfieSegmentationGraph.cs | 4 +- .../Scripts/Core/BadStatusException.cs | 4 +- .../Scripts/Framework/CalculatorGraph.cs | 70 +++--- .../Scripts/Framework/Packet/BoolPacket.cs | 4 +- .../Framework/Packet/FloatArrayPacket.cs | 4 +- .../Scripts/Framework/Packet/FloatPacket.cs | 4 +- .../Framework/Packet/FloatVectorPacket.cs | 4 +- .../Framework/Packet/GpuBufferPacket.cs | 4 +- .../Framework/Packet/ImageFramePacket.cs | 4 +- .../Scripts/Framework/Packet/ImagePacket.cs | 4 +- .../Scripts/Framework/Packet/IntPacket.cs | 4 +- .../Scripts/Framework/Packet/MatrixPacket.cs | 4 +- .../Scripts/Framework/Packet/Packet.cs | 6 +- .../Scripts/Framework/Packet/StringPacket.cs | 4 +- .../Runtime/Scripts/Framework/Port/Status.cs | 202 +++++++++--------- .../Scripts/Framework/ValidatedGraphConfig.cs | 12 +- .../Runtime/Scripts/Gpu/GlCalculatorHelper.cs | 14 +- .../Runtime/Scripts/Unity/OutputStream.cs | 12 +- .../EditMode/Framework/CalculatorGraphTest.cs | 42 ++-- .../EditMode/Framework/Format/ImageTest.cs | 7 +- .../Framework/Packet/BoolPacketTest.cs | 17 +- .../Framework/Packet/FloatArrayPacketTest.cs | 17 +- .../Framework/Packet/FloatPacketTest.cs | 15 +- .../Framework/Packet/FloatVectorPacketTest.cs | 23 +- .../Framework/Packet/ImageFramePacketTest.cs | 15 +- .../Framework/Packet/ImagePacketTest.cs | 15 +- .../Framework/Packet/MatrixPacketTest.cs | 6 +- .../EditMode/Framework/Packet/PacketTest.cs | 3 +- .../Framework/Packet/StringPacketTest.cs | 21 +- .../EditMode/Framework/Port/StatusTest.cs | 6 +- .../Framework/ValidatedGraphConfigTest.cs | 134 +++++------- .../EditMode/Gpu/GlCalculatorHelperTest.cs | 56 ++--- .../Tests/EditMode/Gpu/GlContextTest.cs | 2 +- .../EditMode/Tasks/Core/TaskRunnerTest.cs | 12 +- 44 files changed, 410 insertions(+), 453 deletions(-) diff --git a/Assets/MediaPipeUnity/Samples/Common/Scripts/GraphRunner.cs b/Assets/MediaPipeUnity/Samples/Common/Scripts/GraphRunner.cs index 9fcae73c5..4c3f3d544 100644 --- a/Assets/MediaPipeUnity/Samples/Common/Scripts/GraphRunner.cs +++ b/Assets/MediaPipeUnity/Samples/Common/Scripts/GraphRunner.cs @@ -116,7 +116,7 @@ public virtual IEnumerator Initialize(RunningMode runningMode) Logger.LogInfo(TAG, $"Config Type = {configType}"); Logger.LogInfo(TAG, $"Running Mode = {runningMode}"); - InitializeCalculatorGraph().AssertOk(); + InitializeCalculatorGraph(); _stopwatch = new Stopwatch(); _stopwatch.Start(); @@ -139,7 +139,7 @@ public virtual IEnumerator Initialize(RunningMode runningMode) protected void StartRun(PacketMap sidePacket) { - calculatorGraph.StartRun(sidePacket).AssertOk(); + calculatorGraph.StartRun(sidePacket); _isRunning = true; } @@ -149,20 +149,22 @@ public virtual void Stop() { if (_isRunning) { - using (var status = calculatorGraph.CloseAllPacketSources()) + try { - if (!status.Ok()) - { - Logger.LogError(TAG, status.ToString()); - } + calculatorGraph.CloseAllPacketSources(); + } + catch (BadStatusException exception) + { + Logger.LogError(TAG, exception.Message); } - using (var status = calculatorGraph.WaitUntilDone()) + try + { + calculatorGraph.WaitUntilDone(); + } + catch (BadStatusException exception) { - if (!status.Ok()) - { - Logger.LogError(TAG, status.ToString()); - } + Logger.LogError(TAG, exception.Message); } } @@ -180,7 +182,7 @@ public virtual void Stop() protected void AddPacketToInputStream(string streamName, Packet packet) { - calculatorGraph.AddPacketToInputStream(streamName, packet).AssertOk(); + calculatorGraph.AddPacketToInputStream(streamName, packet); } protected void AddTextureFrameToInputStream(string streamName, TextureFrame textureFrame) @@ -217,7 +219,7 @@ protected Timestamp GetCurrentTimestamp() return microsec < 0 ? Timestamp.Unset() : new Timestamp(microsec); } - protected Status InitializeCalculatorGraph() + protected void InitializeCalculatorGraph() { calculatorGraph = new CalculatorGraph(); _NameTable.Add(calculatorGraph.mpPtr, GetInstanceID()); @@ -229,19 +231,16 @@ protected Status InitializeCalculatorGraph() // However, if the config format is invalid, this code does not initialize CalculatorGraph and does not throw exceptions either. // The problem is that if you call ObserveStreamOutput in this state, the program will crash. // The following code is not very efficient, but it will return Non-OK status when an invalid configuration is given. - try + var baseConfig = textConfig == null ? null : CalculatorGraphConfig.Parser.ParseFromTextFormat(textConfig.text); + if (baseConfig == null) { - var baseConfig = textConfig == null ? null : CalculatorGraphConfig.Parser.ParseFromTextFormat(textConfig.text); - if (baseConfig == null) - { - throw new InvalidOperationException("Failed to get the text config. Check if the config is set to GraphRunner"); - } - var status = ConfigureCalculatorGraph(baseConfig); - return !status.Ok() || inferenceMode == InferenceMode.CPU ? status : calculatorGraph.SetGpuResources(GpuManager.GpuResources); + throw new InvalidOperationException("Failed to get the text config. Check if the config is set to GraphRunner"); } - catch (Exception e) + ConfigureCalculatorGraph(baseConfig); + + if (inferenceMode != InferenceMode.CPU) { - return Status.FailedPrecondition(e.ToString()); + calculatorGraph.SetGpuResources(GpuManager.GpuResources); } } @@ -257,9 +256,9 @@ protected Status InitializeCalculatorGraph() /// A instance corresponding to .
/// It can be dynamically modified here. /// - protected virtual Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected virtual void ConfigureCalculatorGraph(CalculatorGraphConfig config) { - return calculatorGraph.Initialize(config); + calculatorGraph.Initialize(config); } protected void SetImageTransformationOptions(PacketMap sidePacket, ImageSource imageSource, bool expectedToBeMirrored = false) diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs index 42e693329..72df179d1 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Detection/FaceDetectionGraph.cs @@ -73,7 +73,7 @@ protected override IList RequestDependentAssets() }; } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -96,11 +96,8 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) using (var validatedGraphConfig = new ValidatedGraphConfig()) { - var status = validatedGraphConfig.Initialize(config); - - if (!status.Ok()) { return status; } - - return calculatorGraph.Initialize(config); + validatedGraphConfig.Initialize(config); + calculatorGraph.Initialize(config); } } diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs index 3b17b3471..f391f281c 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Face Mesh/FaceMeshGraph.cs @@ -110,7 +110,7 @@ public bool TryGetNext(out List faceDetections, out List RequestDependentAssets() }; } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -69,7 +69,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) { _hairMaskStream = new OutputStream(calculatorGraph, _HairMaskStreamName, true, timeoutMicrosec); } - return calculatorGraph.Initialize(config); + calculatorGraph.Initialize(config); } private PacketMap BuildSidePacket(ImageSource imageSource) diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs index 17054fdd1..4da7c882e 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Hand Tracking/HandTrackingGraph.cs @@ -148,7 +148,7 @@ protected override IList RequestDependentAssets() }; } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -177,9 +177,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) using (var validatedGraphConfig = new ValidatedGraphConfig()) { - var status = validatedGraphConfig.Initialize(config); - - if (!status.Ok()) { return status; } + validatedGraphConfig.Initialize(config); var extensionRegistry = new ExtensionRegistry() { TensorsToDetectionsCalculatorOptions.Extensions.Ext, ThresholdingCalculatorOptions.Extensions.Ext }; var cannonicalizedConfig = validatedGraphConfig.Config(extensionRegistry); @@ -205,7 +203,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) Logger.LogInfo(TAG, $"Min Tracking Confidence = {minTrackingConfidence}"); } } - return calculatorGraph.Initialize(cannonicalizedConfig); + calculatorGraph.Initialize(cannonicalizedConfig); } } diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs index 514214430..90e370cbe 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Holistic/HolisticTrackingGraph.cs @@ -194,7 +194,7 @@ private WaitForResult WaitForPoseLandmarkModel() } } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -229,9 +229,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) using (var validatedGraphConfig = new ValidatedGraphConfig()) { - var status = validatedGraphConfig.Initialize(config); - - if (!status.Ok()) { return status; } + validatedGraphConfig.Initialize(config); var extensionRegistry = new ExtensionRegistry() { TensorsToDetectionsCalculatorOptions.Extensions.Ext, ThresholdingCalculatorOptions.Extensions.Ext }; var cannonicalizedConfig = validatedGraphConfig.Config(extensionRegistry); @@ -261,7 +259,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) Logger.LogInfo(TAG, $"Min Tracking Confidence = {minTrackingConfidence}"); } } - return calculatorGraph.Initialize(cannonicalizedConfig); + calculatorGraph.Initialize(cannonicalizedConfig); } } diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs index 1a98bf620..e89910c71 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Iris Tracking/IrisTrackingGraph.cs @@ -85,7 +85,7 @@ protected override IList RequestDependentAssets() }; } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -102,7 +102,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) _faceRectStream = new OutputStream(calculatorGraph, _FaceRectStreamName, true, timeoutMicrosec); _faceLandmarksWithIrisStream = new OutputStream(calculatorGraph, _FaceLandmarksWithIrisStreamName, true, timeoutMicrosec); } - return calculatorGraph.Initialize(config); + calculatorGraph.Initialize(config); } private PacketMap BuildSidePacket(ImageSource imageSource) diff --git a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs index 6fab4b4db..c52b212be 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/MediaPipe Video/MediaPipeVideoGraph.cs @@ -76,7 +76,7 @@ public bool TryGetNext(out ImageFrame outputVideo, bool allowBlock = true) return TryGetNext(_outputVideoStream, out outputVideo, allowBlock, GetCurrentTimestampMicrosec()); } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (configType == ConfigType.OpenGLES) { @@ -96,7 +96,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) _outputVideoStream = new OutputStream(calculatorGraph, _OutputVideoStreamName, true, timeoutMicrosec); } - return calculatorGraph.Initialize(config); + calculatorGraph.Initialize(config); } protected override IList RequestDependentAssets() diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs index 0f8baff85..3e750d5c0 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Object Detection/ObjectDetectionGraph.cs @@ -56,7 +56,7 @@ protected override IList RequestDependentAssets() }; } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -67,7 +67,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) { _outputDetectionsStream = new OutputStream>(calculatorGraph, _OutputDetectionsStreamName, true, timeoutMicrosec); } - return calculatorGraph.Initialize(config); + calculatorGraph.Initialize(config); } private PacketMap BuildSidePacket(ImageSource imageSource) diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs index faedd13e1..3e47ede30 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Pose Tracking/PoseTrackingGraph.cs @@ -137,7 +137,7 @@ protected override IList RequestDependentAssets() }; } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -163,9 +163,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) using (var validatedGraphConfig = new ValidatedGraphConfig()) { - var status = validatedGraphConfig.Initialize(config); - - if (!status.Ok()) { return status; } + validatedGraphConfig.Initialize(config); var extensionRegistry = new ExtensionRegistry() { TensorsToDetectionsCalculatorOptions.Extensions.Ext, ThresholdingCalculatorOptions.Extensions.Ext }; var cannonicalizedConfig = validatedGraphConfig.Config(extensionRegistry); @@ -191,7 +189,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) Logger.LogInfo(TAG, $"Min Tracking Confidence = {minTrackingConfidence}"); } } - return calculatorGraph.Initialize(cannonicalizedConfig); + calculatorGraph.Initialize(cannonicalizedConfig); } } diff --git a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs index f467c0fa3..1d3297ecc 100644 --- a/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs +++ b/Assets/MediaPipeUnity/Samples/Scenes/Selfie Segmentation/SelfieSegmentationGraph.cs @@ -55,7 +55,7 @@ protected override IList RequestDependentAssets() }; } - protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) + protected override void ConfigureCalculatorGraph(CalculatorGraphConfig config) { if (runningMode == RunningMode.NonBlockingSync) { @@ -65,7 +65,7 @@ protected override Status ConfigureCalculatorGraph(CalculatorGraphConfig config) { _segmentationMaskStream = new OutputStream(calculatorGraph, _SegmentationMaskStreamName, true, timeoutMicrosec); } - return calculatorGraph.Initialize(config); + calculatorGraph.Initialize(config); } private PacketMap BuildSidePacket(ImageSource imageSource) diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Core/BadStatusException.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Core/BadStatusException.cs index 90069768e..fa86f5489 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Core/BadStatusException.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Core/BadStatusException.cs @@ -9,11 +9,11 @@ namespace Mediapipe { public class BadStatusException : Exception { - public Status.StatusCode statusCode { get; private set; } + public StatusCode statusCode { get; private set; } public BadStatusException(string message) : base(message) { } - public BadStatusException(Status.StatusCode statusCode, string message) : base(message) + public BadStatusException(StatusCode statusCode, string message) : base(message) { this.statusCode = statusCode; } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/CalculatorGraph.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/CalculatorGraph.cs index 025ed2883..67091ed5f 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/CalculatorGraph.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/CalculatorGraph.cs @@ -13,7 +13,7 @@ namespace Mediapipe { public class CalculatorGraph : MpResourceHandle { - public delegate Status.StatusArgs NativePacketCallback(IntPtr graphPtr, int streamId, IntPtr packetPtr); + public delegate StatusArgs NativePacketCallback(IntPtr graphPtr, int streamId, IntPtr packetPtr); public delegate void PacketCallback(TPacket packet) where TPacket : Packet; public CalculatorGraph() : base() @@ -37,22 +37,22 @@ protected override void DeleteMpPtr() UnsafeNativeMethods.mp_CalculatorGraph__delete(ptr); } - public Status Initialize(CalculatorGraphConfig config) + public void Initialize(CalculatorGraphConfig config) { var bytes = config.ToByteArray(); UnsafeNativeMethods.mp_CalculatorGraph__Initialize__PKc_i(mpPtr, bytes, bytes.Length, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status Initialize(CalculatorGraphConfig config, PacketMap sidePacket) + public void Initialize(CalculatorGraphConfig config, PacketMap sidePacket) { var bytes = config.ToByteArray(); UnsafeNativeMethods.mp_CalculatorGraph__Initialize__PKc_i_Rsp(mpPtr, bytes, bytes.Length, sidePacket.mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } /// Crashes if config is not set @@ -67,15 +67,15 @@ public CalculatorGraphConfig Config() return config; } - public Status ObserveOutputStream(string streamName, int streamId, NativePacketCallback nativePacketCallback, bool observeTimestampBounds = false) + public void ObserveOutputStream(string streamName, int streamId, NativePacketCallback nativePacketCallback, bool observeTimestampBounds = false) { UnsafeNativeMethods.mp_CalculatorGraph__ObserveOutputStream__PKc_PF_b(mpPtr, streamName, streamId, nativePacketCallback, observeTimestampBounds, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status ObserveOutputStream(string streamName, PacketCallback packetCallback, bool observeTimestampBounds, out GCHandle callbackHandle) where TPacket : Packet, new() + public void ObserveOutputStream(string streamName, PacketCallback packetCallback, bool observeTimestampBounds, out GCHandle callbackHandle) where TPacket : Packet, new() { NativePacketCallback nativePacketCallback = (IntPtr graphPtr, int streamId, IntPtr packetPtr) => { @@ -83,21 +83,21 @@ public Status ObserveOutputStream(string streamName, int streamId, NativePacketC { var packet = Packet.Create(packetPtr, false); packetCallback(packet); - return Status.StatusArgs.Ok(); + return StatusArgs.Ok(); } catch (Exception e) { - return Status.StatusArgs.Internal(e.ToString()); + return StatusArgs.Internal(e.ToString()); } }; callbackHandle = GCHandle.Alloc(nativePacketCallback, GCHandleType.Pinned); - return ObserveOutputStream(streamName, 0, nativePacketCallback, observeTimestampBounds); + ObserveOutputStream(streamName, 0, nativePacketCallback, observeTimestampBounds); } - public Status ObserveOutputStream(string streamName, PacketCallback packetCallback, out GCHandle callbackHandle) where TPacket : Packet, new() + public void ObserveOutputStream(string streamName, PacketCallback packetCallback, out GCHandle callbackHandle) where TPacket : Packet, new() { - return ObserveOutputStream(streamName, packetCallback, false, out callbackHandle); + ObserveOutputStream(streamName, packetCallback, false, out callbackHandle); } public OutputStreamPoller AddOutputStreamPoller(string streamName, bool observeTimestampBounds = false) @@ -109,48 +109,48 @@ public OutputStreamPoller AddOutputStreamPoller(string streamName, bool ob return new OutputStreamPoller(pollerPtr); } - public Status Run() + public void Run() { - return Run(new PacketMap()); + Run(new PacketMap()); } - public Status Run(PacketMap sidePacket) + public void Run(PacketMap sidePacket) { UnsafeNativeMethods.mp_CalculatorGraph__Run__Rsp(mpPtr, sidePacket.mpPtr, out var statusPtr).Assert(); GC.KeepAlive(sidePacket); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status StartRun() + public void StartRun() { - return StartRun(new PacketMap()); + StartRun(new PacketMap()); } - public Status StartRun(PacketMap sidePacket) + public void StartRun(PacketMap sidePacket) { UnsafeNativeMethods.mp_CalculatorGraph__StartRun__Rsp(mpPtr, sidePacket.mpPtr, out var statusPtr).Assert(); GC.KeepAlive(sidePacket); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status WaitUntilIdle() + public void WaitUntilIdle() { UnsafeNativeMethods.mp_CalculatorGraph__WaitUntilIdle(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status WaitUntilDone() + public void WaitUntilDone() { UnsafeNativeMethods.mp_CalculatorGraph__WaitUntilDone(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } public bool HasError() @@ -158,37 +158,37 @@ public bool HasError() return SafeNativeMethods.mp_CalculatorGraph__HasError(mpPtr); } - public Status AddPacketToInputStream(string streamName, Packet packet) + public void AddPacketToInputStream(string streamName, Packet packet) { UnsafeNativeMethods.mp_CalculatorGraph__AddPacketToInputStream__PKc_Ppacket(mpPtr, streamName, packet.mpPtr, out var statusPtr).Assert(); packet.Dispose(); // respect move semantics GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status SetInputStreamMaxQueueSize(string streamName, int maxQueueSize) + public void SetInputStreamMaxQueueSize(string streamName, int maxQueueSize) { UnsafeNativeMethods.mp_CalculatorGraph__SetInputStreamMaxQueueSize__PKc_i(mpPtr, streamName, maxQueueSize, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status CloseInputStream(string streamName) + public void CloseInputStream(string streamName) { UnsafeNativeMethods.mp_CalculatorGraph__CloseInputStream__PKc(mpPtr, streamName, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status CloseAllPacketSources() + public void CloseAllPacketSources() { UnsafeNativeMethods.mp_CalculatorGraph__CloseAllPacketSources(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } public void Cancel() @@ -220,13 +220,13 @@ public GpuResources GetGpuResources() return new GpuResources(gpuResourcesPtr); } - public Status SetGpuResources(GpuResources gpuResources) + public void SetGpuResources(GpuResources gpuResources) { UnsafeNativeMethods.mp_CalculatorGraph__SetGpuResources__SPgpu(mpPtr, gpuResources.sharedPtr, out var statusPtr).Assert(); GC.KeepAlive(gpuResources); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/BoolPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/BoolPacket.cs index 4305d9a8a..63aea8822 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/BoolPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/BoolPacket.cs @@ -49,12 +49,12 @@ public override bool Consume() throw new NotSupportedException(); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsBool(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatArrayPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatArrayPacket.cs index fc922daef..ed2fb99aa 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatArrayPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatArrayPacket.cs @@ -86,12 +86,12 @@ public override float[] Consume() throw new NotSupportedException(); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsFloatArray(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatPacket.cs index 73f147fce..20a85760a 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatPacket.cs @@ -49,12 +49,12 @@ public override float Consume() throw new NotSupportedException(); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsFloat(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatVectorPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatVectorPacket.cs index fe045871d..ab617218c 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatVectorPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/FloatVectorPacket.cs @@ -97,12 +97,12 @@ public override List Consume() throw new NotSupportedException(); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsFloatVector(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs index 35807f9b1..d4eb6e01e 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/GpuBufferPacket.cs @@ -57,12 +57,12 @@ public override GpuBuffer Consume() return new GpuBuffer(gpuBufferPtr, true); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsGpuBuffer(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImageFramePacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImageFramePacket.cs index 3c7331aee..5ecd1f443 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImageFramePacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImageFramePacket.cs @@ -57,12 +57,12 @@ public override ImageFrame Consume() return new ImageFrame(imageFramePtr, true); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsImageFrame(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImagePacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImagePacket.cs index fbae1f4bd..90e5c298b 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImagePacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/ImagePacket.cs @@ -57,12 +57,12 @@ public override Image Consume() return new Image(imagePtr, true); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsImage(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/IntPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/IntPacket.cs index 445b9f7ee..811fe5767 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/IntPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/IntPacket.cs @@ -49,12 +49,12 @@ public override int Consume() throw new NotSupportedException(); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsInt(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/MatrixPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/MatrixPacket.cs index a2965dc22..1e068c7bc 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/MatrixPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/MatrixPacket.cs @@ -55,12 +55,12 @@ public override MatrixData Consume() throw new NotSupportedException(); } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsMatrix(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/Packet.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/Packet.cs index 2b8d4177e..aeec2fb26 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/Packet.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/Packet.cs @@ -60,16 +60,16 @@ public bool IsEmpty() return SafeNativeMethods.mp_Packet__IsEmpty(mpPtr); } - public Status ValidateAsProtoMessageLite() + public void ValidateAsProtoMessageLite() { UnsafeNativeMethods.mp_Packet__ValidateAsProtoMessageLite(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } // TODO: declare as abstract - public virtual Status ValidateAsType() + public virtual void ValidateAsType() { throw new NotImplementedException(); } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/StringPacket.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/StringPacket.cs index 6709c185b..f2c3a4a55 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/StringPacket.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Packet/StringPacket.cs @@ -90,12 +90,12 @@ public byte[] ConsumeByteArray() return bytes; } - public override Status ValidateAsType() + public override void ValidateAsType() { UnsafeNativeMethods.mp_Packet__ValidateAsString(mpPtr, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } } } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Port/Status.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Port/Status.cs index a2e8d520d..7dccc8d1b 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Port/Status.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/Port/Status.cs @@ -9,127 +9,127 @@ namespace Mediapipe { - public class Status : MpResourceHandle + public enum StatusCode : int { - public enum StatusCode : int - { - Ok = 0, - Cancelled = 1, - Unknown = 2, - InvalidArgument = 3, - DeadlineExceeded = 4, - NotFound = 5, - AlreadyExists = 6, - PermissionDenied = 7, - ResourceExhausted = 8, - FailedPrecondition = 9, - Aborted = 10, - OutOfRange = 11, - Unimplemented = 12, - Internal = 13, - Unavailable = 14, - DataLoss = 15, - Unauthenticated = 16, - } - - [StructLayout(LayoutKind.Sequential)] - public readonly struct StatusArgs - { - private readonly StatusCode _code; - private readonly IntPtr _message; - - private StatusArgs(StatusCode code, string message = null) - { - _code = code; - _message = Marshal.StringToHGlobalAnsi(message); - } + Ok = 0, + Cancelled = 1, + Unknown = 2, + InvalidArgument = 3, + DeadlineExceeded = 4, + NotFound = 5, + AlreadyExists = 6, + PermissionDenied = 7, + ResourceExhausted = 8, + FailedPrecondition = 9, + Aborted = 10, + OutOfRange = 11, + Unimplemented = 12, + Internal = 13, + Unavailable = 14, + DataLoss = 15, + Unauthenticated = 16, + } - public static StatusArgs Ok() - { - return new StatusArgs(StatusCode.Ok); - } + [StructLayout(LayoutKind.Sequential)] + public readonly struct StatusArgs + { + private readonly StatusCode _code; + private readonly IntPtr _message; - public static StatusArgs Cancelled(string message = null) - { - return new StatusArgs(StatusCode.Cancelled, message); - } + private StatusArgs(StatusCode code, string message = null) + { + _code = code; + _message = Marshal.StringToHGlobalAnsi(message); + } - public static StatusArgs Unknown(string message = null) - { - return new StatusArgs(StatusCode.Unknown, message); - } + public static StatusArgs Ok() + { + return new StatusArgs(StatusCode.Ok); + } - public static StatusArgs InvalidArgument(string message = null) - { - return new StatusArgs(StatusCode.InvalidArgument, message); - } + public static StatusArgs Cancelled(string message = null) + { + return new StatusArgs(StatusCode.Cancelled, message); + } - public static StatusArgs DeadlineExceeded(string message = null) - { - return new StatusArgs(StatusCode.DeadlineExceeded, message); - } + public static StatusArgs Unknown(string message = null) + { + return new StatusArgs(StatusCode.Unknown, message); + } - public static StatusArgs NotFound(string message = null) - { - return new StatusArgs(StatusCode.NotFound, message); - } + public static StatusArgs InvalidArgument(string message = null) + { + return new StatusArgs(StatusCode.InvalidArgument, message); + } - public static StatusArgs AlreadyExists(string message = null) - { - return new StatusArgs(StatusCode.AlreadyExists, message); - } + public static StatusArgs DeadlineExceeded(string message = null) + { + return new StatusArgs(StatusCode.DeadlineExceeded, message); + } - public static StatusArgs PermissionDenied(string message = null) - { - return new StatusArgs(StatusCode.PermissionDenied, message); - } + public static StatusArgs NotFound(string message = null) + { + return new StatusArgs(StatusCode.NotFound, message); + } - public static StatusArgs ResourceExhausted(string message = null) - { - return new StatusArgs(StatusCode.ResourceExhausted, message); - } + public static StatusArgs AlreadyExists(string message = null) + { + return new StatusArgs(StatusCode.AlreadyExists, message); + } - public static StatusArgs FailedPrecondition(string message = null) - { - return new StatusArgs(StatusCode.FailedPrecondition, message); - } + public static StatusArgs PermissionDenied(string message = null) + { + return new StatusArgs(StatusCode.PermissionDenied, message); + } - public static StatusArgs Aborted(string message = null) - { - return new StatusArgs(StatusCode.Aborted, message); - } + public static StatusArgs ResourceExhausted(string message = null) + { + return new StatusArgs(StatusCode.ResourceExhausted, message); + } - public static StatusArgs OutOfRange(string message = null) - { - return new StatusArgs(StatusCode.OutOfRange, message); - } + public static StatusArgs FailedPrecondition(string message = null) + { + return new StatusArgs(StatusCode.FailedPrecondition, message); + } - public static StatusArgs Unimplemented(string message = null) - { - return new StatusArgs(StatusCode.Unimplemented, message); - } + public static StatusArgs Aborted(string message = null) + { + return new StatusArgs(StatusCode.Aborted, message); + } - public static StatusArgs Internal(string message = null) - { - return new StatusArgs(StatusCode.Internal, message); - } + public static StatusArgs OutOfRange(string message = null) + { + return new StatusArgs(StatusCode.OutOfRange, message); + } - public static StatusArgs Unavailable(string message = null) - { - return new StatusArgs(StatusCode.Unavailable, message); - } + public static StatusArgs Unimplemented(string message = null) + { + return new StatusArgs(StatusCode.Unimplemented, message); + } - public static StatusArgs DataLoss(string message = null) - { - return new StatusArgs(StatusCode.DataLoss, message); - } + public static StatusArgs Internal(string message = null) + { + return new StatusArgs(StatusCode.Internal, message); + } - public static StatusArgs Unauthenticated(string message = null) - { - return new StatusArgs(StatusCode.Unauthenticated, message); - } + public static StatusArgs Unavailable(string message = null) + { + return new StatusArgs(StatusCode.Unavailable, message); } + public static StatusArgs DataLoss(string message = null) + { + return new StatusArgs(StatusCode.DataLoss, message); + } + + public static StatusArgs Unauthenticated(string message = null) + { + return new StatusArgs(StatusCode.Unauthenticated, message); + } + } + + internal class Status : MpResourceHandle + { public Status(IntPtr ptr, bool isOwner = true) : base(ptr, isOwner) { } protected override void DeleteMpPtr() diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/ValidatedGraphConfig.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/ValidatedGraphConfig.cs index 778898962..955538631 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/ValidatedGraphConfig.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Framework/ValidatedGraphConfig.cs @@ -104,21 +104,21 @@ protected override void DeleteMpPtr() UnsafeNativeMethods.mp_ValidatedGraphConfig__delete(ptr); } - public Status Initialize(CalculatorGraphConfig config) + public void Initialize(CalculatorGraphConfig config) { var bytes = config.ToByteArray(); UnsafeNativeMethods.mp_ValidatedGraphConfig__Initialize__Rcgc(mpPtr, bytes, bytes.Length, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status Initialize(string graphType) + public void Initialize(string graphType) { UnsafeNativeMethods.mp_ValidatedGraphConfig__Initialize__PKc(mpPtr, graphType, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } public bool Initialized() @@ -126,13 +126,13 @@ public bool Initialized() return SafeNativeMethods.mp_ValidatedGraphConfig__Initialized(mpPtr); } - public Status ValidateRequiredSidePackets(PacketMap sidePacket) + public void ValidateRequiredSidePackets(PacketMap sidePacket) { UnsafeNativeMethods.mp_ValidatedGraphConfig__ValidateRequiredSidePackets__Rsp(mpPtr, sidePacket.mpPtr, out var statusPtr).Assert(); GC.KeepAlive(sidePacket); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } public CalculatorGraphConfig Config(ExtensionRegistry extensionRegistry = null) diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs index c9ecacc11..c0247a7f6 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Gpu/GlCalculatorHelper.cs @@ -11,7 +11,7 @@ namespace Mediapipe public class GlCalculatorHelper : MpResourceHandle { - public delegate Status.StatusArgs NativeGlStatusFunction(); + public delegate StatusArgs NativeGlStatusFunction(); public delegate void GlFunction(); public GlCalculatorHelper() : base() @@ -37,26 +37,26 @@ public void InitializeForTest(GpuResources gpuResources) /// Function that is run in Gl Context. /// Make sure that this function doesn't throw exceptions and won't be GCed. /// - public Status RunInGlContext(NativeGlStatusFunction nativeGlStatusFunction) + public void RunInGlContext(NativeGlStatusFunction nativeGlStatusFunction) { UnsafeNativeMethods.mp_GlCalculatorHelper__RunInGlContext__PF(mpPtr, nativeGlStatusFunction, out var statusPtr).Assert(); GC.KeepAlive(this); - return new Status(statusPtr); + AssertStatusOk(statusPtr); } - public Status RunInGlContext(GlFunction glFunction) + public void RunInGlContext(GlFunction glFunction) { - return RunInGlContext(() => + RunInGlContext(() => { try { glFunction(); - return Status.StatusArgs.Ok(); + return StatusArgs.Ok(); } catch (Exception e) { - return Status.StatusArgs.Internal(e.ToString()); + return StatusArgs.Internal(e.ToString()); } }); } diff --git a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/OutputStream.cs b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/OutputStream.cs index e5a112774..812e9117c 100644 --- a/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/OutputStream.cs +++ b/Packages/com.github.homuler.mediapipe/Runtime/Scripts/Unity/OutputStream.cs @@ -128,7 +128,7 @@ public void AddListener(EventHandler> callback) { if (OnReceived == null) { - calculatorGraph.ObserveOutputStream(streamName, _id, InvokeIfOutputStreamFound, observeTimestampBounds).AssertOk(); + calculatorGraph.ObserveOutputStream(streamName, _id, InvokeIfOutputStreamFound, observeTimestampBounds); } OnReceived += callback; } @@ -380,18 +380,18 @@ protected bool TryConsumePacketValue(Packet packet, out TValue value, lo } [AOT.MonoPInvokeCallback(typeof(CalculatorGraph.NativePacketCallback))] - protected static Status.StatusArgs InvokeIfOutputStreamFound(IntPtr graphPtr, int streamId, IntPtr packetPtr) + protected static StatusArgs InvokeIfOutputStreamFound(IntPtr graphPtr, int streamId, IntPtr packetPtr) { try { var isFound = _InstanceTable.TryGetValue(streamId, out var outputStream); if (!isFound) { - return Status.StatusArgs.NotFound($"OutputStream with id {streamId} is not found, maybe already GCed"); + return StatusArgs.NotFound($"OutputStream with id {streamId} is not found, maybe already GCed"); } if (outputStream.calculatorGraph.mpPtr != graphPtr) { - return Status.StatusArgs.InvalidArgument($"OutputStream is found, but is not linked to the specified CalclatorGraph"); + return StatusArgs.InvalidArgument($"OutputStream is found, but is not linked to the specified CalclatorGraph"); } outputStream.referencePacket.SwitchNativePtr(packetPtr); @@ -401,11 +401,11 @@ protected static Status.StatusArgs InvokeIfOutputStreamFound(IntPtr graphPtr, in } outputStream.referencePacket.ReleaseMpResource(); - return Status.StatusArgs.Ok(); + return StatusArgs.Ok(); } catch (Exception e) { - return Status.StatusArgs.Internal(e.ToString()); + return StatusArgs.Internal(e.ToString()); } } } diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/CalculatorGraphTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/CalculatorGraphTest.cs index 8561be10a..476ca0262 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/CalculatorGraphTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/CalculatorGraphTest.cs @@ -69,16 +69,13 @@ public void IsDisposed_ShouldReturnTrue_When_AlreadyDisposed() #region #Initialize [Test] - public void Initialize_ShouldReturnOk_When_CalledWithConfig_And_ConfigIsNotSet() + public void Initialize_ShouldNotThrow_When_CalledWithConfig_And_ConfigIsNotSet() { using (var graph = new CalculatorGraph()) { - using (var status = graph.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ValidConfigText))) - { - Assert.True(status.Ok()); - } - + graph.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ValidConfigText)); var config = graph.Config(); + Assert.AreEqual("in", config.InputStream[0]); Assert.AreEqual("out", config.OutputStream[0]); } @@ -89,15 +86,16 @@ public void Initialize_ShouldReturnInternalError_When_CalledWithConfig_And_Confi { using (var graph = new CalculatorGraph(_ValidConfigText)) { - using (var status = graph.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ValidConfigText))) + var exception = Assert.Throws(() => { - Assert.AreEqual(Status.StatusCode.Internal, status.Code()); - } + graph.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ValidConfigText)); + }); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); } } [Test] - public void Initialize_ShouldReturnOk_When_CalledWithConfigAndSidePacket_And_ConfigIsNotSet() + public void Initialize_ShouldNotThrow_When_CalledWithConfigAndSidePacket_And_ConfigIsNotSet() { using (var sidePacket = new PacketMap()) { @@ -107,10 +105,7 @@ public void Initialize_ShouldReturnOk_When_CalledWithConfigAndSidePacket_And_Con { var config = CalculatorGraphConfig.Parser.ParseFromTextFormat(_ValidConfigText); - using (var status = graph.Initialize(config, sidePacket)) - { - Assert.True(status.Ok()); - } + Assert.DoesNotThrow(() => graph.Initialize(config, sidePacket)); } } } @@ -126,10 +121,8 @@ public void Initialize_ShouldReturnInternalError_When_CalledWithConfigAndSidePac { var config = CalculatorGraphConfig.Parser.ParseFromTextFormat(_ValidConfigText); - using (var status = graph.Initialize(config, sidePacket)) - { - Assert.AreEqual(Status.StatusCode.Internal, status.Code()); - } + var exception = Assert.Throws(() => graph.Initialize(config, sidePacket)); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); } } } @@ -141,13 +134,13 @@ public void LifecycleMethods_ShouldControlGraphLifeCycle() { using (var graph = new CalculatorGraph(_ValidConfigText)) { - Assert.True(graph.StartRun().Ok()); + graph.StartRun(); Assert.False(graph.GraphInputStreamsClosed()); - Assert.True(graph.WaitUntilIdle().Ok()); - Assert.True(graph.CloseAllPacketSources().Ok()); + graph.WaitUntilIdle(); + graph.CloseAllPacketSources(); Assert.True(graph.GraphInputStreamsClosed()); - Assert.True(graph.WaitUntilDone().Ok()); + graph.WaitUntilDone(); Assert.False(graph.HasError()); } } @@ -157,9 +150,10 @@ public void Cancel_ShouldCancelGraph() { using (var graph = new CalculatorGraph(_ValidConfigText)) { - Assert.True(graph.StartRun().Ok()); + graph.StartRun(); graph.Cancel(); - Assert.AreEqual(Status.StatusCode.Cancelled, graph.WaitUntilDone().Code()); + var exception = Assert.Throws(() => graph.WaitUntilDone()); + Assert.AreEqual(StatusCode.Cancelled, exception.statusCode); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Format/ImageTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Format/ImageTest.cs index ccd1b43e7..9a032c625 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Format/ImageTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Format/ImageTest.cs @@ -97,10 +97,11 @@ public void ConvertToGpu_ShouldReturnTrue_If_GpuIsSuppored() public void ConvertToGpu_ShouldReturnTrue_When_ImageIsOnGpu() { var texture = new Texture2D(4, 2, TextureFormat.RGBA32, false); + var name = (uint)texture.GetNativeTexturePtr(); RunInGlContext(() => { var glContext = GlContext.GetCurrent(); - using (var image = new Image((uint)texture.GetNativeTexturePtr(), 4, 2, GpuBufferFormat.kBGRA32, OnRelease, glContext)) + using (var image = new Image(name, 4, 2, GpuBufferFormat.kBGRA32, OnRelease, glContext)) { Assert.True(image.UsesGpu()); Assert.True(image.ConvertToGpu()); @@ -204,12 +205,10 @@ private static void RunInGlContext(Action action) using (var glCalculatorHelper = new GlCalculatorHelper()) { glCalculatorHelper.InitializeForTest(GpuResources.Create()); - - var status = glCalculatorHelper.RunInGlContext(() => + glCalculatorHelper.RunInGlContext(() => { action(); }); - status.Dispose(); } } diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/BoolPacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/BoolPacketTest.cs index 54e34bd66..963ed540d 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/BoolPacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/BoolPacketTest.cs @@ -17,11 +17,10 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithNoArguments() { using (var packet = new BoolPacket()) { -#pragma warning disable IDE0058 - Assert.AreEqual(Status.StatusCode.Internal, packet.ValidateAsType().Code()); - Assert.Throws(() => { packet.Get(); }); + var exception = Assert.Throws(packet.ValidateAsType); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); + _ = Assert.Throws(() => { _ = packet.Get(); }); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); -#pragma warning restore IDE0058 } } @@ -31,7 +30,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithTrue() { using (var packet = new BoolPacket(true)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.True(packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -42,7 +41,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithFalse() { using (var packet = new BoolPacket(false)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.False(packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -55,7 +54,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValueAndTimestamp() { using (var packet = new BoolPacket(true, timestamp)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.True(packet.Get()); Assert.AreEqual(timestamp, packet.Timestamp()); } @@ -120,11 +119,11 @@ public void Consume_ShouldThrowNotSupportedException() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { using (var packet = new BoolPacket(true)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatArrayPacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatArrayPacketTest.cs index 0ece68f43..8a2da31de 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatArrayPacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatArrayPacketTest.cs @@ -17,12 +17,11 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithNoArguments() { using (var packet = new FloatArrayPacket()) { -#pragma warning disable IDE0058 packet.length = 0; - Assert.AreEqual(Status.StatusCode.Internal, packet.ValidateAsType().Code()); - Assert.Throws(() => { packet.Get(); }); + var exception = Assert.Throws(packet.ValidateAsType); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); + _ = Assert.Throws(() => { _ = packet.Get(); }); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); -#pragma warning restore IDE0058 } } @@ -32,7 +31,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithEmptyArray() float[] array = { }; using (var packet = new FloatArrayPacket(array)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(array, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -44,7 +43,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithArray() float[] array = { 0.01f }; using (var packet = new FloatArrayPacket(array)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(array, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -58,7 +57,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValueAndTimestamp() { using (var packet = new FloatArrayPacket(array, timestamp)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(array, packet.Get()); Assert.AreEqual(timestamp, packet.Timestamp()); } @@ -124,12 +123,12 @@ public void Consume_ShouldThrowNotSupportedException() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { float[] array = { 0.01f }; using (var packet = new FloatArrayPacket(array)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatPacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatPacketTest.cs index 45d330036..64a21b1ab 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatPacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatPacketTest.cs @@ -17,11 +17,10 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithNoArguments() { using (var packet = new FloatPacket()) { -#pragma warning disable IDE0058 - Assert.AreEqual(Status.StatusCode.Internal, packet.ValidateAsType().Code()); - Assert.Throws(() => { packet.Get(); }); + var exception = Assert.Throws(packet.ValidateAsType); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); + _ = Assert.Throws(() => { _ = packet.Get(); }); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); -#pragma warning restore IDE0058 } } @@ -30,7 +29,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValue() { using (var packet = new FloatPacket(0.01f)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(0.01f, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -43,7 +42,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValueAndTimestamp() { using (var packet = new FloatPacket(0.01f, timestamp)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(0.01f, packet.Get()); Assert.AreEqual(timestamp, packet.Timestamp()); } @@ -108,11 +107,11 @@ public void Consume_ShouldThrowNotSupportedException() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { using (var packet = new FloatPacket(0.01f)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatVectorPacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatVectorPacketTest.cs index 06d0da224..1dad3c1a6 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatVectorPacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/FloatVectorPacketTest.cs @@ -18,11 +18,10 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithNoArguments() { using (var packet = new FloatVectorPacket()) { -#pragma warning disable IDE0058 - Assert.AreEqual(Status.StatusCode.Internal, packet.ValidateAsType().Code()); - Assert.Throws(() => { packet.Get(); }); + var exception = Assert.Throws(packet.ValidateAsType); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); + _ = Assert.Throws(() => { _ = packet.Get(); }); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); -#pragma warning restore IDE0058 } } @@ -32,7 +31,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithEmptyArray() float[] data = { }; using (var packet = new FloatVectorPacket(data)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(data, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -44,7 +43,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithArray() float[] data = { 0.01f }; using (var packet = new FloatVectorPacket(data)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(data, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -58,7 +57,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValueAndTimestamp() { using (var packet = new FloatVectorPacket(data, timestamp)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(data, packet.Get()); Assert.AreEqual(timestamp, packet.Timestamp()); } @@ -71,7 +70,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithEmptyList() var data = new List(); using (var packet = new FloatVectorPacket(data)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(data, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -83,7 +82,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithList() var data = new List() { 0.01f }; using (var packet = new FloatVectorPacket(data)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(data, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -97,7 +96,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithListAndTimestamp() { using (var packet = new FloatVectorPacket(data, timestamp)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(data, packet.Get()); Assert.AreEqual(timestamp, packet.Timestamp()); } @@ -163,12 +162,12 @@ public void Consume_ShouldThrowNotSupportedException() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { float[] array = { 0.01f }; using (var packet = new FloatVectorPacket(array)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImageFramePacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImageFramePacketTest.cs index b67d65103..f981fef66 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImageFramePacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImageFramePacketTest.cs @@ -16,9 +16,10 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithNoArguments() { using (var packet = new ImageFramePacket()) { - Assert.AreEqual(Status.StatusCode.Internal, packet.ValidateAsType().Code()); - var exception = Assert.Throws(() => { _ = packet.Consume(); }); - Assert.AreEqual(Status.StatusCode.Internal, exception.statusCode); + var exception = Assert.Throws(packet.ValidateAsType); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); + exception = Assert.Throws(() => { _ = packet.Consume(); }); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } } @@ -31,7 +32,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValue() using (var packet = new ImageFramePacket(srcImageFrame)) { Assert.True(srcImageFrame.isDisposed); - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); var imageFrame = packet.Consume(); @@ -49,7 +50,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValueAndTimestamp() using (var packet = new ImageFramePacket(srcImageFrame, timestamp)) { Assert.True(srcImageFrame.isDisposed); - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); var imageFrame = packet.Consume(); Assert.AreEqual(ImageFormat.Types.Format.Unknown, imageFrame.Format()); @@ -144,11 +145,11 @@ public void Consume_ShouldReturnImageFrame() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { using (var packet = new ImageFramePacket(new ImageFrame())) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImagePacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImagePacketTest.cs index 77a2322b7..16d5ba0ea 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImagePacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/ImagePacketTest.cs @@ -17,9 +17,10 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithNoArguments() { using (var packet = new ImagePacket()) { - Assert.AreEqual(Status.StatusCode.Internal, packet.ValidateAsType().Code()); - var exception = Assert.Throws(() => { _ = packet.Consume(); }); - Assert.AreEqual(Status.StatusCode.Internal, exception.statusCode); + var exception = Assert.Throws(packet.ValidateAsType); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); + exception = Assert.Throws(() => { _ = packet.Consume(); }); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } } @@ -32,7 +33,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValue() using (var packet = new ImagePacket(srcImage)) { Assert.True(srcImage.isDisposed); - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); var image = packet.Consume(); @@ -50,7 +51,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValueAndTimestamp() using (var packet = new ImagePacket(srcImage, timestamp)) { Assert.True(srcImage.isDisposed); - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); var image = packet.Consume(); Assert.AreEqual(ImageFormat.Types.Format.Srgba, image.ImageFormat()); @@ -145,11 +146,11 @@ public void Consume_ShouldReturnImage() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { using (var packet = new ImagePacket(BuildSRGBAImage())) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/MatrixPacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/MatrixPacketTest.cs index 4d361e811..a612120da 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/MatrixPacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/MatrixPacketTest.cs @@ -19,7 +19,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithValue() var matrix = CreateMatrixInputData(); using (var packet = new MatrixPacket(matrix)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual(matrix, packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -84,11 +84,11 @@ public void Consume_ShouldThrowNotSupportedException() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { using (var packet = new MatrixPacket(CreateMatrixInputData())) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/PacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/PacketTest.cs index 8f9d4ac20..eca6da054 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/PacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/PacketTest.cs @@ -49,7 +49,8 @@ public void ValidateAsProtoMessageLite_ShouldReturnInvalidArgument_When_ValueIsB { using (var packet = new BoolPacket(true)) { - Assert.AreEqual(Status.StatusCode.InvalidArgument, packet.ValidateAsProtoMessageLite().Code()); + var exception = Assert.Throws(packet.ValidateAsProtoMessageLite); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/StringPacketTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/StringPacketTest.cs index 687f3abd6..6c3ca8d23 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/StringPacketTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Packet/StringPacketTest.cs @@ -16,11 +16,10 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithNoArguments() { using (var packet = new StringPacket()) { -#pragma warning disable IDE0058 - Assert.AreEqual(Status.StatusCode.Internal, packet.ValidateAsType().Code()); - Assert.Throws(() => { packet.Get(); }); + var exception = Assert.Throws(packet.ValidateAsType); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); + _ = Assert.Throws(() => { _ = packet.Get(); }); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); -#pragma warning restore IDE0058 } } @@ -29,7 +28,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithString() { using (var packet = new StringPacket("test")) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual("test", packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -41,7 +40,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithByteArray() var bytes = new byte[] { (byte)'t', (byte)'e', (byte)'s', (byte)'t' }; using (var packet = new StringPacket(bytes)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual("test", packet.Get()); Assert.AreEqual(Timestamp.Unset(), packet.Timestamp()); } @@ -54,7 +53,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithStringAndTimestamp() { using (var packet = new StringPacket("test", timestamp)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual("test", packet.Get()); Assert.AreEqual(timestamp, packet.Timestamp()); } @@ -69,7 +68,7 @@ public void Ctor_ShouldInstantiatePacket_When_CalledWithByteArrayAndTimestamp() { using (var packet = new StringPacket(bytes, timestamp)) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); Assert.AreEqual("test", packet.Get()); Assert.AreEqual(timestamp, packet.Timestamp()); } @@ -140,7 +139,7 @@ public void Consume_ShouldThrowBadStatusException_When_PacketIsEmpty() using (var packet = new StringPacket()) { var exception = Assert.Throws(() => { _ = packet.Consume(); }); - Assert.AreEqual(Status.StatusCode.Internal, exception.statusCode); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); } } @@ -158,11 +157,11 @@ public void Consume_ShouldReturnString_When_PacketIsNotEmpty() #region #ValidateAsType [Test] - public void ValidateAsType_ShouldReturnOk_When_ValueIsSet() + public void ValidateAsType_ShouldNotThrow_When_ValueIsSet() { using (var packet = new StringPacket("test")) { - Assert.True(packet.ValidateAsType().Ok()); + Assert.DoesNotThrow(packet.ValidateAsType); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Port/StatusTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Port/StatusTest.cs index 3fe3f1c7e..568d8aaa1 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Port/StatusTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/Port/StatusTest.cs @@ -16,7 +16,7 @@ public void Code_ShouldReturnStatusCode_When_StatusIsOk() { using (var status = Status.Ok()) { - Assert.AreEqual(Status.StatusCode.Ok, status.Code()); + Assert.AreEqual(StatusCode.Ok, status.Code()); } } @@ -25,7 +25,7 @@ public void Code_ShouldReturnStatusCode_When_StatusIsFailedPrecondition() { using (var status = Status.FailedPrecondition()) { - Assert.AreEqual(Status.StatusCode.FailedPrecondition, status.Code()); + Assert.AreEqual(StatusCode.FailedPrecondition, status.Code()); } } #endregion @@ -106,7 +106,7 @@ public void AssertOk_ShouldThrow_When_StatusIsNotOk() using (var status = Status.FailedPrecondition()) { var exception = Assert.Throws(() => { status.AssertOk(); }); - Assert.AreEqual(Status.StatusCode.FailedPrecondition, exception.statusCode); + Assert.AreEqual(StatusCode.FailedPrecondition, exception.statusCode); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/ValidatedGraphConfigTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/ValidatedGraphConfigTest.cs index 2966c8402..b8531501e 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/ValidatedGraphConfigTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Framework/ValidatedGraphConfigTest.cs @@ -121,27 +121,21 @@ public void IsDisposed_ShouldReturnTrue_When_AlreadyDisposed() #region #Initialize [Test] - public void Initialize_ShouldReturnOk_When_CalledWithConfig() + public void Initialize_ShouldInitialize_When_CalledWithConfig() { using (var config = new ValidatedGraphConfig()) { - using (var status = config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText))) - { - Assert.True(status.Ok()); - } + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.True(config.Initialized()); } } [Test] - public void Initialize_ShouldReturnOk_When_CalledWithValidGraphType() + public void Initialize_ShouldInitialize_When_CalledWithValidGraphType() { using (var config = new ValidatedGraphConfig()) { - using (var status = config.Initialize("SwitchContainer")) - { - Assert.True(status.Ok()); - } + config.Initialize("SwitchContainer"); Assert.True(config.Initialized()); } } @@ -151,10 +145,8 @@ public void Initialize_ShouldReturnInternalError_When_CalledWithInvalidGraphType { using (var config = new ValidatedGraphConfig()) { - using (var status = config.Initialize("InvalidSubgraph")) - { - Assert.AreEqual(Status.StatusCode.NotFound, status.Code()); - } + var exception = Assert.Throws(() => config.Initialize("InvalidSubgraph")); + Assert.AreEqual(StatusCode.NotFound, exception.statusCode); Assert.False(config.Initialized()); } } @@ -162,84 +154,71 @@ public void Initialize_ShouldReturnInternalError_When_CalledWithInvalidGraphType #region #ValidateRequiredSidePackets [Test] - public void ValidateRequiredSidePackets_ShouldReturnOk_When_TheConfigDoesNotRequireSidePackets_And_SidePacketIsEmpty() + public void ValidateRequiredSidePackets_ShouldNotThrow_When_TheConfigDoesNotRequireSidePackets_And_SidePacketIsEmpty() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); using (var sidePacket = new PacketMap()) { - using (var status = config.ValidateRequiredSidePackets(sidePacket)) - { - Assert.True(status.Ok()); - } + Assert.DoesNotThrow(() => config.ValidateRequiredSidePackets(sidePacket)); } } } [Test] - public void ValidateRequiredSidePackets_ShouldReturnOk_When_TheConfigDoesNotRequireSidePackets_And_SidePacketIsNotEmpty() + public void ValidateRequiredSidePackets_ShouldNotThrow_When_TheConfigDoesNotRequireSidePackets_And_SidePacketIsNotEmpty() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); using (var sidePacket = new PacketMap()) { sidePacket.Emplace("in", new IntPacket(0)); - using (var status = config.ValidateRequiredSidePackets(sidePacket)) - { - Assert.True(status.Ok()); - } + Assert.DoesNotThrow(() => config.ValidateRequiredSidePackets(sidePacket)); } } } [Test] - public void ValidateRequiredSidePackets_ShouldReturnOk_When_AllTheSidePacketsAreOptional_And_SidePacketIsEmpty() + public void ValidateRequiredSidePackets_ShouldNotThrow_When_AllTheSidePacketsAreOptional_And_SidePacketIsEmpty() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)); using (var sidePacket = new PacketMap()) { - using (var status = config.ValidateRequiredSidePackets(sidePacket)) - { - Assert.True(status.Ok()); - } + Assert.DoesNotThrow(() => config.ValidateRequiredSidePackets(sidePacket)); } } } [Test] - public void ValidateRequiredSidePackets_ShouldReturnInvalidArgumentError_When_TheConfigRequiresSidePackets_And_SidePacketIsEmpty() + public void ValidateRequiredSidePackets_ShouldThrowInvalidArgumentError_When_TheConfigRequiresSidePackets_And_SidePacketIsEmpty() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)); using (var sidePacket = new PacketMap()) { - using (var status = config.ValidateRequiredSidePackets(sidePacket)) - { - Assert.AreEqual(Status.StatusCode.InvalidArgument, status.Code()); - } + var exception = Assert.Throws(() => config.ValidateRequiredSidePackets(sidePacket)); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } } [Test] - public void ValidateRequiredSidePackets_ShouldReturnInvalidArgumentError_When_AllTheRequiredSidePacketsAreNotGiven() + public void ValidateRequiredSidePackets_ShouldThrowInvalidArgumentError_When_AllTheRequiredSidePacketsAreNotGiven() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)); using (var sidePacket = new PacketMap()) { sidePacket.Emplace("input_horizontally_flipped", new BoolPacket(false)); sidePacket.Emplace("input_vertically_flipped", new BoolPacket(true)); - using (var status = config.ValidateRequiredSidePackets(sidePacket)) - { - Assert.AreEqual(Status.StatusCode.InvalidArgument, status.Code()); - } + var exception = Assert.Throws(() => config.ValidateRequiredSidePackets(sidePacket)); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } } @@ -249,35 +228,30 @@ public void ValidateRequiredSidePackets_ShouldReturnInvalidArgumentError_When_Th { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)); using (var sidePacket = new PacketMap()) { sidePacket.Emplace("input_horizontally_flipped", new BoolPacket(false)); sidePacket.Emplace("input_vertically_flipped", new BoolPacket(true)); sidePacket.Emplace("input_rotation", new StringPacket("0")); - using (var status = config.ValidateRequiredSidePackets(sidePacket)) - { - Assert.AreEqual(Status.StatusCode.InvalidArgument, status.Code()); - } + var exception = Assert.Throws(() => config.ValidateRequiredSidePackets(sidePacket)); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } } [Test] - public void ValidateRequiredSidePackets_ShouldReturnOk_When_AllTheRequiredSidePacketsAreGiven() + public void ValidateRequiredSidePackets_ShouldNotThrow_When_AllTheRequiredSidePacketsAreGiven() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ImageTransformationConfigText)); using (var sidePacket = new PacketMap()) { sidePacket.Emplace("input_horizontally_flipped", new BoolPacket(false)); sidePacket.Emplace("input_vertically_flipped", new BoolPacket(true)); sidePacket.Emplace("input_rotation", new IntPacket(0)); - using (var status = config.ValidateRequiredSidePackets(sidePacket)) - { - Assert.True(status.Ok()); - } + Assert.DoesNotThrow(() => config.ValidateRequiredSidePackets(sidePacket)); } } } @@ -300,7 +274,7 @@ public void Config_ShouldReturnTheCanonicalizedConfig_When_TheConfigIsPassThroug using (var config = new ValidatedGraphConfig()) { var originalConfig = CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText); - config.Initialize(originalConfig).AssertOk(); + config.Initialize(originalConfig); var canonicalizedConfig = config.Config(); Assert.AreEqual(originalConfig.Node, canonicalizedConfig.Node); @@ -321,7 +295,7 @@ public void Config_ShouldReturnTheCanonicalizedConfig_When_TheConfigIsFaceDetect using (var config = new ValidatedGraphConfig()) { var originalConfig = CalculatorGraphConfig.Parser.ParseFromTextFormat(_FaceDetectionShortRangeConfigText); - config.Initialize(originalConfig).AssertOk(); + config.Initialize(originalConfig); var canonicalizedConfig = config.Config(); Assert.AreEqual(84, originalConfig.CalculateSize()); @@ -346,7 +320,7 @@ public void InputStreamInfos_ShouldReturnEmptyList_When_NoInputStreamExists() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)); Assert.IsEmpty(config.InputStreamInfos()); } } @@ -356,7 +330,7 @@ public void InputStreamInfos_ShouldReturnEdgeInfoList_When_InputStreamsExist() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); var inputStreamInfos = config.InputStreamInfos(); Assert.AreEqual(inputStreamInfos.Count, 2); @@ -391,7 +365,7 @@ public void OutputStreamInfos_ShouldReturnEdgeInfoList_When_OutputStreamsExist() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); var outputStreamInfos = config.OutputStreamInfos(); Assert.AreEqual(3, outputStreamInfos.Count); @@ -432,7 +406,7 @@ public void InputSidePacketInfos_ShouldReturnEmptyList_When_NoInputSidePacketExi { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.IsEmpty(config.InputSidePacketInfos()); } } @@ -442,7 +416,7 @@ public void InputSidePacketInfos_ShouldReturnEdgeInfoList_When_InputSidePacketsE { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)); var inputSidePacketInfos = config.InputSidePacketInfos(); Assert.True(inputSidePacketInfos.Count >= 2); @@ -475,7 +449,7 @@ public void OutputSidePacketInfos_ShouldReturnEmptyList_When_NoOutputSidePacketE { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.IsEmpty(config.OutputSidePacketInfos()); } } @@ -485,7 +459,7 @@ public void OutputSidePacketInfos_ShouldReturnEdgeInfoList_When_OutputSidePacket { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)); var outputSidePacketInfos = config.OutputSidePacketInfos(); Assert.AreEqual(4, outputSidePacketInfos.Count); @@ -528,7 +502,7 @@ public void OutputStreamIndex_ShouldReturnNegativeValue_When_TheNameIsInvalid() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.AreEqual(-1, config.OutputStreamIndex("unknown")); } } @@ -538,7 +512,7 @@ public void OutputStreamIndex_ShouldReturnIndex_When_TheNameIsValid() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.AreEqual(2, config.OutputStreamIndex("out")); } } @@ -548,7 +522,7 @@ public void OutputStreamIndex_ShouldReturnIndex_When_TheStreamIsNotPublic() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.AreEqual(1, config.OutputStreamIndex("out1")); } } @@ -569,7 +543,7 @@ public void OutputSidePacketIndex_ShouldReturnNegativeValue_When_TheNameIsInvali { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)); Assert.AreEqual(-1, config.OutputSidePacketIndex("unknown")); } } @@ -579,7 +553,7 @@ public void OutputSidePacketIndex_ShouldReturnIndex_When_TheNameIsValid() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)); Assert.AreEqual(0, config.OutputSidePacketIndex("int_packet")); } } @@ -601,7 +575,7 @@ public void OutputStreamToNode_ShouldReturnNegativeValue_When_TheNameIsInvalid() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.AreEqual(-1, config.OutputStreamToNode("unknown")); } } @@ -611,7 +585,7 @@ public void OutputStreamToNode_ShouldReturnIndex_When_TheNameIsValid() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.AreEqual(0, config.OutputStreamToNode("out1")); } } @@ -624,7 +598,7 @@ public void RegisteredSidePacketTypeName_ShouldReturnInvalidArgumentError_When_T using (var config = new ValidatedGraphConfig()) { var exception = Assert.Throws(() => { _ = config.RegisteredSidePacketTypeName("max_in_flight"); }); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } @@ -633,9 +607,9 @@ public void RegisteredSidePacketTypeName_ShouldReturnUnknownError_When_TheSidePa { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)); var exception = Assert.Throws(() => { _ = config.RegisteredSidePacketTypeName("max_in_flight"); }); - Assert.AreEqual(Status.StatusCode.Unknown, exception.statusCode); + Assert.AreEqual(StatusCode.Unknown, exception.statusCode); } } #endregion @@ -647,7 +621,7 @@ public void RegisteredStreamTypeName_ShouldReturnInvalidArgumentError_When_TheSt using (var config = new ValidatedGraphConfig()) { var exception = Assert.Throws(() => { _ = config.RegisteredStreamTypeName("in"); }); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } @@ -656,9 +630,9 @@ public void RegisteredStreamTypeName_ShouldReturnUnknownError_When_TheStreamType { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); var exception = Assert.Throws(() => { _ = config.RegisteredStreamTypeName("in"); }); - Assert.AreEqual(Status.StatusCode.Unknown, exception.statusCode); + Assert.AreEqual(StatusCode.Unknown, exception.statusCode); } } #endregion @@ -678,7 +652,7 @@ public void Package_ShouldReturnNull_When_TheNamespaceIsNotSet() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_PassThroughConfigText)); Assert.IsNull(config.Package()); } } @@ -716,7 +690,7 @@ public void IsExternalSidePacket_ShouldReturnFalse_When_TheSidePacketIsInternal( { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_ConstantSidePacketConfigText)); Assert.False(config.IsExternalSidePacket("int_packet")); } } @@ -726,7 +700,7 @@ public void IsExternalSidePacket_ShouldReturnTrue_When_TheSidePacketIsExternal() { using (var config = new ValidatedGraphConfig()) { - config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)).AssertOk(); + config.Initialize(CalculatorGraphConfig.Parser.ParseFromTextFormat(_FlowLimiterConfigText)); Assert.True(config.IsExternalSidePacket("max_in_flight")); } } diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlCalculatorHelperTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlCalculatorHelperTest.cs index 61ad69170..17b1b79bf 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlCalculatorHelperTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlCalculatorHelperTest.cs @@ -57,14 +57,13 @@ public void InitializeForTest_ShouldInitialize() #region #RunInGlContext [Test, GpuOnly] - public void RunInGlContext_ShouldReturnOk_When_FunctionReturnsOk() + public void RunInGlContext_ShouldNotThrow_When_FunctionReturnsOk() { using (var glCalculatorHelper = new GlCalculatorHelper()) { glCalculatorHelper.InitializeForTest(GpuResources.Create()); - var status = glCalculatorHelper.RunInGlContext(() => { }); - Assert.True(status.Ok()); + Assert.DoesNotThrow(() => glCalculatorHelper.RunInGlContext(() => { })); } } @@ -75,8 +74,11 @@ public void RunInGlContext_ShouldReturnInternal_When_FunctionThrows() { glCalculatorHelper.InitializeForTest(GpuResources.Create()); - var status = glCalculatorHelper.RunInGlContext((GlCalculatorHelper.GlFunction)(() => { throw new Exception("Function Throws"); })); - Assert.AreEqual(Status.StatusCode.Internal, status.Code()); + var exception = Assert.Throws(() => + { + glCalculatorHelper.RunInGlContext((GlCalculatorHelper.GlFunction)(() => { throw new Exception("Function Throws"); })); + }); + Assert.AreEqual(StatusCode.Internal, exception.statusCode); } } #endregion @@ -91,18 +93,18 @@ public void CreateSourceTexture_ShouldReturnGlTexture_When_CalledWithImageFrame( using (var imageFrame = new ImageFrame(ImageFormat.Types.Format.Srgba, 32, 24)) { - var status = glCalculatorHelper.RunInGlContext(() => + Assert.DoesNotThrow(() => { - var texture = glCalculatorHelper.CreateSourceTexture(imageFrame); + glCalculatorHelper.RunInGlContext(() => + { + var texture = glCalculatorHelper.CreateSourceTexture(imageFrame); - Assert.AreEqual(32, texture.width); - Assert.AreEqual(24, texture.height); + Assert.AreEqual(32, texture.width); + Assert.AreEqual(24, texture.height); - texture.Dispose(); + texture.Dispose(); + }); }); - Assert.True(status.Ok()); - - status.Dispose(); } } } @@ -117,16 +119,17 @@ public void CreateSourceTexture_ShouldFail_When_ImageFrameFormatIsInvalid() using (var imageFrame = new ImageFrame(ImageFormat.Types.Format.Sbgra, 32, 24)) { - var status = glCalculatorHelper.RunInGlContext(() => + var exception = Assert.Throws(() => { - using (var texture = glCalculatorHelper.CreateSourceTexture(imageFrame)) + glCalculatorHelper.RunInGlContext(() => { - texture.Release(); - } + using (var texture = glCalculatorHelper.CreateSourceTexture(imageFrame)) + { + texture.Release(); + } + }); }); - Assert.AreEqual(Status.StatusCode.FailedPrecondition, status.Code()); - - status.Dispose(); + Assert.AreEqual(StatusCode.FailedPrecondition, exception.statusCode); } } } @@ -140,15 +143,16 @@ public void CreateDestinationTexture_ShouldReturnGlTexture_When_GpuBufferFormatI { glCalculatorHelper.InitializeForTest(GpuResources.Create()); - var status = glCalculatorHelper.RunInGlContext(() => + Assert.DoesNotThrow(() => { - var glTexture = glCalculatorHelper.CreateDestinationTexture(32, 24, GpuBufferFormat.kBGRA32); + glCalculatorHelper.RunInGlContext(() => + { + var glTexture = glCalculatorHelper.CreateDestinationTexture(32, 24, GpuBufferFormat.kBGRA32); - Assert.AreEqual(32, glTexture.width); - Assert.AreEqual(24, glTexture.height); + Assert.AreEqual(32, glTexture.width); + Assert.AreEqual(24, glTexture.height); + }); }); - - Assert.True(status.Ok()); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlContextTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlContextTest.cs index f10a83dfb..d609f418b 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlContextTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Gpu/GlContextTest.cs @@ -34,7 +34,7 @@ public void GetCurrent_ShouldReturnCurrentContext_When_CalledInGlContext() Assert.NotNull(glContext); Assert.True(glContext.IsCurrent()); } - }).AssertOk(); + }); } } #endregion diff --git a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Tasks/Core/TaskRunnerTest.cs b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Tasks/Core/TaskRunnerTest.cs index 8b5f18ec1..c82841598 100644 --- a/Packages/com.github.homuler.mediapipe/Tests/EditMode/Tasks/Core/TaskRunnerTest.cs +++ b/Packages/com.github.homuler.mediapipe/Tests/EditMode/Tasks/Core/TaskRunnerTest.cs @@ -33,7 +33,7 @@ public class TaskRunnerTest public void Create_ShouldThrowException_When_CalledWithInvalidConfig() { var exception = Assert.Throws(() => TaskRunner.Create(new CalculatorGraphConfig())); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } [Test] @@ -76,7 +76,7 @@ public void Process_ShouldThrowException_When_InputIsInvalid() using (var packetMap = new PacketMap()) { var exception = Assert.Throws(() => taskRunner.Process(packetMap)); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } } @@ -106,7 +106,7 @@ public void Send_ShouldThrowException_When_CallbackIsNotSet() { packetMap.Emplace("in", new IntPacket(1, new Timestamp(1))); var exception = Assert.Throws(() => taskRunner.Send(packetMap)); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } } @@ -119,7 +119,7 @@ public void Send_ShouldThrowException_When_InputIsInvalid() using (var packetMap = new PacketMap()) { var exception = Assert.Throws(() => taskRunner.Send(packetMap)); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } } @@ -155,7 +155,7 @@ public void Close_ShouldThrowException_When_AlreadyClosed() { taskRunner.Close(); var exception = Assert.Throws(() => taskRunner.Close()); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } #endregion @@ -177,7 +177,7 @@ public void Restart_ShouldThrowException_When_Closed() { taskRunner.Close(); var exception = Assert.Throws(() => taskRunner.Restart()); - Assert.AreEqual(Status.StatusCode.InvalidArgument, exception.statusCode); + Assert.AreEqual(StatusCode.InvalidArgument, exception.statusCode); } } #endregion