fixed more faiing tests

Author: dhritinaidu

services/motion/motion_test.go

@@ -642,7 +642,7 @@ func TestPlan(t *testing.T) {
 				input: &pb.Plan{
 					Id:            planID.String(),
 					ExecutionId:   executionID.String(),
-					ComponentName: "",
+					ComponentName: "component_name",
 					Steps:         []*pb.PlanStep{nil},
 				},
 				result: PlanWithMetadata{},
@@ -653,12 +653,12 @@ func TestPlan(t *testing.T) {
 				input: &pb.Plan{
 					Id:            planID.String(),
 					ExecutionId:   executionID.String(),
-					ComponentName: "",
+					ComponentName: "component_name",
 				},
 				result: PlanWithMetadata{
 					ID:            planID,
 					ExecutionID:   executionID,
-					ComponentName: "",
+					ComponentName: "component_name",
 				},
 			},
 			{
@@ -1398,9 +1398,12 @@ func TestPlanHistoryReq(t *testing.T) {
 			{
 				description: "empty struct returns an empty struct",
 				input: &pb.GetPlanRequest{
-					ComponentName: "",
+					ComponentName: "component_name",
+				},
+				result: PlanHistoryReq{
+					ComponentName: "component_name",
+					Extra: map[string]interface{}{},
 				},
-				result: PlanHistoryReq{Extra: map[string]interface{}{}},
 			},
 			{
 				description: "full struct returns a full struct",

services/motion/server_test.go

@@ -259,10 +259,10 @@ func TestServerMoveOnGlobe(t *testing.T) {
 			test.That(t, *req.MotionCfg.ObstaclePollingFreqHz, test.ShouldAlmostEqual, obstaclePollingFrequencyHz)
 			test.That(t, *req.MotionCfg.PositionPollingFreqHz, test.ShouldAlmostEqual, positionPollingFrequencyHz)
 			test.That(t, len(req.MotionCfg.ObstacleDetectors), test.ShouldAlmostEqual, 2)
-			test.That(t, req.MotionCfg.ObstacleDetectors[0].VisionServiceName, test.ShouldResemble, vision.Named("vision service 1"))
-			test.That(t, req.MotionCfg.ObstacleDetectors[0].CameraName, test.ShouldResemble, camera.Named("camera 1"))
-			test.That(t, req.MotionCfg.ObstacleDetectors[1].VisionServiceName, test.ShouldResemble, vision.Named("vision service 2"))
-			test.That(t, req.MotionCfg.ObstacleDetectors[1].CameraName, test.ShouldResemble, camera.Named("camera 2"))
+			test.That(t, req.MotionCfg.ObstacleDetectors[0].VisionServiceName, test.ShouldResemble, vision.Named("vision service 1").ShortName())
+			test.That(t, req.MotionCfg.ObstacleDetectors[0].CameraName, test.ShouldResemble, camera.Named("camera 1").ShortName())
+			test.That(t, req.MotionCfg.ObstacleDetectors[1].VisionServiceName, test.ShouldResemble, vision.Named("vision service 2").ShortName())
+			test.That(t, req.MotionCfg.ObstacleDetectors[1].CameraName, test.ShouldResemble, camera.Named("camera 2").ShortName())
 			test.That(t, len(req.BoundingRegions), test.ShouldEqual, 1)
 			test.That(t, req.BoundingRegions[0], test.ShouldResemble, geoGeometry3)
 			return firstExecutionID, nil
@@ -389,10 +389,10 @@ func TestServerMoveOnMap(t *testing.T) {
 			test.That(t, *req.MotionCfg.ObstaclePollingFreqHz, test.ShouldAlmostEqual, obstaclePollingFrequencyHz)
 			test.That(t, *req.MotionCfg.PositionPollingFreqHz, test.ShouldAlmostEqual, positionPollingFrequencyHz)
 			test.That(t, len(req.MotionCfg.ObstacleDetectors), test.ShouldAlmostEqual, 2)
-			test.That(t, req.MotionCfg.ObstacleDetectors[0].VisionServiceName, test.ShouldResemble, vision.Named("vision service 1"))
-			test.That(t, req.MotionCfg.ObstacleDetectors[0].CameraName, test.ShouldResemble, camera.Named("camera 1"))
-			test.That(t, req.MotionCfg.ObstacleDetectors[1].VisionServiceName, test.ShouldResemble, vision.Named("vision service 2"))
-			test.That(t, req.MotionCfg.ObstacleDetectors[1].CameraName, test.ShouldResemble, camera.Named("camera 2"))
+			test.That(t, req.MotionCfg.ObstacleDetectors[0].VisionServiceName, test.ShouldResemble, vision.Named("vision service 1").ShortName())
+			test.That(t, req.MotionCfg.ObstacleDetectors[0].CameraName, test.ShouldResemble, camera.Named("camera 1").ShortName())
+			test.That(t, req.MotionCfg.ObstacleDetectors[1].VisionServiceName, test.ShouldResemble, vision.Named("vision service 2").ShortName())
+			test.That(t, req.MotionCfg.ObstacleDetectors[1].CameraName, test.ShouldResemble, camera.Named("camera 2").ShortName())
 			return firstExecutionID, nil
 		}
 		moveOnMapResponse, err := server.MoveOnMap(context.Background(), moveOnMapRequest)