try fixing lint

datreeio · May 25, 2022 · 46b341d · 46b341d
1 parent 67f4baf
commit 46b341d
Showing 1 changed file with 18 additions and 21 deletions.
diff --git a/bl/validation/k8sValidator_test.go b/bl/validation/k8sValidator_test.go
@@ -29,8 +29,8 @@ func TestValidateResources(t *testing.T) {
 	test_get_all_schema_locations_offline(t)
 	test_get_datree_crd_schema_by_name(t)
 	t.Run("test empty file", test_empty_file)
-	t.Run("test no internet connection", test_offline_without_custom_schema_locations)
-	t.Run("test no internet connection", test_offline_with_remote_custom_schema_location)
+	t.Run("test_offline_without_custom_schema_locations", test_offline_without_custom_schema_locations)
+	t.Run("test_offline_with_remote_custom_schema_location", test_offline_with_remote_custom_schema_location)
 	t.Run("test missing schema skipped", test_missing_schema_skipped)
 }
 
@@ -130,14 +130,14 @@ func test_empty_file(t *testing.T) {
 	}
 }
 
-func test_offline_without_custom_schema_locations(t *testing.T) {
+func test_offline_with_remote_custom_schema_location(t *testing.T) {
 	validationClient := &mockValidationClient{}
 	validationClient.On("Validate", mock.Anything, mock.Anything).Return([]kubeconformValidator.Result{
 		{Status: kubeconformValidator.Error, Err: fmt.Errorf("no such host")},
 	})
 	k8sValidator := K8sValidator{
 		validationClient:              validationClient,
-		areThereCustomSchemaLocations: false,
+		areThereCustomSchemaLocations: true,
 		isOffline:                     true,
 	}
 
@@ -149,25 +149,22 @@ func test_offline_without_custom_schema_locations(t *testing.T) {
 		Configurations: []extractor.Configuration{},
 	}
 	close(filesConfigurationsChan)
-	k8sValidationWarningPerValidFile := make(K8sValidationWarningPerValidFile)
 
-	_, _, filesWithWarningsChan := k8sValidator.ValidateResources(filesConfigurationsChan, 1)
+	_, invalidFilesChan, filesWithWarningsChan := k8sValidator.ValidateResources(filesConfigurationsChan, 1)
+	for p := range invalidFilesChan {
+		assert.Equal(t, 1, len(p.ValidationErrors))
+		assert.Equal(t, "k8s schema validation error: no such host\n", p.ValidationErrors[0].Error())
+	}
 	for p := range filesWithWarningsChan {
-		k8sValidationWarningPerValidFile[p.Filename] = *p
+		panic("expected 0 warnings when custom --schema-location provided, instead got warning: " + p.Warning)
 	}
-
-	assert.Equal(t, 1, len(k8sValidationWarningPerValidFile))
-	assert.Equal(t, "k8s schema validation skipped: no internet connection", k8sValidationWarningPerValidFile[path].Warning)
 }
 
-func test_offline_with_remote_custom_schema_location(t *testing.T) {
+func test_offline_without_custom_schema_locations(t *testing.T) {
 	validationClient := &mockValidationClient{}
-	validationClient.On("Validate", mock.Anything, mock.Anything).Return([]kubeconformValidator.Result{
-		{Status: kubeconformValidator.Error, Err: fmt.Errorf("no such host")},
-	})
 	k8sValidator := K8sValidator{
 		validationClient:              validationClient,
-		areThereCustomSchemaLocations: true,
+		areThereCustomSchemaLocations: false,
 		isOffline:                     true,
 	}
 
@@ -179,15 +176,15 @@ func test_offline_with_remote_custom_schema_location(t *testing.T) {
 		Configurations: []extractor.Configuration{},
 	}
 	close(filesConfigurationsChan)
+	k8sValidationWarningPerValidFile := make(K8sValidationWarningPerValidFile)
 
-	_, invalidFilesChan, filesWithWarningsChan := k8sValidator.ValidateResources(filesConfigurationsChan, 1)
-	for p := range invalidFilesChan {
-		assert.Equal(t, 1, len(p.ValidationErrors))
-		assert.Equal(t, "k8s schema validation error: no such host\n", p.ValidationErrors[0].Error())
-	}
+	_, _, filesWithWarningsChan := k8sValidator.ValidateResources(filesConfigurationsChan, 1)
 	for p := range filesWithWarningsChan {
-		panic("expected 0 warnings when custom --schema-location provided, instead got warning: " + p.Warning)
+		k8sValidationWarningPerValidFile[p.Filename] = *p
 	}
+
+	assert.Equal(t, 1, len(k8sValidationWarningPerValidFile))
+	assert.Equal(t, "k8s schema validation skipped: no internet connection", k8sValidationWarningPerValidFile[path].Warning)
 }
 
 func test_missing_schema_skipped(t *testing.T) {