update tests to account for changed structure of source data

colindouglas · Feb 20, 2024 · dfc0ab3 · dfc0ab3
1 parent 0226c41
commit dfc0ab3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/R/getRetrosheet.R b/R/getRetrosheet.R
@@ -66,7 +66,7 @@ getRetrosheet <- function(type, year, team, schedSplit = NULL, stringsAsFactors
         "game" = "/gamelogs/gl%d.zip",
         "play" = "/events/%deve.zip",
         "roster" = "/events/%deve.zip",
-        "schedule" = "/schedule/%dSKED.ZIP")
+        "schedule" = "/schedule/%dSKED.zip")
 
     # If cache is NA, download to a temp location
     if (is.na(cache)) {
@@ -107,7 +107,7 @@ getRetrosheet <- function(type, year, team, schedSplit = NULL, stringsAsFactors
 
     if(type == "schedule") {
         zcon <- unz(tmp, filename = fname)
-        out <- read.csv(zcon, header = FALSE, col.names = retrosheetFields$schedule,
+        out <- read.csv(zcon, header = TRUE, col.names = retrosheetFields$schedule,
                         stringsAsFactors = stringsAsFactors)
         out <- out[!is.na(out$GameNo), ] # Filter out the last line, which is often parsed incorrectly
         if(is.character(schedSplit)) {

diff --git a/tests/testthat/test-getRetrosheet.R b/tests/testthat/test-getRetrosheet.R
@@ -25,7 +25,7 @@ test_that("Caching works", {
     expect_equal(play_1, play_2)
 
     # Re-using cached data should give a message about using a local cache
-    expect_message(getRetrosheet("schedule", 1995, cache = "testdata"), "Using local cache: testdata/schedule/1995SKED.ZIP")
+    expect_message(getRetrosheet("schedule", 1995, cache = "testdata"), "Using local cache: testdata/schedule/1995SKED.zip")
 
 })
 
@@ -50,8 +50,9 @@ test_that("Roster downloading works", {
 
     roster <- getRetrosheet("roster", 1995, cache = "testdata")
 
-    # In 1995, there should be 28 regular teams plus All Star teams (NLS + ALS)
-    expect_equal(length(roster), 28 + 2)
+    # In 1995, there should be 28 regular teams
+    # The two All Star teams (NLS + ALS) are no longer included in these data
+    expect_equal(length(roster), 28)
 
     # Toronto has 39 players on their roster
     expect_equal(nrow(roster$TOR), 39)

diff --git a/tests/testthat/test-get_retrosheet.R b/tests/testthat/test-get_retrosheet.R
@@ -23,7 +23,7 @@ test_that("Caching works", {
     expect_equal(play_1, play_2)
 
     # Re-using cached data should give a message about using a local cache
-    expect_message(get_retrosheet("schedule", 1995, cache = "testdata"), "Using local cache: testdata/schedule/1995SKED.ZIP")
+    expect_message(get_retrosheet("schedule", 1995, cache = "testdata"), "Using local cache: testdata/schedule/1995SKED.zip")
 
 })
 
@@ -62,8 +62,9 @@ test_that("Roster downloading works", {
 
     roster <- get_retrosheet("roster", 1995, cache = "testdata")
 
-    # In 1995, there should be 28 regular teams plus All Star teams (NLS + ALS)
-    expect_equal(length(roster), 28 + 2)
+    # In 1995, there should be 28 regular teams
+    # The two All Star teams (NLS + ALS) are no longer included in these data
+    expect_equal(length(roster), 28)
 
     # In 1995, 39 different players played for TOR
     expect_equal(nrow(roster$TOR), 39)