fix up some stuff

Author: surfnerd

com.unity.ml-agents/Tests/Editor/Communicator/GrpcExtensionsTests.cs

@@ -10,7 +10,6 @@
 
 using Unity.MLAgents.Analytics;
 using Unity.MLAgents.CommunicatorObjects;
-using UnityEditor.VersionControl;
 using UnityEngine;
 using UnityEngine.TestTools;
 
@@ -254,25 +253,6 @@ public void TestGetObservationProtoCapabilities()
         }
 
         [Test]
-        public void TestIsTrivialMapping()
-        {
-            Assert.AreEqual(GrpcExtensions.IsTrivialMapping(new DummySensor()), true);
-
-            var sparseChannelSensor = new DummySparseChannelSensor();
-            sparseChannelSensor.Mapping = null;
-            Assert.AreEqual(GrpcExtensions.IsTrivialMapping(sparseChannelSensor), true);
-            sparseChannelSensor.Mapping = new[] { 0, 0, 0 };
-            Assert.AreEqual(GrpcExtensions.IsTrivialMapping(sparseChannelSensor), true);
-            sparseChannelSensor.Mapping = new[] { 0, 1, 2, 3, 4 };
-            Assert.AreEqual(GrpcExtensions.IsTrivialMapping(sparseChannelSensor), true);
-            sparseChannelSensor.Mapping = new[] { 1, 2, 3, 4, -1, -1 };
-            Assert.AreEqual(GrpcExtensions.IsTrivialMapping(sparseChannelSensor), false);
-            sparseChannelSensor.Mapping = new[] { 0, 0, 0, 1, 1, 1 };
-            Assert.AreEqual(GrpcExtensions.IsTrivialMapping(sparseChannelSensor), false);
-        }
-
-        [Test]
->>>>>>> Low hanging fruit tests for coverage.
         public void TestDefaultTrainingEvents()
         {
             var trainingEnvInit = new TrainingEnvironmentInitialized

com.unity.ml-agents/Tests/Editor/MLAgentsEditModeTest.cs

@@ -1,4 +1,4 @@
-ing System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -13,159 +13,6 @@
 
 namespace Unity.MLAgents.Tests
 {
-    internal class TestPolicy : IPolicy
-    {
-        public Action OnRequestDecision;
-        ObservationWriter m_ObsWriter = new ObservationWriter();
-        static ActionSpec s_ActionSpec = ActionSpec.MakeContinuous(1);
-        static ActionBuffers s_EmptyActionBuffers = new ActionBuffers(new float[1], Array.Empty<int>());
-        public void RequestDecision(AgentInfo info, List<ISensor> sensors)
-        {
-            foreach (var sensor in sensors)
-            {
-                sensor.GetObservationProto(m_ObsWriter);
-            }
-            OnRequestDecision?.Invoke();
-        }
-
-        public ref readonly ActionBuffers DecideAction() { return ref s_EmptyActionBuffers; }
-
-        public void Dispose() { }
-    }
-
-    public class TestAgent : Agent
-    {
-        internal AgentInfo _Info
-        {
-            get
-            {
-                return (AgentInfo)typeof(Agent).GetField("m_Info", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(this);
-            }
-            set
-            {
-                typeof(Agent).GetField("m_Info", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(this, value);
-            }
-        }
-
-        internal void SetPolicy(IPolicy policy)
-        {
-            typeof(Agent).GetField("m_Brain", BindingFlags.Instance | BindingFlags.NonPublic).SetValue(this, policy);
-        }
-
-        internal IPolicy GetPolicy()
-        {
-            return (IPolicy)typeof(Agent).GetField("m_Brain", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(this);
-        }
-
-        public int initializeAgentCalls;
-        public int collectObservationsCalls;
-        public int collectObservationsCallsForEpisode;
-        public int agentActionCalls;
-        public int agentActionCallsForEpisode;
-        public int agentOnEpisodeBeginCalls;
-        public int heuristicCalls;
-        public TestSensor sensor1;
-        public TestSensor sensor2;
-
-        [Observable("observableFloat")]
-        public float observableFloat;
-
-        public override void Initialize()
-        {
-            initializeAgentCalls += 1;
-
-            // Add in some custom Sensors so we can confirm they get sorted as expected.
-            sensor1 = new TestSensor("testsensor1");
-            sensor2 = new TestSensor("testsensor2");
-            sensor2.compressionType = SensorCompressionType.PNG;
-
-            sensors.Add(sensor2);
-            sensors.Add(sensor1);
-        }
-
-        public override void CollectObservations(VectorSensor sensor)
-        {
-            collectObservationsCalls += 1;
-            collectObservationsCallsForEpisode += 1;
-            sensor.AddObservation(collectObservationsCallsForEpisode);
-        }
-
-        public override void OnActionReceived(ActionBuffers buffers)
-        {
-            agentActionCalls += 1;
-            agentActionCallsForEpisode += 1;
-            AddReward(0.1f);
-        }
-
-        public override void OnEpisodeBegin()
-        {
-            agentOnEpisodeBeginCalls += 1;
-            collectObservationsCallsForEpisode = 0;
-            agentActionCallsForEpisode = 0;
-        }
-
-        public override void Heuristic(in ActionBuffers actionsOut)
-        {
-            var obs = GetObservations();
-            var continuousActions = actionsOut.ContinuousActions;
-            continuousActions[0] = (int)obs[0];
-            heuristicCalls++;
-        }
-    }
-
-    public class TestSensor : ISensor
-    {
-        public string sensorName;
-        public int numWriteCalls;
-        public int numCompressedCalls;
-        public int numResetCalls;
-        public SensorCompressionType compressionType = SensorCompressionType.None;
-
-        public TestSensor(string n)
-        {
-            sensorName = n;
-        }
-
-        public int[] GetObservationShape()
-        {
-            return new[] { 0 };
-        }
-
-        public ObservationSpec GetObservationSpec()
-        {
-            return ObservationSpec.Vector(0);
-        }
-
-        public int Write(ObservationWriter writer)
-        {
-            numWriteCalls++;
-            // No-op
-            return 0;
-        }
-
-        public byte[] GetCompressedObservation()
-        {
-            numCompressedCalls++;
-            return new byte[] { 0 };
-        }
-
-        public SensorCompressionType GetCompressionType()
-        {
-            return compressionType;
-        }
-
-        public string GetName()
-        {
-            return sensorName;
-        }
-
-        public void Update() { }
-
-        public void Reset()
-        {
-            numResetCalls++;
-        }
-    }
 
     [TestFixture]
     public class EditModeTestGeneration
@@ -175,7 +22,8 @@ public void SetUp()
         {
             if (Academy.IsInitialized)
             {
-                Academy.Instance.Di   se            }
+                Academy.Instance.Dispose();
+            }
         }
 
         [Test]