Fixed unit-tests

Author: ewoutp

pkg/apis/deployment/v1alpha/rocksdb_spec_test.go

@@ -32,16 +32,16 @@ import (
 func TestRocksDBSpecValidate(t *testing.T) {
 	// Valid
 	assert.Nil(t, RocksDBSpec{}.Validate())
-	assert.Nil(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}}.Validate())
+	assert.Nil(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}}.Validate())
 
 	// Not valid
-	assert.Error(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("Foo")}}.Validate())
+	assert.Error(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("Foo")}}.Validate())
 }
 
 func TestRocksDBSpecIsEncrypted(t *testing.T) {
 	assert.False(t, RocksDBSpec{}.IsEncrypted())
-	assert.False(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("")}}.IsEncrypted())
-	assert.True(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}}.IsEncrypted())
+	assert.False(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("")}}.IsEncrypted())
+	assert.True(t, RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}}.IsEncrypted())
 }
 
 func TestRocksDBSpecSetDefaults(t *testing.T) {
@@ -68,23 +68,23 @@ func TestRocksDBSpecResetImmutableFields(t *testing.T) {
 			nil,
 		},
 		{
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}},
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}},
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}},
 			nil,
 		},
 		{
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}},
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo2")}},
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo2")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo2")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo2")}},
 			nil,
 		},
 
 		// Invalid changes
 		{
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}},
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("")}},
-			RocksDBSpec{Encryption: RocksDBEncryptionSpec{XKeySecretName: util.NewString("foo")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("")}},
+			RocksDBSpec{Encryption: RocksDBEncryptionSpec{KeySecretName: util.NewString("foo")}},
 			[]string{"test.encryption.keySecretName"},
 		},
 	}

pkg/util/k8sutil/test/events_test.go

@@ -41,7 +41,7 @@ var apiObjectForTest = api.ArangoDeployment{
 		Namespace: "Wonka",
 	},
 	Spec: api.DeploymentSpec{
-		XMode: api.NewMode(api.DeploymentModeCluster),
+		Mode: api.NewMode(api.DeploymentModeCluster),
 	},
 }