Skip to content

Commit

Permalink
Bump version to 1.4.0 & run tests
Browse files Browse the repository at this point in the history
  • Loading branch information
djvill committed Apr 22, 2024
1 parent 3cb253f commit 2b53614
Show file tree
Hide file tree
Showing 42 changed files with 330,866 additions and 76,674 deletions.
2 changes: 1 addition & 1 deletion app.R
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ library(dplyr)
# Parameters ------------------------------------------------------------------

##Version
vers <- "1.3.1"
vers <- "1.4.0"

##File structures
##Regex for extracting SpkrCode column from filenames
Expand Down
88 changes: 58 additions & 30 deletions tests/shinytest/test-step0-expected/All.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,46 +5,72 @@
"export": {
"fileDF": [
{
"File": "HD06-1_BadFileExt.eaff",
"FileExt": "eaff",
"FileExtValid": false,
"SpkrCodeValid": true,
"FileNameValid": false,
"name": "HD06-1_ActuallyATextGrid.eaf",
"SpkrCode": "HD06",
"Neighborhood": "HD",
"SpeakerNum": 6,
"FileSuffix": "-1_BadFileExt",
"type": ""
"FileExt": "eaf"
},
{
"File": "HD06-1_NoIssues.eaf",
"FileExt": "eaf",
"FileExtValid": true,
"SpkrCodeValid": true,
"FileNameValid": true,
"name": "HD06-1_BadFileExt.eaff",
"SpkrCode": "HD06",
"Neighborhood": "HD",
"FileExt": "eaff"
},
{
"name": "HD06-1_NoIssues.eaf",
"SpkrCode": "HD06",
"Neighborhood": "HD",
"SpeakerNum": 6,
"FileSuffix": "-1_NoIssues",
"type": ""
"FileExt": "eaf"
},
{
"name": "MultipleIssues_HD06-1.eafF",
"FileExt": "eafF"
},
{
"name": "SpeakerCodeNonInitial_HD06-1.eaf",
"FileExt": "eaf"
}
],
"validationDF": [
{
"name": "HD06-1_ActuallyATextGrid.eaf",
"FileExtValid": true,
"SpkrCodeValid": true,
"FileReadValid": false,
"Valid": false
},
{
"name": "HD06-1_BadFileExt.eaff",
"FileExtValid": false,
"SpkrCodeValid": true,
"FileReadValid": true,
"Valid": false
},
{
"name": "HD06-1_NoIssues.eaf",
"FileExtValid": true,
"SpkrCodeValid": true,
"FileReadValid": true,
"Valid": true
},
{
"name": "MultipleIssues_HD06-1.eafF",
"FileExtValid": false,
"SpkrCodeValid": false,
"FileReadValid": true,
"Valid": false
},
{
"File": "SpeakerCodeNonInitial_HD06-1.eaf",
"FileExt": "eaf",
"name": "SpeakerCodeNonInitial_HD06-1.eaf",
"FileExtValid": true,
"SpkrCodeValid": false,
"FileNameValid": false,
"type": ""
"FileReadValid": true,
"Valid": false
}
]
},
"elements": {
"stepHeads": [
{
"id": "fileNameHead",
"class": "bad",
"displayed": true
},
{
"id": "tierHead",
"class": "grayout",
Expand All @@ -63,7 +89,7 @@
],
"stepSubheads": [
{
"id": "fileNameSubhead",
"id": "fileCheckSubhead",
"displayed": true
},
{
Expand All @@ -85,9 +111,9 @@
],
"stepDetails": [
{
"id": "checkDetails",
"id": "fileList",
"hasContent": true,
"content": "<ul id=\"checkDetails\" class=\"details\">\n<li class=\"bad\">HD06-1_BadFileExt.eaff<\/li>\n <li class=\"\">HD06-1_NoIssues.eaf<\/li>\n <li class=\"bad\">SpeakerCodeNonInitial_HD06-1.eaf<\/li>\n<\/ul>\n"
"content": "<ul id=\"fileList\" class=\"details\">\n<li class=\"bad\">HD06-1_ActuallyATextGrid.eaf<\/li>\n <li class=\"bad\">HD06-1_BadFileExt.eaff<\/li>\n <li class=\"\">HD06-1_NoIssues.eaf<\/li>\n <li class=\"bad\">MultipleIssues_HD06-1.eafF<\/li>\n <li class=\"bad\">SpeakerCodeNonInitial_HD06-1.eaf<\/li>\n<\/ul>\n"
},
{
"id": "tierDetails",
Expand All @@ -106,11 +132,13 @@
}
],
"lastDetailID": [
"checkDetails"
"fileList"
],
"checkDetails": [
"fileList": [
"HD06-1_ActuallyATextGrid.eaf",
"HD06-1_BadFileExt.eaff",
"HD06-1_NoIssues.eaf",
"MultipleIssues_HD06-1.eafF",
"SpeakerCodeNonInitial_HD06-1.eaf"
]
}
Expand Down
Binary file modified tests/shinytest/test-step0-expected/All.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"success": [
false
],
"export": {
"fileDF": [
{
"name": "HD06-1_ActuallyATextGrid.eaf",
"SpkrCode": "HD06",
"Neighborhood": "HD",
"FileExt": "eaf"
}
],
"validationDF": [
{
"name": "HD06-1_ActuallyATextGrid.eaf",
"FileExtValid": true,
"SpkrCodeValid": true,
"FileReadValid": false,
"Valid": false
}
]
},
"elements": {
"stepHeads": [
{
"id": "tierHead",
"class": "grayout",
"displayed": true
},
{
"id": "dictHead",
"class": "grayout",
"displayed": true
},
{
"id": "overlapsHead",
"class": "grayout",
"displayed": true
}
],
"stepSubheads": [
{
"id": "fileCheckSubhead",
"displayed": true
},
{
"id": "tierSubhead",
"displayed": false
},
{
"id": "dictSubhead",
"displayed": false
},
{
"id": "overlapsSubhead",
"displayed": false
},
{
"id": "downloadSubhead",
"displayed": false
}
],
"stepDetails": [
{
"id": "fileList",
"hasContent": true,
"content": "<ul id=\"fileList\" class=\"details\">\n<li class=\"bad\">HD06-1_ActuallyATextGrid.eaf<\/li>\n<\/ul>\n"
},
{
"id": "tierDetails",
"hasContent": false,
"content": "<ul id=\"tierDetails\" class=\"details\" style=\"display: none;\"><\/ul>\n"
},
{
"id": "dictDetails",
"hasContent": false,
"content": "<ul id=\"dictDetails\" class=\"details\" style=\"display: none;\"><\/ul>\n"
},
{
"id": "overlapsDetails",
"hasContent": false,
"content": "<ul id=\"overlapsDetails\" class=\"details\" style=\"display: none;\"><\/ul>\n"
}
],
"lastDetailID": [
"fileList"
],
"fileList": [
"HD06-1_ActuallyATextGrid.eaf"
]
}
}

34 changes: 16 additions & 18 deletions tests/shinytest/test-step0-expected/HD06-1_BadFileExt.eaff.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,24 @@
"export": {
"fileDF": [
{
"File": "HD06-1_BadFileExt.eaff",
"FileExt": "eaff",
"FileExtValid": false,
"SpkrCodeValid": true,
"FileNameValid": false,
"name": "HD06-1_BadFileExt.eaff",
"SpkrCode": "HD06",
"Neighborhood": "HD",
"SpeakerNum": 6,
"FileSuffix": "-1_BadFileExt",
"type": ""
"FileExt": "eaff"
}
],
"validationDF": [
{
"name": "HD06-1_BadFileExt.eaff",
"FileExtValid": false,
"SpkrCodeValid": true,
"FileReadValid": true,
"Valid": false
}
]
},
"elements": {
"stepHeads": [
{
"id": "fileNameHead",
"class": "bad",
"displayed": true
},
{
"id": "tierHead",
"class": "grayout",
Expand All @@ -43,7 +41,7 @@
],
"stepSubheads": [
{
"id": "fileNameSubhead",
"id": "fileCheckSubhead",
"displayed": true
},
{
Expand All @@ -65,9 +63,9 @@
],
"stepDetails": [
{
"id": "checkDetails",
"id": "fileList",
"hasContent": true,
"content": "<ul id=\"checkDetails\" class=\"details\">\n<li class=\"bad\">HD06-1_BadFileExt.eaff<\/li>\n<\/ul>\n"
"content": "<ul id=\"fileList\" class=\"details\">\n<li class=\"bad\">HD06-1_BadFileExt.eaff<\/li>\n<\/ul>\n"
},
{
"id": "tierDetails",
Expand All @@ -86,9 +84,9 @@
}
],
"lastDetailID": [
"checkDetails"
"fileList"
],
"checkDetails": [
"fileList": [
"HD06-1_BadFileExt.eaff"
]
}
Expand Down
Loading

0 comments on commit 2b53614

Please sign in to comment.