Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MIES_AnalysisFunctionPrototypes.ipf: Assert out #2285

Merged
merged 2 commits into from
Oct 22, 2024
Merged

MIES_AnalysisFunctionPrototypes.ipf: Assert out #2285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d62af6
MIES_AnalysisFunctionPrototypes.ipf: Assert out
t-b Oct 22, 2024
8169449
tests/Basic/Basic.pxp: Clean it up
t-b Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions Packages/MIES/MIES_AnalysisFunctionPrototypes.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ Function AFP_ANALYSIS_FUNC_V1(device, eventType, DAQDataWave, headStage)
variable eventType
WAVE DAQDataWave
variable headstage

ASSERT(0, "Prototype function which must not be called")
End

/// @deprecated Use AFP_ANALYSIS_FUNC_V3() instead
Expand All @@ -44,7 +46,7 @@ Function AFP_ANALYSIS_FUNC_V2(device, eventType, DAQDataWave, headStage, realDat
WAVE DAQDataWave
variable headstage, realDataLength

return 0
ASSERT(0, "Prototype function which must not be called")
End

/// @param device device
Expand All @@ -55,28 +57,34 @@ Function AFP_ANALYSIS_FUNC_V3(device, s)
string device
STRUCT AnalysisFunction_V3 &s

return 0
ASSERT(0, "Prototype function which must not be called")
End

/// @brief Prototype function for the user supplied parameter getter functions
///
Function/S AFP_PARAM_GETTER_V3()

ASSERT(0, "Prototype function which must not be called")
End

/// @brief Prototype function for the user supplied parameter help functions
///
Function/S AFP_PARAM_HELP_GETTER_V3(name)
string name

ASSERT(0, "Prototype function which must not be called")
End

/// @brief Prototype function for the user supplied parameter check function (legacy signature)
///
Function/S AFP_PARAM_CHECK_V1(string name, string params)

ASSERT(0, "Prototype function which must not be called")
End

/// @brief Prototype function for the user supplied parameter check function
///
Function/S AFP_PARAM_CHECK_V2(string name, STRUCT CheckParametersStruct &s)

ASSERT(0, "Prototype function which must not be called")
End
Binary file modified Packages/tests/Basic/Basic.pxp
View file
Open in desktop
Binary file not shown.
51 changes: 51 additions & 0 deletions Packages/tests/Basic/UTF_AnalysisFunctionPrototypes.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
#pragma TextEncoding="UTF-8"
#pragma rtGlobals=3 // Use modern global access method and strict wave access.
#pragma rtFunctionErrors=1
#pragma ModuleName=AnalysisFunctionPrototypeTests

static Function CheckThatTheyAllAssertOut()

string funcList, func

funcList = FunctionList("*", ";", "WIN:MIES_AnalysisFunctionPrototypes.ipf")
CHECK_PROPER_STR(funcList)

WAVE/T funcs = ListToTextWave(funcList, ";")

for(func : funcs)
INFO("Function %s", s0 = func)

try
strswitch(func)
case "AFP_ANALYSIS_FUNC_V1":
AFP_ANALYSIS_FUNC_V1("", NaN, $"", NaN)
break
case "AFP_ANALYSIS_FUNC_V2":
AFP_ANALYSIS_FUNC_V2("", NaN, $"", NaN, NaN)
break
case "AFP_ANALYSIS_FUNC_V3":
STRUCT AnalysisFunction_V3 af
AFP_ANALYSIS_FUNC_V3("", af)
break
case "AFP_PARAM_GETTER_V3":
AFP_PARAM_GETTER_V3()
break
case "AFP_PARAM_HELP_GETTER_V3":
AFP_PARAM_HELP_GETTER_V3("")
break
case "AFP_PARAM_CHECK_V1":
AFP_PARAM_CHECK_V1("", "")
break
case "AFP_PARAM_CHECK_V2":
STRUCT CheckParametersStruct cp
AFP_PARAM_CHECK_V2("", cp)
break
default:
FAIL()
endswitch
FAIL()
catch
CHECK_NO_RTE()
endtry
endfor
End
2 changes: 2 additions & 0 deletions Packages/tests/Basic/UTF_Basic.ipf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include "UTF_AnalysisBrowserTest"
#include "UTF_AnalysisFunctionHelpers"
#include "UTF_AnalysisFunctionParameters"
#include "UTF_AnalysisFunctionPrototypes"
#include "UTF_AsynFrameworkTest"
#include "UTF_Configuration"
#include "UTF_DAEphyswoHardware"
Expand Down Expand Up @@ -122,6 +123,7 @@ Function RunWithOpts([string testcase, string testsuite, variable allowdebug, va
list = AddListItem("UTF_AnalysisBrowserTest.ipf", list, ";", Inf)
list = AddListItem("UTF_AnalysisFunctionHelpers.ipf", list, ";", Inf)
list = AddListItem("UTF_AnalysisFunctionParameters.ipf", list, ";", Inf)
list = AddListItem("UTF_AnalysisFunctionPrototypes.ipf", list, ";", Inf)
list = AddListItem("UTF_AsynFrameworkTest.ipf", list, ";", Inf)
list = AddListItem("UTF_Debugging.ipf", list, ";", Inf)
list = AddListItem("UTF_Configuration.ipf", list, ";", Inf)
Expand Down