Cleanup indexes after test cases

aerospike · Jul 21, 2016 · a4516fc · a4516fc
1 parent 9dab8c8
commit a4516fc
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 3 deletions.
diff --git a/complex_index_test.go b/complex_index_test.go
@@ -73,7 +73,7 @@ var _ = Describe("Complex Index operations test", func() {
 			It("must create a complex Index for Map Keys", func() {
 				idxTask, err := client.CreateComplexIndex(wpolicy, ns, set, set+bin2.Name+"keys", bin2.Name, STRING, ICT_MAPKEYS)
 				Expect(err).ToNot(HaveOccurred())
-				defer client.DropIndex(wpolicy, ns, set, set+bin1.Name)
+				defer client.DropIndex(wpolicy, ns, set, set+bin2.Name+"keys")
 
 				// wait until index is created
 				<-idxTask.OnComplete()
@@ -86,7 +86,7 @@ var _ = Describe("Complex Index operations test", func() {
 			It("must create a complex Index for Map Values", func() {
 				idxTask, err := client.CreateComplexIndex(wpolicy, ns, set, set+bin2.Name+"values", bin2.Name, STRING, ICT_MAPVALUES)
 				Expect(err).ToNot(HaveOccurred())
-				defer client.DropIndex(wpolicy, ns, set, set+bin1.Name)
+				defer client.DropIndex(wpolicy, ns, set, set+bin2.Name+"values")
 
 				// wait until index is created
 				<-idxTask.OnComplete()

diff --git a/complex_query_test.go b/complex_query_test.go
@@ -74,6 +74,12 @@ var _ = Describe("Query operations on complex types", func() {
 		Expect(<-idxTask3.OnComplete()).ToNot(HaveOccurred())
 	})
 
+	AfterEach(func() {
+		Expect(client.DropIndex(nil, ns, set, set+bin1.Name)).ToNot(HaveOccurred())
+		Expect(client.DropIndex(nil, ns, set, set+bin2.Name+"keys")).ToNot(HaveOccurred())
+		Expect(client.DropIndex(nil, ns, set, set+bin2.Name+"values")).ToNot(HaveOccurred())
+	})
+
 	It("must Query a specific element in list and get only relevant records back", func() {
 		stm := NewStatement(ns, set)
 		stm.Addfilter(NewContainsFilter(bin1.Name, ICT_LIST, 1))

diff --git a/index_test.go b/index_test.go
@@ -100,6 +100,8 @@ var _ = Describe("Index operations test", func() {
 				// wait until index is created
 				Expect(<-idxTask.OnComplete()).ToNot(HaveOccurred())
 
+				err = client.DropIndex(wpolicy, ns, set, set+bin1.Name)
+				Expect(err).ToNot(HaveOccurred())
 			})
 
 		})

diff --git a/query_test.go b/query_test.go
@@ -57,6 +57,7 @@ var _ = Describe("Query operations", func() {
 	bin4 := NewBin("Aerospike4", "constValue")
 	bin5 := NewBin("Aerospike5", -1)
 	var keys map[string]*Key
+	var indexName string
 
 	// read all records from the channel and make sure all of them are returned
 	var checkResults = func(recordset *Recordset, cancelCnt int) {
@@ -98,14 +99,17 @@ var _ = Describe("Query operations", func() {
 		}
 
 		// queries only work on indices
-		idxTask, err := client.CreateIndex(wpolicy, ns, set, set+bin3.Name, bin3.Name, NUMERIC)
+		indexName = set + bin3.Name
+		idxTask, err := client.CreateIndex(wpolicy, ns, set, indexName, bin3.Name, NUMERIC)
 		Expect(err).ToNot(HaveOccurred())
 
 		// wait until index is created
 		Expect(<-idxTask.OnComplete()).ToNot(HaveOccurred())
 	})
 
 	It("must return error if more than onlt filter passed to the command", func() {
+		defer client.DropIndex(nil, ns, set, indexName)
+
 		stm := NewStatement(ns, set)
 		stm.Addfilter(NewRangeFilter(bin3.Name, 0, math.MaxInt16/2))
 		stm.Addfilter(NewRangeFilter(bin3.Name, 2, math.MaxInt16/2))
@@ -127,6 +131,8 @@ var _ = Describe("Query operations", func() {
 	})
 
 	It("must Query a range and get all records back", func() {
+		defer client.DropIndex(nil, ns, set, indexName)
+
 		stm := NewStatement(ns, set)
 		recordset, err := client.Query(nil, stm)
 		Expect(err).ToNot(HaveOccurred())
@@ -137,6 +143,8 @@ var _ = Describe("Query operations", func() {
 	})
 
 	It("must Cancel Query abruptly", func() {
+		defer client.DropIndex(nil, ns, set, indexName)
+
 		stm := NewStatement(ns, set)
 		recordset, err := client.Query(nil, stm)
 		Expect(err).ToNot(HaveOccurred())
@@ -147,6 +155,8 @@ var _ = Describe("Query operations", func() {
 	})
 
 	It("must Query a specific range and get only relevant records back", func() {
+		defer client.DropIndex(nil, ns, set, indexName)
+
 		stm := NewStatement(ns, set)
 		stm.Addfilter(NewRangeFilter(bin3.Name, 0, math.MaxInt16/2))
 		recordset, err := client.Query(nil, stm)
@@ -166,6 +176,8 @@ var _ = Describe("Query operations", func() {
 	})
 
 	It("must Query a specific range by applying a udf filter and get only relevant records back", func() {
+		defer client.DropIndex(nil, ns, set, indexName)
+
 		regTask, err := client.RegisterUDF(nil, []byte(udfFilter), "udfFilter.lua", LUA)
 		Expect(err).ToNot(HaveOccurred())
 
@@ -192,6 +204,8 @@ var _ = Describe("Query operations", func() {
 	})
 
 	It("must Query specific equality filters and get only relevant records back", func() {
+		defer client.DropIndex(nil, ns, set, indexName)
+
 		// save a record with requested value
 		key, err := NewKey(ns, set, randString(50))
 		Expect(err).ToNot(HaveOccurred())

diff --git a/udf_test.go b/udf_test.go
@@ -198,6 +198,8 @@ var _ = Describe("UDF/Query tests", func() {
 		It("must run a DeleteUDF on a range of records", func() {
 			idxTask, err := client.CreateIndex(wpolicy, ns, set, set+bin1.Name, bin1.Name, NUMERIC)
 			Expect(err).ToNot(HaveOccurred())
+			defer client.DropIndex(nil, ns, set, set+bin1.Name)
+
 			Expect(<-idxTask.OnComplete()).ToNot(HaveOccurred())
 
 			regTask, err := client.RegisterUDF(wpolicy, []byte(udfDelete), "udfDelete.lua", LUA)