Merge pull request #39 from umpc/dev

Remove iter testing debug code from delete tests. Addressed lint warning. gofmt.

delete_test.go

@@ -85,67 +85,15 @@ func TestBoundedDelete(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	func() {
-		iterCh, err := sm.IterCh()
-		if err != nil {
-
-		} else {
-			defer iterCh.Close()
-
-			if err := verifyRecords(iterCh.Records(), false); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
 	if err := sm.BoundedDelete(earlierDate, time.Now()); err != nil {
 		t.Fatal(err)
 	}
 
-	func() {
-		iterCh, err := sm.IterCh()
-		if err != nil {
-
-		} else {
-			defer iterCh.Close()
-
-			if err := verifyRecords(iterCh.Records(), false); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
 	if err := sm.BoundedDelete(time.Now(), earlierDate); err == nil {
 		t.Fatal(shouldFailErr)
 	}
 
-	func() {
-		iterCh, err := sm.IterCh()
-		if err != nil {
-
-		} else {
-			defer iterCh.Close()
-
-			if err := verifyRecords(iterCh.Records(), false); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
-
 	if err := sm.BoundedDelete(earlierDate, earlierDate); err == nil {
 		t.Fatal(shouldFailErr)
 	}
-
-	func() {
-		iterCh, err := sm.IterCh()
-		if err != nil {
-
-		} else {
-			defer iterCh.Close()
-
-			if err := verifyRecords(iterCh.Records(), false); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}()
 }

iter.go

@@ -69,7 +69,7 @@ func (sm *SortedMap) sendRecord(iterCh IterChCloser, sendTimeout time.Duration,
 
 		case iterCh.ch <- sm.recordFromIdx(i):
 			return true
-		}		
+		}
 	}
 
 	select {

iter_test.go

@@ -194,15 +194,15 @@ func TestBoundedIterCh(t *testing.T) {
 func TestBounds(t *testing.T) {
 	sm := New(4, asc.Time)
 
-	obsd     := time.Date(1995, 10, 18,  8, 37, 1, 0, time.UTC)
-	unixtime := time.Date(1970,  1,  1,  0,  0, 0, 0, time.UTC)
-	linux    := time.Date(1991,  8, 25, 20, 57, 8, 0, time.UTC)
-	github   := time.Date(2008,  4, 10,  0,  0, 0, 0, time.UTC)
+	obsd := time.Date(1995, 10, 18, 8, 37, 1, 0, time.UTC)
+	unixtime := time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC)
+	linux := time.Date(1991, 8, 25, 20, 57, 8, 0, time.UTC)
+	github := time.Date(2008, 4, 10, 0, 0, 0, 0, time.UTC)
 
-	sm.Insert("OpenBSD",  obsd)
+	sm.Insert("OpenBSD", obsd)
 	sm.Insert("UnixTime", unixtime)
-	sm.Insert("Linux",    linux)
-	sm.Insert("GitHub",   github)
+	sm.Insert("Linux", linux)
+	sm.Insert("GitHub", github)
 
 	reversed := false
 
@@ -338,8 +338,8 @@ func TestCloseCustomIterCh(t *testing.T) {
 
 	params := IterChParams{
 		SendTimeout: 5 * time.Minute,
-		LowerBound: earlierDate,
-		UpperBound: laterDate,
+		LowerBound:  earlierDate,
+		UpperBound:  laterDate,
 	}
 
 	ch, err = sm.CustomIterCh(params)

testing_utils_test.go

@@ -90,10 +90,10 @@ func newSortedMapFromRandRecords(n int) (*SortedMap, []Record, error) {
 	iterCh, err := sm.IterCh()
 	if err != nil {
 		return sm, records, err
-	} else {
-		defer iterCh.Close()
-		return sm, records, verifyRecords(iterCh.Records(), false)
 	}
+	defer iterCh.Close()
+
+	return sm, records, verifyRecords(iterCh.Records(), false)
 }
 
 func newRandSortedMapWithKeys(n int) (*SortedMap, []Record, []interface{}, error) {