Moved to Parametrized tests

Author: alexsanjoseph

riemann/sqlite_database_test.go renamed to riemann/database_test.go

@@ -1,36 +1,41 @@
 package riemann_test
 
 import (
-	"os"
 	"sort"
 
 	"github.com/alexsanjoseph/riemann-divisor-sum-go/riemann"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 )
 
-const DBPath = "test.sqlite"
+const DBPath = ":memory:"
 
-var _ = BeforeEach(func() {
-	os.Remove(DBPath)
-	var db = riemann.DivisorDb(&riemann.SqliteDivisorDb{DBPath: DBPath})
-	db.Initialize()
-})
+// const DBPath = "test.sqlite"
 
-var _ = AfterEach(func() {
-	os.Remove(DBPath)
-})
+// var _ = AfterEach(func() {
+// 	os.Remove(DBPath)
+// })
 
-var _ = Describe("Sqlite Database Tests", func() {
+func beforeEachFunc(inputDb riemann.DivisorDb) riemann.DivisorDb {
+	db := riemann.DivisorDb(inputDb)
+	db.Initialize()
+	return db
+}
+
+var _ = Describe("Parametrized Database Tests", func() {
 
-	It("is initially empty", func() {
-		var db = riemann.DivisorDb(&riemann.SqliteDivisorDb{DBPath: DBPath})
+	DescribeTable("is initially empty", func(inputDb riemann.DivisorDb) {
+		db := beforeEachFunc(inputDb)
 		loadedData := db.Load()
 		Expect(len(loadedData)).To(Equal(0))
-	})
 
-	It("Upserts correctly", func() {
-		var db = riemann.DivisorDb(&riemann.SqliteDivisorDb{DBPath: DBPath})
+	},
+		Entry("SQLite", &riemann.SqliteDivisorDb{DBPath: DBPath}),
+		Entry("In-Memory", &riemann.InMemoryDivisorDb{}),
+	)
+
+	DescribeTable("Upserts correctly", func(inputDb riemann.DivisorDb) {
+		db := beforeEachFunc(inputDb)
 		records := []riemann.RiemannDivisorSum{
 			{N: 1, DivisorSum: 1, WitnessValue: 1},
 			{N: 2, DivisorSum: 2, WitnessValue: 2},
@@ -76,10 +81,13 @@ var _ = Describe("Sqlite Database Tests", func() {
 			Expect(loadedData).To(Equal(append(records, expectedNewRecords...)))
 		})
 
-	})
+	},
+		Entry("SQLite", &riemann.SqliteDivisorDb{DBPath: DBPath}),
+		Entry("In-Memory", &riemann.InMemoryDivisorDb{}),
+	)
 
-	It("Summarizes", func() {
-		var db = riemann.DivisorDb(&riemann.SqliteDivisorDb{DBPath: DBPath})
+	DescribeTable("Summarizes", func(inputDb riemann.DivisorDb) {
+		db := beforeEachFunc(inputDb)
 		By("correctly summarizing empty data", func() {
 			summaryData := db.Summarize()
 			expectedSummaryData := riemann.SummaryStats{
@@ -104,10 +112,13 @@ var _ = Describe("Sqlite Database Tests", func() {
 			Expect(summaryData).To(Equal(expectedSummaryData))
 		})
 
-	})
+	},
+		Entry("SQLite", &riemann.SqliteDivisorDb{DBPath: DBPath}),
+		Entry("In-Memory", &riemann.InMemoryDivisorDb{}),
+	)
 
-	It("Summarizes for float values", func() {
-		var db = riemann.DivisorDb(&riemann.SqliteDivisorDb{DBPath: DBPath})
+	DescribeTable("Summarizes for float values", func(inputDb riemann.DivisorDb) {
+		db := beforeEachFunc(inputDb)
 		By("correctly summarizing non-empty data", func() {
 			records := []riemann.RiemannDivisorSum{
 				{N: 10092, DivisorSum: 24388, WitnessValue: 1.088},
@@ -121,6 +132,9 @@ var _ = Describe("Sqlite Database Tests", func() {
 			}
 			Expect(summaryData).To(Equal(expectedSummaryData))
 		})
-	})
+	},
+		Entry("SQLite", &riemann.SqliteDivisorDb{DBPath: DBPath}),
+		Entry("In-Memory", &riemann.InMemoryDivisorDb{}),
+	)
 
 })

riemann/in_memory_database_test.go

@@ -7,22 +7,21 @@ import (
 	. "github.com/onsi/gomega"
 )
 
-var _ = Describe("Populates Database correctly", func() {
-
-	var db = riemann.DivisorDb(&riemann.InMemoryDivisorDb{})
-	db.Initialize()
-	It("Populates and Summarizes correctly", func() {
+var _ = Describe("Parametrized Population tests", func() {
 
+	DescribeTable("Populates, Summarizes and finds StartingN correctly", func(inputDb riemann.DivisorDb) {
+		db := beforeEachFunc(inputDb)
 		riemann.PopulateDB(db, 10070, 10085, 21)
 		summaryData := db.Summarize()
+
 		Expect(summaryData.LargestWitnessValue.N).To(BeEquivalentTo(10080))
 		Expect(summaryData.LargestComputedN.N).To(BeEquivalentTo(10091))
-	})
-
-	It("Finds startingN correctly", func() {
 
 		startingN := riemann.FindStartingNForDB(db, 10075)
 		Expect(startingN).To(BeEquivalentTo(10092))
 
-	})
+	},
+		Entry("SQLite", &riemann.SqliteDivisorDb{DBPath: DBPath}),
+		Entry("In-Memory", &riemann.InMemoryDivisorDb{}),
+	)
 })

riemann/populate_database_test.go

@@ -13,7 +13,7 @@ type SqliteDivisorDb struct {
 	db     *sql.DB
 }
 
-func (sqdb SqliteDivisorDb) Initialize() {
+func (sqdb *SqliteDivisorDb) Initialize() {
 
 	db, err := sql.Open("sqlite3", sqdb.DBPath)
 	if err != nil {
@@ -30,20 +30,10 @@ func (sqdb SqliteDivisorDb) Initialize() {
 	if err != nil {
 		panic(err)
 	}
-	db.Close()
-}
-
-func (sqdb *SqliteDivisorDb) ensureInit() {
-	db, err := sql.Open("sqlite3", sqdb.DBPath)
-	if err != nil {
-		log.Fatal(err)
-	}
 	sqdb.db = db
 }
 
 func (sqdb SqliteDivisorDb) Load() []RiemannDivisorSum {
-	sqdb.ensureInit()
-	defer sqdb.db.Close()
 	sqlStmt := `
             SELECT n, divisor_sum, witness_value
             FROM RiemannDivisorSums
@@ -72,8 +62,6 @@ func (sqdb SqliteDivisorDb) Load() []RiemannDivisorSum {
 }
 
 func (sqdb SqliteDivisorDb) Upsert(rds []RiemannDivisorSum) {
-	sqdb.ensureInit()
-	defer sqdb.db.Close()
 
 	tx, err := sqdb.db.Begin()
 	if err != nil {
@@ -103,12 +91,9 @@ func (sqdb SqliteDivisorDb) Upsert(rds []RiemannDivisorSum) {
 		}
 	}
 	tx.Commit()
-	sqdb.db.Close()
 }
 
 func (sqdb SqliteDivisorDb) Summarize() SummaryStats {
-	sqdb.ensureInit()
-	defer sqdb.db.Close()
 
 	largestNStms := `
 	SELECT *