Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jun 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

8 changes: 4 additions & 4 deletions controllers/builder/openshiftbuilder_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.GetBasePlatformInReadyPhase(t.Name())
config := test.GetKogitoServerlessOperatorBuilderConfig("../../", ns)
namespacedName := types.NamespacedName{Namespace: workflow.Namespace, Name: workflow.Name}
client := test.NewKogitoClientBuilderWithOpenShift().WithRuntimeObjects(workflow, platform, config).Build()
Expand Down Expand Up @@ -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.GetBasePlatformInReadyPhase(t.Name())
config := test.GetKogitoServerlessOperatorBuilderConfig("../../", ns)
externalCm := &v1.ConfigMap{
ObjectMeta: metav1.ObjectMeta{
Expand Down
5 changes: 3 additions & 2 deletions controllers/kogitoserverlessbuild_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ import (

func TestKogitoServerlessBuildController(t *testing.T) {
namespace := t.Name()
ksw := test.GetKogitoServerlessWorkflow("../config/samples/"+test.KogitoServerlessWorkflowSampleYamlCR, namespace)
ksw := test.GetBaseServerlessWorkflow(namespace)
ksb := test.GetNewEmptyKogitoServerlessBuild(ksw.Name, namespace)

cl := test.NewKogitoClientBuilder().
WithRuntimeObjects(ksb, ksw).
WithRuntimeObjects(test.GetKogitoServerlessPlatformInReadyPhase("../config/samples/"+test.KogitoServerlessPlatformWithCacheYamlCR, namespace)).
WithRuntimeObjects(test.GetBasePlatformInReadyPhase(namespace)).
WithRuntimeObjects(test.GetKogitoServerlessOperatorBuilderConfig("../", namespace)).
WithStatusSubresource(ksb, ksw).
Build()
Expand Down
2 changes: 1 addition & 1 deletion controllers/kogitoserverlessplatform_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import (
func TestKogitoServerlessPlatformController(t *testing.T) {
t.Run("verify that a basic reconcile is performed without error", func(t *testing.T) {
// Create a KogitoServerlessPlatform object with metadata and spec.
ksp := test.GetKogitoServerlessPlatform("../config/samples/sw.kogito_v1alpha08_kogitoserverlessplatform.yaml")
ksp := test.GetBasePlatform()

// Create a fake client to mock API calls.
cl := test.NewKogitoClientBuilder().WithRuntimeObjects(ksp).WithStatusSubresource(ksp).Build()
Expand Down
4 changes: 2 additions & 2 deletions controllers/kogitoserverlessworkflow_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.GetBaseServerlessWorkflow(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.GetBasePlatformInReadyPhase(namespace)
// Objects to track in the fake Client.
objs := []runtime.Object{ksw, ksp}

Expand Down
2 changes: 1 addition & 1 deletion controllers/profiles/object_creators_dev_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion controllers/profiles/object_creators_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,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")
Expand Down
6 changes: 3 additions & 3 deletions controllers/profiles/profile_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}
Loading