From bee78f93f8720ceaa5803a9490fe55d5aa9027d1 Mon Sep 17 00:00:00 2001
From: Jeff Ortel <jortel@redhat.com>
Date: Fri, 4 Aug 2023 05:08:15 -0700
Subject: [PATCH] checkpoint

Signed-off-by: Jeff Ortel <jortel@redhat.com>
---
 test/api/ruleset/api_test.go | 15 ++++++++++++---
 test/api/target/api_test.go  | 27 +++++++++++++++++----------
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/test/api/ruleset/api_test.go b/test/api/ruleset/api_test.go
index 49624156a..06d06b457 100644
--- a/test/api/ruleset/api_test.go
+++ b/test/api/ruleset/api_test.go
@@ -10,11 +10,18 @@ import (
 func TestRuleSetCRUD(t *testing.T) {
 	for _, r := range Samples {
 		t.Run(r.Name, func(t *testing.T) {
+			var files []*api.File
+			defer func() {
+				for _, f := range files {
+					_ = RichClient.File.Delete(f.ID)
+				}
+			}()
 			// Prepare rules files.
 			rules := []api.Rule{}
 			for _, rule := range r.Rules {
 				ruleFile, err := RichClient.File.Put(rule.File.Name)
 				assert.Should(t, err)
+				files = append(files, ruleFile)
 				rules = append(rules, api.Rule{
 					File: &api.Ref{
 						ID: ruleFile.ID,
@@ -40,10 +47,10 @@ func TestRuleSetCRUD(t *testing.T) {
 
 			// Update.
 			r.Name = "Updated " + r.Name
+			// Add rule.
 			file, err := RichClient.File.Put("./data/rules.yaml")
-			if err != nil {
-				t.Errorf(err.Error())
-			}
+			assert.Should(t, err)
+			files = append(files, file)
 			r.Rules = append(
 				r.Rules,
 				api.Rule{
@@ -52,7 +59,9 @@ func TestRuleSetCRUD(t *testing.T) {
 						ID: file.ID,
 					},
 				})
+			// Rule[0] removed.
 			r.Rules = r.Rules[1:]
+			// update
 			err = RuleSet.Update(&r)
 			if err != nil {
 				t.Errorf(err.Error())
diff --git a/test/api/target/api_test.go b/test/api/target/api_test.go
index 7e1044dbf..236826178 100644
--- a/test/api/target/api_test.go
+++ b/test/api/target/api_test.go
@@ -10,21 +10,27 @@ import (
 func TestTargetCRUD(t *testing.T) {
 	for _, r := range Samples {
 		t.Run(r.Name, func(t *testing.T) {
+			var files []*api.File
+			defer func() {
+				for _, f := range files {
+					_ = RichClient.File.Delete(f.ID)
+				}
+			}()
 			// Image.
-			image, err := RichClient.File.Put(r.Image.Name)
-			if err != nil {
-				t.Errorf(err.Error())
-			}
-			r.Image.ID = image.ID
+			file, err := RichClient.File.Put(r.Image.Name)
+			assert.Should(t, err)
+			files = append(files, file)
+			r.Image.ID = file.ID
 			// RuleSet
 			if r.RuleSet != nil {
 				rules := []api.Rule{}
 				for _, rule := range r.RuleSet.Rules {
-					ruleFile, err := RichClient.File.Put(rule.File.Name)
+					file, err := RichClient.File.Put(rule.File.Name)
 					assert.Should(t, err)
+					files = append(files, file)
 					rules = append(rules, api.Rule{
 						File: &api.Ref{
-							ID: ruleFile.ID,
+							ID: file.ID,
 						},
 					})
 				}
@@ -49,10 +55,10 @@ func TestTargetCRUD(t *testing.T) {
 			// Update.
 			r.Name = "Updated " + r.Name
 			if r.RuleSet != nil {
+				// Add a rule.
 				file, err := RichClient.File.Put("./data/rules.yaml")
-				if err != nil {
-					t.Errorf(err.Error())
-				}
+				assert.Should(t, err)
+				files = append(files, file)
 				r.RuleSet.Rules = append(
 					r.RuleSet.Rules,
 					api.Rule{
@@ -61,6 +67,7 @@ func TestTargetCRUD(t *testing.T) {
 							ID: file.ID,
 						},
 					})
+				// Rule[0] removed.
 				r.RuleSet.Rules = r.RuleSet.Rules[1:]
 			}
 			err = Target.Update(&r)