From 7a47e9fec3ad12ce95f17f275531cbdf69f2ebab Mon Sep 17 00:00:00 2001
From: Matthew Lemon <matt@matthewlemon.com>
Date: Wed, 29 Jul 2020 09:20:06 +0100
Subject: removed short dir in testdata

---
 Makefile                                                 |   2 +-
 pkg/datamaps/db_test.go                                  |   2 +-
 pkg/datamaps/reader_test.go                              |   2 +-
 pkg/datamaps/testdata/datamap_matches_test_template.csv  |  10 ++++++++++
 .../testdata/short/datamap_matches_test_template.csv     |  10 ----------
 pkg/datamaps/testdata/short/test_template.xlsm           | Bin 9193 -> 0 bytes
 6 files changed, 13 insertions(+), 13 deletions(-)
 create mode 100644 pkg/datamaps/testdata/datamap_matches_test_template.csv
 delete mode 100644 pkg/datamaps/testdata/short/datamap_matches_test_template.csv
 delete mode 100644 pkg/datamaps/testdata/short/test_template.xlsm

diff --git a/Makefile b/Makefile
index b016b66..4272ac2 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ dummy-import:
 	./datamaps import --returnname "Hunkers" --datamapname "Tonk 1" --xlsxpath pkg/datamaps/testdata/
 
 dummy-datamap-import:
-	./datamaps datamap --datamapname "Tonk 1" --import  pkg/datamaps/testdata/short/datamap_matches_test_template.csv
+	./datamaps datamap --datamapname "Tonk 1" --import  pkg/datamaps/testdata/datamap_matches_test_template.csv
 
 build:
 	go build -o datamaps ./cmd/datamaps/main.go
diff --git a/pkg/datamaps/db_test.go b/pkg/datamaps/db_test.go
index 88fa640..ecf0f6c 100644
--- a/pkg/datamaps/db_test.go
+++ b/pkg/datamaps/db_test.go
@@ -14,7 +14,7 @@ var singleTarget string = "./testdata/test_template.xlsm"
 var opts = Options{
 	DBPath: "./testdata/test.db",
 	DMName: "First Datamap",
-	DMPath: "./testdata/short/datamap_matches_test_template.csv",
+	DMPath: "./testdata/datamap_matches_test_template.csv",
 }
 
 func dbSetup() (*sql.DB, error) {
diff --git a/pkg/datamaps/reader_test.go b/pkg/datamaps/reader_test.go
index 1a11b0d..acecf8d 100644
--- a/pkg/datamaps/reader_test.go
+++ b/pkg/datamaps/reader_test.go
@@ -162,7 +162,7 @@ func TestExtractUsingDBDM(t *testing.T) {
 	opts := Options{
 		DBPath: "./testdata/test.db",
 		DMName: "First Datamap",
-		DMPath: "./testdata/short/datamap_matches_test_template.csv",
+		DMPath: "./testdata/datamap_matches_test_template.csv",
 	}
 
 	if err := DatamapToDB(&opts); err != nil {
diff --git a/pkg/datamaps/testdata/datamap_matches_test_template.csv b/pkg/datamaps/testdata/datamap_matches_test_template.csv
new file mode 100644
index 0000000..9ff8c8c
--- /dev/null
+++ b/pkg/datamaps/testdata/datamap_matches_test_template.csv
@@ -0,0 +1,10 @@
+cell_key,template_sheet,cellreference
+A Ten,Introduction,A1
+A Test,Introduction,C9
+A Vunt,Introduction,C22
+Floaty,Another Sheet,D5
+A Parrot,Introduction,J9
+A String,Summary,B3
+A Float,Summary,B4
+A Number,Another Sheet,N34
+A Rabbit,Another Sheet,DI15
diff --git a/pkg/datamaps/testdata/short/datamap_matches_test_template.csv b/pkg/datamaps/testdata/short/datamap_matches_test_template.csv
deleted file mode 100644
index 9ff8c8c..0000000
--- a/pkg/datamaps/testdata/short/datamap_matches_test_template.csv
+++ /dev/null
@@ -1,10 +0,0 @@
-cell_key,template_sheet,cellreference
-A Ten,Introduction,A1
-A Test,Introduction,C9
-A Vunt,Introduction,C22
-Floaty,Another Sheet,D5
-A Parrot,Introduction,J9
-A String,Summary,B3
-A Float,Summary,B4
-A Number,Another Sheet,N34
-A Rabbit,Another Sheet,DI15
diff --git a/pkg/datamaps/testdata/short/test_template.xlsm b/pkg/datamaps/testdata/short/test_template.xlsm
deleted file mode 100644
index 77ac56f..0000000
Binary files a/pkg/datamaps/testdata/short/test_template.xlsm and /dev/null differ
-- 
cgit v1.2.3