GT-201 Rename View improvements (#438)

Author: jwierzbo

test/client_test.go

@@ -60,6 +60,35 @@ func isK8S() bool {
 	return os.Getenv("TEST_MODE_K8S") == "k8s"
 }
 
+func skipNoCluster(c driver.Client, t *testing.T) {
+	_, err := c.Cluster(nil)
+	if driver.IsPreconditionFailed(err) {
+		t.Skipf("Not a cluster")
+	} else if err != nil {
+		t.Fatalf("Failed to get cluster: %s", describe(err))
+	}
+}
+
+func skipNoSingle(c driver.Client, t *testing.T) {
+	_, err := c.Cluster(nil)
+	if driver.IsPreconditionFailed(err) {
+		// this is a single server
+		return
+	} else if err != nil {
+		t.Fatalf("Failed to get cluster: %s", describe(err))
+	}
+	t.Skipf("Not a single server")
+}
+
+func skipNoEnterprise(t *testing.T) {
+	c := createClientFromEnv(t, true)
+	if v, err := c.Version(nil); err != nil {
+		t.Errorf("Failed to get version: %s", describe(err))
+	} else if !v.IsEnterprise() {
+		t.Skipf("Enterprise only")
+	}
+}
+
 // skipBetweenVersion skips the test if the current server version is less than
 // the min version or higher/equal max version
 func skipBetweenVersion(c driver.Client, minVersion, maxVersion driver.Version, t *testing.T) driver.VersionInfo {

test/collection_test.go

@@ -35,15 +35,6 @@ import (
 	driver "github.com/arangodb/go-driver"
 )
 
-func skipNoCluster(c driver.Client, t *testing.T) {
-	_, err := c.Cluster(nil)
-	if driver.IsPreconditionFailed(err) {
-		t.Skipf("Not a cluster")
-	} else if err != nil {
-		t.Fatalf("Failed to get cluster: %s", describe(err))
-	}
-}
-
 // ensureCollection is a helper to check if a collection exists and create if if needed.
 // It will fail the test when an error occurs.
 func ensureCollection(ctx context.Context, db driver.Database, name string, options *driver.CreateCollectionOptions, t testEnv) driver.Collection {

test/util.go

@@ -122,15 +122,6 @@ func getTestMode() string {
 	return strings.TrimSpace(os.Getenv("TEST_MODE"))
 }
 
-func skipNoEnterprise(t *testing.T) {
-	c := createClientFromEnv(t, true)
-	if v, err := c.Version(nil); err != nil {
-		t.Errorf("Failed to get version: %s", describe(err))
-	} else if !v.IsEnterprise() {
-		t.Skipf("Enterprise only")
-	}
-}
-
 // waitForDataPropagation - waits for data propagation in cluster mode
 func waitForDataPropagation() {
 	if getTestMode() == testModeCluster {

test/view_test.go

@@ -394,13 +394,15 @@ func TestGetArangoSearchViews(t *testing.T) {
 	}
 }
 
-// TestRenameAndRemoveArangoSearchView creates an arangosearch view and then removes it.
+// TestRenameAndRemoveArangoSearchView creates an arangosearch view, renames it and then removes it.
 func TestRenameAndRemoveArangoSearchView(t *testing.T) {
 	ctx := context.Background()
 	c := createClientFromEnv(t, true)
 	skipBelowVersion(c, "3.4", t)
+
 	db := ensureDatabase(ctx, c, "view_test", nil, t)
 	name := "test_rename_view"
+	renamedView := "test_rename_view_new"
 	v, err := db.CreateArangoSearchView(ctx, name, nil)
 	require.NoError(t, err)
 
@@ -409,16 +411,19 @@ func TestRenameAndRemoveArangoSearchView(t *testing.T) {
 	require.NoError(t, err)
 	require.True(t, found)
 
-	// Rename view
-	newName := "test_rename_view_new"
-	err = v.Rename(ctx, newName)
-	require.NoError(t, err)
-	require.Equal(t, newName, v.Name())
+	t.Run("rename view - single server only", func(t *testing.T) {
+		skipNoSingle(c, t)
 
-	// Renamed View must exist
-	found, err = db.ViewExists(ctx, newName)
-	require.NoError(t, err)
-	require.True(t, found)
+		// Rename view
+		err = v.Rename(ctx, renamedView)
+		require.NoError(t, err)
+		require.Equal(t, renamedView, v.Name())
+
+		// Renamed View must exist
+		found, err = db.ViewExists(ctx, renamedView)
+		require.NoError(t, err)
+		require.True(t, found)
+	})
 
 	// Now remove it
 	err = v.Remove(ctx)
@@ -429,9 +434,14 @@ func TestRenameAndRemoveArangoSearchView(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, found)
 
-	found, err = db.ViewExists(ctx, newName)
-	require.NoError(t, err)
-	require.False(t, found)
+	t.Run("ensure renamed view not exist - single server only", func(t *testing.T) {
+		skipNoSingle(c, t)
+
+		found, err = db.ViewExists(ctx, renamedView)
+		require.NoError(t, err)
+		require.False(t, found)
+	})
+
 }
 
 // TestUseArangoSearchView tries to create a view and actually use it in

view.go

@@ -46,7 +46,7 @@ type View interface {
 	// Database returns the database containing the view.
 	Database() Database
 
-	// Rename renames the view.
+	// Rename renames the view (SINGLE server only).
 	Rename(ctx context.Context, newName string) error
 
 	// Remove removes the entire view.