renamed tests and wrote a test for the whole program

2 files changed, 84 insertions, 32 deletions

diff --git a/cleaner_test.go b/cleaner_test.go
new file mode 100644
index 0000000..d1eb870
--- /dev/null
+++ b/cleaner_test.go
@@ -0,0 +1,84 @@
+package main
+
+import (
+	"database/sql"
+	_ "github.com/go-sql-driver/mysql"
+	"testing"
+	"time"
+)
+
+func TestDataFetching(t *testing.T) {
+	//initialize db
+	db, err := sql.Open("mysql", "test:test@/test")
+	if err != nil {
+		t.Fatal("Failed to connect to db")
+		return
+	}
+	defer db.Close()
+
+	//fetch the data from the db
+	rDat, err := fetchRawData(db, time.Now())
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	if len(rDat) != 5 {
+		t.Fatal("Fetched the wrong number of rows:", len(rDat))
+	}
+	if rDat[2].ipSrc != "8.8.8.8" {
+		t.Fatal("contents of ip in data is incorrect")
+	}
+	//TODO add more tests
+}
+
+func TestCleaning(t *testing.T) {
+	conf := Config{
+		Volumes: []VolumeInfo{
+			VolumeInfo{
+				Size:  "small",
+				Lower: 0,
+				Upper: 100,
+			},
+			VolumeInfo{
+				Size:  "medium",
+				Lower: 100,
+				Upper: 0,
+			},
+		},
+		Interval: "10min",
+		Epsilon:  0,
+	}
+
+	err := cleanData(conf, "test", "test", "", "test")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	db, err := sql.Open("mysql", "test:test@/test")
+	if err != nil {
+		t.Fatal("Failed to connect to db")
+		return
+	}
+	defer db.Close()
+
+	rDat, err := fetchRawData(db, time.Now())
+	if err != nil {
+		t.Fatal(err)
+	}
+	if len(rDat) > 0 {
+		t.Fatal()
+	}
+	rows, err := db.Query("SELECT * FROM clean_data;")
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	counter := 0
+	for rows.Next() {
+		counter++
+	}
+	if counter != 3 {
+		t.Fatal("Wrong number of cleaned rows")
+	}
+
+}
diff --git a/sqlQueries_test.go b/sqlQueries_test.go
deleted file mode 100644
index 6ab904e..0000000
--- a/sqlQueries_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package main
-
-import (
-	"database/sql"
-	_ "github.com/go-sql-driver/mysql"
-	"testing"
-	"time"
-)
-
-func TestDataFetching(t *testing.T) {
-	//initialize db
-	db, err := sql.Open("mysql", "test:test@/test")
-	if err != nil {
-		t.Fatal("Failed to connect to db")
-		return
-	}
-	defer db.Close()
-
-	//fetch the data from the db
-	rDat, err := fetchRawData(db, time.Now())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(rDat) != 5 {
-		t.Fatal("did not fetch data as it should")
-	}
-	if rDat[2].ipSrc != "8.8.8.8" {
-		t.Fatal("contents of ip in data is incorrect")
-	}
-	//TODO add more tests
-}