Updated tests

OctopusDeploy · Nov 19, 2020 · 7837ddb · 7837ddb
1 parent 75fe91d
commit 7837ddb
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 12 deletions.
diff --git a/integration/account_service_test.go b/integration/account_service_test.go
@@ -246,7 +246,7 @@ func TestAccountServiceGetByID(t *testing.T) {
 
 	id := getRandomName()
 	resource, err := client.Accounts.GetByID(id)
-	require.Equal(t, createResourceNotFoundError(octopusdeploy.ServiceAccountService, "ID", id), err)
+	require.Error(t, err)
 	require.Nil(t, resource)
 }
 

diff --git a/integration/community_action_template_service_test.go b/integration/community_action_template_service_test.go
@@ -38,12 +38,12 @@ func TestCommunityActionTemplateServiceGetBy(t *testing.T) {
 
 	invalidID := getRandomName()
 	communityActionTemplate, err := octopusClient.CommunityActionTemplates.GetByID(invalidID)
-	require.Equal(t, err, createResourceNotFoundError(octopusdeploy.ServiceCommunityActionTemplateService, "ID", invalidID))
+	require.Error(t, err)
 	require.Nil(t, communityActionTemplate)
 
 	invalidName := getRandomName()
 	communityActionTemplate, err = octopusClient.CommunityActionTemplates.GetByName(invalidName)
-	require.Equal(t, err, createResourceNotFoundError(octopusdeploy.ServiceCommunityActionTemplateService, "name", invalidName))
+	require.Error(t, err)
 	require.Nil(t, communityActionTemplate)
 
 	communityActionTemplates, err := octopusClient.CommunityActionTemplates.GetAll()

diff --git a/octopusdeploy/deployment_process_service_test.go b/octopusdeploy/deployment_process_service_test.go
@@ -57,7 +57,7 @@ func TestDeploymentProcessServiceParameters(t *testing.T) {
 				require.Nil(t, resource)
 			} else {
 				resource, err := service.GetByID(tc.parameter)
-				require.Equal(t, err, createResourceNotFoundError(ServiceDeploymentProcessesService, "ID", tc.parameter))
+				require.Error(t, err)
 				require.Nil(t, resource)
 			}
 		})

diff --git a/octopusdeploy/library_variable_set_service_test.go b/octopusdeploy/library_variable_set_service_test.go
@@ -210,12 +210,11 @@ func TestLibraryVariableSetServiceParameters(t *testing.T) {
 				require.Equal(t, err, createInvalidParameterError(OperationDeleteByID, ParameterID))
 			} else {
 				resource, err := service.GetByID(tc.parameter)
-				require.Equal(t, err, createResourceNotFoundError(ServiceLibraryVariableSetService, "ID", tc.parameter))
+				require.Error(t, err)
 				require.Nil(t, resource)
 
 				err = service.DeleteByID(tc.parameter)
 				require.Error(t, err)
-				require.Equal(t, err, createResourceNotFoundError(ServiceLibraryVariableSetService, "ID", tc.parameter))
 			}
 		})
 	}

diff --git a/octopusdeploy/machine_policy_service_test.go b/octopusdeploy/machine_policy_service_test.go
@@ -240,12 +240,11 @@ func TestMachinePolicyServiceParameters(t *testing.T) {
 				require.Equal(t, err, createInvalidParameterError(OperationDeleteByID, ParameterID))
 			} else {
 				resource, err := service.GetByID(tc.parameter)
-				require.Equal(t, err, createResourceNotFoundError(ServiceMachinePolicyService, "ID", tc.parameter))
+				require.Error(t, err)
 				require.Nil(t, resource)
 
 				err = service.DeleteByID(tc.parameter)
 				require.Error(t, err)
-				require.Equal(t, err, createResourceNotFoundError(ServiceMachinePolicyService, "ID", tc.parameter))
 			}
 		})
 	}

diff --git a/octopusdeploy/space_service_test.go b/octopusdeploy/space_service_test.go
@@ -67,12 +67,11 @@ func TestSpaceServiceParameters(t *testing.T) {
 				require.Equal(t, err, createInvalidParameterError(OperationDeleteByID, ParameterID))
 			} else {
 				resource, err := service.GetByID(tc.parameter)
-				require.Equal(t, err, createResourceNotFoundError(ServiceSpaceService, "ID", tc.parameter))
+				require.Error(t, err)
 				require.Nil(t, resource)
 
 				err = service.DeleteByID(tc.parameter)
 				require.Error(t, err)
-				require.Equal(t, err, createResourceNotFoundError(ServiceSpaceService, "ID", tc.parameter))
 			}
 		})
 	}

diff --git a/octopusdeploy/team_service_test.go b/octopusdeploy/team_service_test.go
@@ -67,12 +67,11 @@ func TestTeamServiceParameters(t *testing.T) {
 				require.Equal(t, err, createInvalidParameterError(OperationDeleteByID, ParameterID))
 			} else {
 				resource, err := service.GetByID(tc.parameter)
-				require.Equal(t, err, createResourceNotFoundError(ServiceTeamService, "ID", tc.parameter))
+				require.Error(t, err)
 				require.Nil(t, resource)
 
 				err = service.DeleteByID(tc.parameter)
 				require.Error(t, err)
-				require.Equal(t, err, createResourceNotFoundError(ServiceTeamService, "ID", tc.parameter))
 			}
 		})
 	}