RHINENG-19230: remove baseline tests

Author: MichaelMraka

base/database/testing.go

@@ -330,112 +330,6 @@ func DeleteNewlyAddedAdvisories(t *testing.T) {
 	assert.Equal(t, int64(0), cnt)
 }
 
-func CreateBaselineWithConfig(t *testing.T, name string, inventoryIDs []string,
-	configBytes []byte, description *string) int64 {
-	if name == "" {
-		name = "temporary_baseline"
-	}
-
-	temporaryBaseline := &models.Baseline{
-		RhAccountID: 1, Name: name, Config: configBytes, Description: description,
-	}
-
-	tx := DB.WithContext(base.Context).Begin()
-	defer tx.Rollback()
-
-	if err := tx.Create(temporaryBaseline).Error; err != nil {
-		assert.Nil(t, err)
-	}
-
-	err := tx.Model(models.SystemPlatform{}).
-		Where("rh_account_id = (?) AND inventory_id IN (?::uuid) AND EXISTS (SELECT * FROM inventory.hosts WHERE id IN (?))",
-			1, inventoryIDs, inventoryIDs).
-		Update("baseline_id", temporaryBaseline.ID).Error
-
-	assert.Nil(t, err)
-	err = tx.Commit().Error
-	assert.Nil(t, err)
-	return temporaryBaseline.ID
-}
-
-func CreateBaseline(t *testing.T, name string, inventoryIDs []string, description *string) int64 {
-	configBytes := []byte(`{"to_time": "2021-01-01T12:00:00-04:00"}`)
-	baselineID := CreateBaselineWithConfig(t, name, inventoryIDs, configBytes, description)
-	return baselineID
-}
-
-func DeleteBaseline(t *testing.T, baselineID int64) {
-	tx := DB.WithContext(base.Context).Begin()
-	defer tx.Rollback()
-
-	err := tx.Model(models.SystemPlatform{}).
-		Where("rh_account_id = (?) AND baseline_id = (?)", 1, baselineID).
-		Update("baseline_id", nil).Error
-
-	assert.Nil(t, err)
-
-	err = tx.Where(models.Baseline{ID: baselineID, RhAccountID: 1}).Delete(&models.Baseline{}).Error
-	assert.Nil(t, err)
-
-	err = tx.Commit().Error
-	assert.Nil(t, err)
-}
-
-func CheckBaseline(t *testing.T, baselineID int64, inventoryIDs []string, config, name string, description *string) {
-	type Baseline struct {
-		ID          int64   `query:"bl.id" gorm:"column:id"`
-		Name        string  `json:"name" query:"bl.name" gorm:"column:name"`
-		Config      string  `json:"config" query:"bl.config" gorm:"column:config"`
-		Description *string `json:"description" query:"bl.description" gorm:"column:description"`
-	}
-
-	type Associations struct {
-		ID string `json:"system" query:"id"`
-	}
-
-	var associations []Associations
-	var baseline Baseline
-
-	err := DB.Table("system_platform as sp").Select("sp.inventory_id as id").
-		Joins("JOIN inventory.hosts ih ON ih.id = sp.inventory_id").
-		Where("sp.rh_account_id = (?) AND sp.baseline_id = (?)", 1, baselineID).Order("id").Find(&associations).Error
-
-	assert.Nil(t, err)
-
-	err = DB.Table("baseline as bl").
-		Select("bl.id, bl.name, bl.config, bl.description").
-		Where("bl.rh_account_id = (?) AND bl.id = (?)", 1, baselineID).Find(&baseline).Error
-
-	assert.Nil(t, err)
-
-	assert.Equal(t, baselineID, baseline.ID)
-	assert.Equal(t, name, baseline.Name)
-	assert.Equal(t, config, baseline.Config)
-	if description == nil {
-		assert.Equal(t, description, baseline.Description)
-	} else {
-		assert.Equal(t, *description, *baseline.Description)
-	}
-
-	if len(inventoryIDs) == 0 {
-		assert.Equal(t, len(associations), 0)
-	} else {
-		for index, inventoryID := range inventoryIDs {
-			assert.Equal(t, associations[index].ID, inventoryID)
-		}
-	}
-}
-
-func CheckBaselineDeleted(t *testing.T, baselineID int64) {
-	var cntBaselines int64
-	assert.Nil(t, DB.Model(&models.Baseline{}).Where("id = ?", baselineID).Count(&cntBaselines).Error)
-	assert.Equal(t, 0, int(cntBaselines))
-
-	var cntSystems int64
-	assert.Nil(t, DB.Model(&models.SystemPlatform{}).Where("baseline_id = ?", baselineID).Count(&cntSystems).Error)
-	assert.Equal(t, 0, int(cntSystems))
-}
-
 func GetAllSystems(t *testing.T) (systems []*models.SystemPlatform) {
 	assert.Nil(t, DB.Model(&models.SystemPlatform{}).Order("rh_account_id").Scan(&systems).Error)
 	return systems

evaluator/evaluate_baseline_test.go

@@ -2,7 +2,6 @@ package kafka
 
 import (
 	"app/base/core"
-	"app/base/database"
 	"app/base/mqueue"
 	"app/base/utils"
 	"app/manager/config"
@@ -12,15 +11,14 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-func testEvaluateBaselineSystems(t *testing.T, baselineID *int64, accountID int,
-	configUpdated bool, inventoryIDs []string) mqueue.PlatformEvent {
+func testRecalcSystems(t *testing.T, accountID int, inventoryIDs []string) mqueue.PlatformEvent {
 	utils.SkipWithoutDB(t)
 	core.SetupTestEnvironment()
 	config.EnableTemplateChangeEval = true
 
 	writerMock := mqueue.MockKafkaWriter{}
 	TryStartEvalQueue(mqueue.MockCreateKafkaWriter(&writerMock))
-	inventoryAIDs := GetInventoryIDsToEvaluate(database.DB, baselineID, accountID, configUpdated, inventoryIDs)
+	inventoryAIDs := InventoryIDs2InventoryAIDs(accountID, inventoryIDs)
 	RecalcSystems(inventoryAIDs)
 	utils.AssertEqualWait(t, 1, func() (exp, act interface{}) {
 		return 1, len(writerMock.Messages)
@@ -30,38 +28,12 @@ func testEvaluateBaselineSystems(t *testing.T, baselineID *int64, accountID int,
 	return event
 }
 
-// Evaluate all baseline systems - config was updated, nothing added
-func TestEvaluateBaselineSystemsDefault(t *testing.T) {
-	event := testEvaluateBaselineSystems(t, utils.PtrInt64(1), 1, true, nil)
-	assert.Equal(t, 3, len(event.SystemIDs))
-	assert.Equal(t, 1, event.AccountID)
-	assert.Equal(t, "00000000-0000-0000-0000-000000000001", event.SystemIDs[0])
-	assert.Equal(t, "00000000-0000-0000-0000-000000000002", event.SystemIDs[1])
-}
-
-// Evaluate just updated systems - config was not updated
-func TestEvaluateBaselineUpdatedSystems(t *testing.T) {
+// Evaluate updated systems
+func TestRecalcUpdatedSystems(t *testing.T) {
 	inventoryIDs := []string{"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000004"}
-	event := testEvaluateBaselineSystems(t, utils.PtrInt64(1), 1, false, inventoryIDs)
+	event := testRecalcSystems(t, 1, inventoryIDs)
 	assert.Equal(t, 2, len(event.SystemIDs))
 	assert.Equal(t, 1, event.AccountID)
 	assert.Equal(t, "00000000-0000-0000-0000-000000000001", event.SystemIDs[0])
 	assert.Equal(t, "00000000-0000-0000-0000-000000000004", event.SystemIDs[1])
 }
-
-// Evaluate both all baseline systems and added ones - config updated, systems added
-func TestEvaluateBaselineAllAndUpdatedSystems(t *testing.T) {
-	inventoryIDs := []string{"00000000-0000-0000-0000-000000000001", "00000000-0000-0000-0000-000000000004"}
-	event := testEvaluateBaselineSystems(t, utils.PtrInt64(1), 1, true, inventoryIDs)
-	assert.Equal(t, 4, len(event.SystemIDs))
-	assert.Equal(t, 1, event.AccountID)
-	assert.Equal(t, "00000000-0000-0000-0000-000000000001", event.SystemIDs[0])
-	assert.Equal(t, "00000000-0000-0000-0000-000000000002", event.SystemIDs[1])
-	assert.Equal(t, "00000000-0000-0000-0000-000000000004", event.SystemIDs[2])
-}
-
-// No systems needed to evaluate - e.g. just baseline name changed
-func TestEvaluateBaselineNoSystems(t *testing.T) {
-	inventoryAIDs := GetInventoryIDsToEvaluate(database.DB, utils.PtrInt64(1), 1, false, nil)
-	assert.Equal(t, 0, len(inventoryAIDs))
-}