[Groonga-commit] groonga/grngo at 421be90 [master] Replace TestCreateDB() and TestOpenDB() with TestDB().

Back to archive index

susumu.yata null+****@clear*****
Wed Jul 29 21:59:39 JST 2015


susumu.yata	2015-07-29 21:59:39 +0900 (Wed, 29 Jul 2015)

  New Revision: 421be903a3d5ab985a22054c4d8d1989c9ab08be
  https://github.com/groonga/grngo/commit/421be903a3d5ab985a22054c4d8d1989c9ab08be

  Message:
    Replace TestCreateDB() and TestOpenDB() with TestDB().

  Modified files:
    grngo_test.go

  Modified: grngo_test.go (+18 -15)
===================================================================
--- grngo_test.go    2015-07-29 19:13:38 +0900 (b69a48d)
+++ grngo_test.go    2015-07-29 21:59:39 +0900 (fa1a2e4)
@@ -255,6 +255,24 @@ func removeTempDB(tb testing.TB, dirPath string, db *DB) {
 
 // Tests.
 
+func TestDB(t *testing.T) {
+	dirPath, dbPath, db := createTempDB(t)
+	defer os.RemoveAll(dirPath)
+	if err := db.Close(); err != nil {
+		t.Fatalf("DB.Close() failed: %v", err)
+	}
+	db, err := OpenDB(dbPath)
+	if err != nil {
+		t.Fatalf("OpenDB() failed: %v", err)
+	}
+	defer db.Close()
+	db2, err := OpenDB(dbPath)
+	if err != nil {
+		t.Fatalf("OpenDB() failed: %v", err)
+	}
+	defer db2.Close()
+}
+
 func TestKey(t *testing.T) {
 	dirPath, _, db := createTempDB(t)
 	defer removeTempDB(t, dirPath, db)
@@ -338,21 +356,6 @@ func TestValue(t *testing.T) {
 	}
 }
 
-func TestCreateDB(t *testing.T) {
-	dirPath, _, db := createTempDB(t)
-	defer removeTempDB(t, dirPath, db)
-}
-
-func TestOpenDB(t *testing.T) {
-	dirPath, dbPath, db := createTempDB(t)
-	defer removeTempDB(t, dirPath, db)
-	db2, err := OpenDB(dbPath)
-	if err != nil {
-		t.Fatalf("OpenDB() failed: %v", err)
-	}
-	defer db2.Close()
-}
-
 func TestDBRefresh(t *testing.T) {
 	dirPath, _, db, _, _ := createTempColumn(t, "Table", nil, "Value", "Bool", nil)
 	defer removeTempDB(t, dirPath, db)
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-commit mailing list
Back to archive index