Resolving conflicts

com.unity.ml-agents/Tests/Editor/Sensor.meta

+fileFormatVersion: 2
+guid: 557a9e00396ed4cecb329bffb6912365
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

com.unity.ml-agents/Tests/Editor/Sensor/CameraSensorTest.cs

+using System;
+using NUnit.Framework;
+using UnityEngine;
+using Unity.MLAgents.Sensors;
+
+namespace Unity.MLAgents.Tests
+{
+
+    [TestFixture]
+    public class CameraSensorTest
+    {
+        [Test]
+        public void TestCameraSensor()
+        {
+            foreach (var grayscale in new[] { true, false })
+            {
+                foreach (SensorCompressionType compression in Enum.GetValues(typeof(SensorCompressionType)))
+                {
+                    var width = 24;
+                    var height = 16;
+                    var camera = Camera.main;
+                    var sensor = new CameraSensor(camera, width, height, grayscale, "TestCameraSensor", compression);
+
+                    var obsWriter = new ObservationWriter();
+                    var obs = sensor.GetObservationProto(obsWriter);
+
+                    Assert.AreEqual((int)compression, (int)obs.CompressionType);
+                    var expectedShape = new[] { height, width, grayscale ? 1 : 3 };
+                    Assert.AreEqual(expectedShape, obs.Shape);
+                }
+            }
+        }
+
+        [Test]
+        public void TestObservationType()
+        {
+            var width = 24;
+            var height = 16;
+            var camera = Camera.main;
+            var sensor = new CameraSensor(camera, width, height, true, "TestCameraSensor", SensorCompressionType.None);
+            var spec = sensor.GetObservationSpec();
+            Assert.AreEqual((int)spec.ObservationType, (int)ObservationType.Default);
+            sensor = new CameraSensor(camera, width, height, true, "TestCameraSensor", SensorCompressionType.None, ObservationType.Default);
+            spec = sensor.GetObservationSpec();
+            Assert.AreEqual((int)spec.ObservationType, (int)ObservationType.Default);
+            sensor = new CameraSensor(camera, width, height, true, "TestCameraSensor", SensorCompressionType.None, ObservationType.GoalSignal);
+            spec = sensor.GetObservationSpec();
+            Assert.AreEqual((int)spec.ObservationType, (int)ObservationType.GoalSignal);
+        }
+    }
+}

com.unity.ml-agents/Tests/Editor/Sensor/CameraSensorTest.cs.meta

+fileFormatVersion: 2
+guid: b38f70e2664dc462b8ad7997eacd0168
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: