From 3cedbe16a7ed57ff84191c7fa202fb530c53bb47 Mon Sep 17 00:00:00 2001
From: divolgin <dmitriy@replicated.com>
Date: Fri, 17 Dec 2021 19:22:39 +0000
Subject: [PATCH] Organize test files by type and namespace

---
 pkg/analyze/data_test.go                             | 12 ++++++------
 pkg/analyze/deployment_status_test.go                |  6 +++---
 .../{deployments.json => deployments/default.json}   |  0
 pkg/analyze/files/{jobs.json => jobs/test.json}      |  0
 .../{replicasets.json => replicasets/rook-ceph.json} |  0
 pkg/analyze/job_status_test.go                       |  8 ++++----
 6 files changed, 13 insertions(+), 13 deletions(-)
 rename pkg/analyze/files/{deployments.json => deployments/default.json} (100%)
 rename pkg/analyze/files/{jobs.json => jobs/test.json} (100%)
 rename pkg/analyze/files/{replicasets.json => replicasets/rook-ceph.json} (100%)

diff --git a/pkg/analyze/data_test.go b/pkg/analyze/data_test.go
index 67260106..b75dd9e7 100644
--- a/pkg/analyze/data_test.go
+++ b/pkg/analyze/data_test.go
@@ -4,14 +4,14 @@ import (
 	_ "embed"
 )
 
-//go:embed files/deployments.json
-var collectedDeployments string
+//go:embed files/deployments/default.json
+var defaultDeployments string
 
 //go:embed files/nodes.json
 var collectedNodes string
 
-//go:embed files/jobs.json
-var collectedJobs string
+//go:embed files/jobs/test.json
+var testJobs string
 
-//go:embed files/replicasets.json
-var collectedReplicaSets string
+//go:embed files/replicasets/rook-ceph.json
+var rookCephReplicaSets string
diff --git a/pkg/analyze/deployment_status_test.go b/pkg/analyze/deployment_status_test.go
index 087e11b4..c3a4fdfe 100644
--- a/pkg/analyze/deployment_status_test.go
+++ b/pkg/analyze/deployment_status_test.go
@@ -46,7 +46,7 @@ func Test_deploymentStatus(t *testing.T) {
 				},
 			},
 			files: map[string][]byte{
-				"cluster-resources/deployments/default.json": []byte(collectedDeployments),
+				"cluster-resources/deployments/default.json": []byte(defaultDeployments),
 			},
 		},
 		{
@@ -80,7 +80,7 @@ func Test_deploymentStatus(t *testing.T) {
 				},
 			},
 			files: map[string][]byte{
-				"cluster-resources/deployments/default.json": []byte(collectedDeployments),
+				"cluster-resources/deployments/default.json": []byte(defaultDeployments),
 			},
 		},
 		{
@@ -120,7 +120,7 @@ func Test_deploymentStatus(t *testing.T) {
 				},
 			},
 			files: map[string][]byte{
-				"cluster-resources/deployments/default.json": []byte(collectedDeployments),
+				"cluster-resources/deployments/default.json": []byte(defaultDeployments),
 			},
 		},
 	}
diff --git a/pkg/analyze/files/deployments.json b/pkg/analyze/files/deployments/default.json
similarity index 100%
rename from pkg/analyze/files/deployments.json
rename to pkg/analyze/files/deployments/default.json
diff --git a/pkg/analyze/files/jobs.json b/pkg/analyze/files/jobs/test.json
similarity index 100%
rename from pkg/analyze/files/jobs.json
rename to pkg/analyze/files/jobs/test.json
diff --git a/pkg/analyze/files/replicasets.json b/pkg/analyze/files/replicasets/rook-ceph.json
similarity index 100%
rename from pkg/analyze/files/replicasets.json
rename to pkg/analyze/files/replicasets/rook-ceph.json
diff --git a/pkg/analyze/job_status_test.go b/pkg/analyze/job_status_test.go
index ef372c97..53f9fda7 100644
--- a/pkg/analyze/job_status_test.go
+++ b/pkg/analyze/job_status_test.go
@@ -46,7 +46,7 @@ func Test_JobStatus(t *testing.T) {
 				},
 			},
 			files: map[string][]byte{
-				"cluster-resources/jobs/test.json": []byte(collectedJobs),
+				"cluster-resources/jobs/test.json": []byte(testJobs),
 			},
 		},
 		{
@@ -80,7 +80,7 @@ func Test_JobStatus(t *testing.T) {
 				},
 			},
 			files: map[string][]byte{
-				"cluster-resources/jobs/test.json": []byte(collectedJobs),
+				"cluster-resources/jobs/test.json": []byte(testJobs),
 			},
 		},
 		{
@@ -120,7 +120,7 @@ func Test_JobStatus(t *testing.T) {
 				},
 			},
 			files: map[string][]byte{
-				"cluster-resources/jobs/test.json": []byte(collectedJobs),
+				"cluster-resources/jobs/test.json": []byte(testJobs),
 			},
 		},
 		{
@@ -138,7 +138,7 @@ func Test_JobStatus(t *testing.T) {
 				},
 			},
 			files: map[string][]byte{
-				"cluster-resources/jobs/test.json": []byte(collectedJobs),
+				"cluster-resources/jobs/test.json": []byte(testJobs),
 			},
 		},
 	}