Add tests for openxlsheet and fix some small bugs

queryverse · Mar 17, 2015 · 0c475ea · 0c475ea
1 parent 011de02
commit 0c475ea
Show file tree

Hide file tree

Showing 2 changed files with 125 additions and 2 deletions.
diff --git a/src/ExcelReaders.jl b/src/ExcelReaders.jl
@@ -74,14 +74,38 @@ function readxlsheet(file::ExcelFile, sheetname::String; skipstartrows::Int=0, s
 		end
 
 		if skipblankrows==:notset
-			skipblankrows = :start
+			if skipstartrows==0 && nrows==-1
+				skipblankrows = :start
+			else
+				skipblankrows = :none
+			end
 		end
 
 		if skipblankcols==:notset
-			skipblankcols = :start
+			if skipstartcols==0 && ncols==-1
+				skipblankcols = :start
+			else
+				skipblankcols = :none
+			end
 		end
 	end
 
+	if skipblankrows!=:none && skipstartrows>0
+		error("When skipstartrows is used, no option to skip blank rows can be used.")
+	end
+
+	if skipblankcols!=:none && skipstartcols>0
+		error("When skipstartcols is used, no option to skip blank cols can be used.")
+	end
+
+	if skipblankrows!=:none && nrows!=-1
+		error("When nrows is used, no option to skip blank rows can be used.")
+	end
+
+	if skipblankcols!=:none && ncols!=-1
+		error("When ncols is used, no option to skip blank cols can be used.")
+	end
+
 	sheet = file.workbook[:sheet_by_name](sheetname)
 
 	startrow = 1 + skipstartrows

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -166,4 +166,103 @@ for f in [file, filename]
 
 	# Too few colnames
 	@test_throws ErrorException df = readxl(DataFrame, f, "Sheet1!C3:N7", header=true, colnames=[:c1, :c2, :c3, :c4])
+
+	# Test readxlsheet function
+	for sheetinfo=["Second Sheet", 2]
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblanks=:nonsense)
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblankrows=:nonsense)
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblankcols=:nonsense)
+
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblanks=:all, skipblankrows=:start)
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblanks=:start, skipblankcols=:all)
+
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblanks=:all, skipblankrows=2)
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblanks=:start, skipblankcols=2)
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblanks=:all, nrows=2)
+		@test_throws ErrorException readxlsheet(f, sheetinfo, skipblanks=:start, ncols=2)
+
+		data = readxlsheet(f, sheetinfo)
+		@test size(data) == (6, 6)
+		@test data[2,1] == 1.
+		@test data[5,2] == "CCC"
+		@test data[3,3] == false
+		@test data[6,6] == ExcelReaders.Time(15,2,00)
+		@test isna(data[4,3])
+		@test isna(data[4,6])
+
+		data = readxlsheet(f, sheetinfo, skipblanks=:start)
+		@test size(data) == (6, 6)
+		@test data[2,1] == 1.
+		@test data[5,2] == "CCC"
+		@test data[3,3] == false
+		@test data[6,6] == ExcelReaders.Time(15,2,00)
+		@test isna(data[4,3])
+		@test isna(data[4,6])
+
+		data = readxlsheet(f, sheetinfo, skipblankrows=:start, skipblankcols=:start)
+		@test size(data) == (6, 6)
+		@test data[2,1] == 1.
+		@test data[5,2] == "CCC"
+		@test data[3,3] == false
+		@test data[6,6] == ExcelReaders.Time(15,2,00)
+		@test isna(data[4,3])
+		@test isna(data[4,6])
+
+		data = readxlsheet(f, sheetinfo, skipblanks=:none)
+		@test size(data) == (6+7, 6+3)
+		@test data[2+7,1+3] == 1.
+		@test data[5+7,2+3] == "CCC"
+		@test data[3+7,3+3] == false
+		@test data[6+7,6+3] == ExcelReaders.Time(15,2,00)
+		@test isna(data[4+7,3+3])
+		@test isna(data[4+7,6+3])
+
+		data = readxlsheet(f, sheetinfo, skipblankrows=:none)
+		@test size(data) == (6+7, 6)
+		@test data[2+7,1] == 1.
+		@test data[5+7,2] == "CCC"
+		@test data[3+7,3] == false
+		@test data[6+7,6] == ExcelReaders.Time(15,2,00)
+		@test isna(data[4+7,3])
+		@test isna(data[4+7,6])
+
+		data = readxlsheet(f, sheetinfo, skipblankcols=:none)
+		@test size(data) == (6, 6+3)
+		@test data[2,1+3] == 1.
+		@test data[5,2+3] == "CCC"
+		@test data[3,3+3] == false
+		@test data[6,6+3] == ExcelReaders.Time(15,2,00)
+		@test isna(data[4,3+3])
+		@test isna(data[4,6+3])
+
+		data = readxlsheet(f, sheetinfo, skipblanks=:all)
+		@test size(data) == (5, 5)
+		@test data[2,1] == 1.
+		@test data[4,2] == "CCC"
+		@test data[3,3] == false
+		@test data[5,5] == ExcelReaders.Time(15,2,00)
+
+		data = readxlsheet(f, sheetinfo, skipblankrows=:all, skipblankcols=:all)
+		@test size(data) == (5, 5)
+		@test data[2,1] == 1.
+		@test data[4,2] == "CCC"
+		@test data[3,3] == false
+		@test data[5,5] == ExcelReaders.Time(15,2,00)
+
+		data = readxlsheet(f, sheetinfo, skipblankrows=:all)
+		@test size(data) == (5, 6)
+		@test data[2,1] == 1.
+		@test data[4,2] == "CCC"
+		@test data[3,3] == false
+		@test data[5,6] == ExcelReaders.Time(15,2,00)
+		@test isna(data[2,4])
+
+		data = readxlsheet(f, sheetinfo, skipstartrows=1, skipstartcols=1, nrows=11, ncols=7)
+		@test size(data) == (11, 7)
+		@test data[2+6,1+2] == 1.
+		@test data[5+6,2+2] == "CCC"
+		@test data[3+6,3+2] == false
+		@test_throws BoundsError data[6+6,6+2] == ExcelReaders.Time(15,2,00)
+		@test isna(data[4+6,2+2])
+	end
 end