[KOGITO-8961][KSW-Operator] Split use case and test examples

Signed-off-by: desmax74 <mdessi@redhat.com>

controllers/builder/openshiftbuilder_test.go

@@ -35,8 +35,8 @@ import (
 func Test_openshiftBuilderManager_Reconcile(t *testing.T) {
 	// Setup
 	ns := t.Name()
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, ns)
-	platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, ns)
+	workflow := test.GetBaseServerlessWorkflow(ns)
+	platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name())
 	config := test.GetKogitoServerlessOperatorBuilderConfig("../../", ns)
 	namespacedName := types.NamespacedName{Namespace: workflow.Namespace, Name: workflow.Name}
 	client := test.NewKogitoClientBuilderWithOpenShift().WithRuntimeObjects(workflow, platform, config).Build()
@@ -89,8 +89,8 @@ func Test_openshiftBuilderManager_Reconcile(t *testing.T) {
 
 func Test_openshiftbuilder_externalCMs(t *testing.T) {
 	ns := t.Name()
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, ns)
-	platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, ns)
+	workflow := test.GetBaseServerlessWorkflow(ns)
+	platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name())
 	config := test.GetKogitoServerlessOperatorBuilderConfig("../../", ns)
 	externalCm := &v1.ConfigMap{
 		ObjectMeta: metav1.ObjectMeta{

controllers/kogitoserverlessbuild_controller_test.go

@@ -31,11 +31,12 @@ import (
 
 func TestKogitoServerlessBuildController(t *testing.T) {
 	namespace := t.Name()
-	ksw := test.GetKogitoServerlessWorkflow("../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, namespace)
+	ksw := test.GetBaseServerlessWorkflowNoPackage(namespace)
 	ksb := test.GetNewEmptyKogitoServerlessBuild(ksw.Name, namespace)
+
 	cl := test.NewKogitoClientBuilder().
 		WithRuntimeObjects(ksb, ksw).
-		WithRuntimeObjects(test.GetKogitoServerlessPlatformInReadyPhase("../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, namespace)).
+		WithRuntimeObjects(test.GetBasePlatformWithCacheInReadyPhaseNoPackage(namespace)).
 		WithRuntimeObjects(test.GetKogitoServerlessOperatorBuilderConfig("../", namespace)).
 		Build()
 

controllers/kogitoserverlessworkflow_controller_test.go

@@ -34,10 +34,10 @@ func TestKogitoServerlessWorkflowController(t *testing.T) {
 	t.Run("verify that a basic reconcile is performed without error", func(t *testing.T) {
 		namespace := t.Name()
 		// Create a KogitoServerlessWorkflow object with metadata and spec.
-		ksw := test.GetKogitoServerlessWorkflow("../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, namespace)
+		ksw := test.GetBaseServerlessWorkflowNoPackage(namespace)
 		// The Workflow controller needs at least to perform a call for Platforms, so we need to add this kind to the known
 		// ones by the fake client
-		ksp := test.GetKogitoServerlessPlatformInReadyPhase("../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, namespace)
+		ksp := test.GetBasePlatformWithCacheInReadyPhaseNoPackage(namespace)
 		// Objects to track in the fake Client.
 		objs := []runtime.Object{ksw, ksp}
 

controllers/profiles/object_creators_dev_test.go

@@ -24,7 +24,7 @@ import (
 )
 
 func Test_ensureWorkflowDevServiceIsExposed(t *testing.T) {
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name())
 
 	//On Kubernetes we want the service exposed in Dev with NodePort
 	service, _ := devServiceCreator(workflow)

controllers/profiles/object_creators_test.go

@@ -25,7 +25,7 @@ import (
 )
 
 func Test_ensureWorkflowPropertiesConfigMapMutator(t *testing.T) {
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name())
 	// can't be new
 	cm, _ := workflowPropsConfigMapCreator(workflow)
 	cm.SetUID("1")

controllers/profiles/profile_test.go

@@ -23,12 +23,12 @@ import (
 )
 
 func Test_workflowIsDevProfile(t *testing.T) {
-	workflowWithDevProfile := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name())
+	workflowWithDevProfile := test.GetBaseServerlessWorkflowWithDevProfile(t.Name())
 	assert.True(t, IsDevProfile(workflowWithDevProfile))
 
-	workflowWithNoProfile := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name())
+	workflowWithNoProfile := test.GetBaseServerlessWorkflow(t.Name())
 	assert.False(t, IsDevProfile(workflowWithNoProfile))
 
-	workflowWithProdProfile := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowProdProfileSampleYamlCR, t.Name())
+	workflowWithProdProfile := test.GetBaseServerlessWorkflowWithProdProfile(t.Name())
 	assert.False(t, IsDevProfile(workflowWithProdProfile))
 }

controllers/profiles/reconciler_dev_test.go

@@ -163,7 +163,7 @@ func Test_newDevProfile(t *testing.T) {
 
 func Test_devProfileImageDefaultsNoPlatform(t *testing.T) {
 	logger := ctrllog.FromContext(context.TODO())
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name())
 	client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build()
 	config := &rest.Config{}
 	devReconciler := newDevProfileReconciler(client, config, &logger)
@@ -179,11 +179,9 @@ func Test_devProfileImageDefaultsNoPlatform(t *testing.T) {
 
 func Test_devProfileWithImageSnapshotOverrideWithPlatform(t *testing.T) {
 	logger := ctrllog.FromContext(context.TODO())
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name())
 
-	platform := test.GetKogitoServerlessPlatform("../../config/samples/" + test.KogitoServerlessPlatformWithDevBaseImageYamlCR)
-	platform.Status.Phase = operatorapi.PlatformPhaseReady
-	platform.Namespace = workflow.Namespace
+	platform := test.GetBasePlatformWithDevBaseImageInReadyPhase(workflow.Namespace)
 
 	client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build()
 	errCreatePlatform := client.Create(context.Background(), platform)
@@ -202,11 +200,9 @@ func Test_devProfileWithImageSnapshotOverrideWithPlatform(t *testing.T) {
 
 func Test_devProfileWithWPlatformWithoutDevBaseImageAndWithBaseImage(t *testing.T) {
 	logger := ctrllog.FromContext(context.TODO())
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name())
 
-	platform := test.GetKogitoServerlessPlatform("../../config/samples/" + test.KogitoServerlessPlatformWithBaseImageYamlCR)
-	platform.Status.Phase = operatorapi.PlatformPhaseReady
-	platform.Namespace = workflow.Namespace
+	platform := test.GetBasePlatformWithBaseImageInReadyPhase(workflow.Namespace)
 
 	client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build()
 	errCreatePlatform := client.Create(context.Background(), platform)
@@ -225,7 +221,7 @@ func Test_devProfileWithWPlatformWithoutDevBaseImageAndWithBaseImage(t *testing.
 
 func Test_devProfileWithPlatformWithoutDevBaseImageAndWithoutBaseImage(t *testing.T) {
 	logger := ctrllog.FromContext(context.TODO())
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflowWithDevProfile(t.Name())
 
 	platform := test.GetKogitoServerlessPlatform("../../config/samples/" + test.KogitoServerlessPlatformYamlCR)
 	platform.Status.Phase = operatorapi.PlatformPhaseReady
@@ -248,7 +244,7 @@ func Test_devProfileWithPlatformWithoutDevBaseImageAndWithoutBaseImage(t *testin
 
 func Test_newDevProfileWithExternalConfigMaps(t *testing.T) {
 	logger := ctrllog.FromContext(context.TODO())
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleDevModeWithExternalResourceYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflowWithDevProfileAndExternalResource(t.Name())
 	client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow).Build()
 	config := &rest.Config{}
 	devReconciler := newDevProfileReconciler(client, config, &logger)

controllers/profiles/reconciler_prod_test.go

@@ -37,7 +37,7 @@ func Test_reconcilerProdBuildConditions(t *testing.T) {
 	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name())
 	// make sure that the workflow won't trigger a change
 	workflow.Status.Applied = workflow.Spec
-	platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, t.Name())
+	platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name())
 	client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow, platform).Build()
 
 	config := &rest.Config{}
@@ -88,7 +88,7 @@ func Test_deployWorkflowReconciliationHandler_handleObjects(t *testing.T) {
 	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name())
 	// make sure that the workflow won't trigger a change
 	workflow.Status.Applied = workflow.Spec
-	platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, t.Name())
+	platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name())
 	client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow, platform).Build()
 	handler := &deployWorkflowReconciliationState{
 		stateSupport: fakeReconcilerSupport(client),
@@ -132,10 +132,10 @@ func Test_deployWorkflowReconciliationHandler_handleObjects(t *testing.T) {
 func Test_GenerationAnnotationCheck(t *testing.T) {
 	logger := ctrllog.FromContext(context.TODO())
 	// we load a workflow with metadata.generation to 0
-	workflow := test.GetKogitoServerlessWorkflow("../../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name())
+	workflow := test.GetBaseServerlessWorkflow(t.Name())
 	// make sure that the workflow won't trigger a change
 	workflow.Status.Applied = workflow.Spec
-	platform := test.GetKogitoServerlessPlatformInReadyPhase("../../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, t.Name())
+	platform := test.GetBasePlatformWithCacheInReadyPhase(t.Name())
 	client := test.NewKogitoClientBuilder().WithRuntimeObjects(workflow, platform).Build()
 	handler := &deployWorkflowReconciliationState{
 		stateSupport: fakeReconcilerSupport(client),
@@ -147,7 +147,9 @@ func Test_GenerationAnnotationCheck(t *testing.T) {
 	assert.NotNil(t, result)
 	assert.Len(t, objects, 3)
 	// then we load a workflow with metadata.generation set to 1
-	workflowChanged := test.GetKogitoServerlessWorkflow("../../test/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, t.Name())
+	workflowChanged := test.GetBaseServerlessWorkflow(t.Name())
+	//we set the generation to 1
+	workflowChanged.Generation = int64(1)
 	client = test.NewKogitoClientBuilder().WithRuntimeObjects(workflowChanged, platform).Build()
 	handler = &deployWorkflowReconciliationState{
 		stateSupport: fakeReconcilerSupport(client),

test/e2e/workflow_test.go

@@ -178,7 +178,7 @@ var _ = Describe("Kogito Serverless Operator", Ordered, func() {
 			By("creating an instance of the Kogito Serverless Platform")
 			EventuallyWithOffset(1, func() error {
 				cmd := exec.Command("kubectl", "apply", "-f", filepath.Join(projectDir,
-					"config/samples/"+test.KogitoServerlessPlatformWithCacheMinikubeYamlCR), "-n", namespace)
+					"test/samples/"+test.KogitoServerlessPlatformWithCacheMinikubeYamlCR), "-n", namespace)
 				_, err := utils.Run(cmd)
 				return err
 			}, time.Minute, time.Second).Should(Succeed())
@@ -209,7 +209,7 @@ var _ = Describe("Kogito Serverless Operator", Ordered, func() {
 			By("creating an instance of the Kogito Serverless Workflow in DevMode")
 			EventuallyWithOffset(1, func() error {
 				cmd := exec.Command("kubectl", "apply", "-f", filepath.Join(projectDir,
-					"config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace)
+					"test/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace)
 				_, err := utils.Run(cmd)
 				return err
 			}, time.Minute, time.Second).Should(Succeed())
@@ -224,7 +224,7 @@ var _ = Describe("Kogito Serverless Operator", Ordered, func() {
 
 			EventuallyWithOffset(1, func() error {
 				cmd := exec.Command("kubectl", "delete", "-f", filepath.Join(projectDir,
-					"config/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace)
+					"test/samples/"+test.KogitoServerlessWorkflowSampleDevModeYamlCR), "-n", namespace)
 				_, err := utils.Run(cmd)
 				return err
 			}, time.Minute, time.Second).Should(Succeed())