Fix #5464 - Properly handle "Separator" argument #5471
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…mLogSink
/media/DataExt4/Software/Others/OpenStudio3/src/measure/test/OSMeasure_GTest.cpp:523: Failure
Expected equality of these values:
0
sink.logMessages().size()
Which is: 1
[BOOST_ASSERT] <2> Assertion false failed on line 585 of bool openstudio::measure::OSRunner::validateUserArguments(const std::vector<openstudio::measure::OSArgument>&, const std::map<std::__cxx11::basic_string<char>, openstudio::measure::OSArgument>&) in file /media/DataExt4/Software/Others/OpenStudio3/src/measure/OSRunner.cpp.
cf #5464 (comment) ``` [openstudio.XMLValidator] <1> xsdValidate.parseFileError: XML error 17.1840: Element 'type': [facet 'enumeration'] The value 'Separator' is not an element of the set {'Boolean', 'Double', 'Integer', 'String', 'Choice', 'Path'}. at /home/julien/Downloads/temp/5464/RubyModelMeasure/measure.xml:17 while processing "Separator" [openstudio.XMLValidator] <1> xsdValidate.parseFileError: XML error 17.1840: Element 'type': [facet 'enumeration'] The value 'Separator' is not an element of the set {'Boolean', 'Double', 'Integer', 'String', 'Choice', 'Path'}. ```
jmarrec
commented
Aug 21, 2025
Comment on lines
+412
to
+415
| if (script_argument.type().value() == OSArgumentType::Separator) { | ||
| // skip separators | ||
| continue; | ||
| } |
Collaborator
Author
There was a problem hiding this comment.
No point validating it.
Comment on lines
+477
to
+478
| arg = OSArgument::makeSeparatorArgument("separator"); | ||
| result.push_back(arg); |
Collaborator
Author
There was a problem hiding this comment.
New Test, failing before
Comment on lines
+515
to
+524
| StringStreamLogSink sink; | ||
| sink.setLogLevel(Fatal); | ||
|
|
||
| // call with a good value | ||
| double_arg.setValue(-1.0); | ||
| int_arg.setValue(1.0); | ||
| EXPECT_TRUE(measure.run(model, runner, argumentMap)); | ||
|
|
||
| EXPECT_EQ(0, sink.logMessages().size()) << sink.string(); | ||
| sink.resetStringStream(); |
Collaborator
Author
There was a problem hiding this comment.
Fails before
[ RUN ] MeasureFixture.ModelMeasureWithSeparator
/media/DataExt4/Software/Others/OpenStudio3/src/measure/test/OSMeasure_GTest.cpp:523: Failure
Expected equality of these values:
0
sink.logMessages().size()
Which is: 1
[BOOST_ASSERT] <2> Assertion false failed on line 585 of bool openstudio::measure::OSRunner::validateUserArguments(const std::vector<openstudio::measure::OSArgument>&, const std::map<std::__cxx11::basic_string<char>, openstudio::measure::OSArgument>&) in file /media/DataExt4/Software/Others/OpenStudio3/src/measure/OSRunner.cpp.
| <xs:enumeration value="String"/> | ||
| <xs:enumeration value="Choice"/> | ||
| <xs:enumeration value="Path"/> | ||
| <xs:enumeration value="Separator"/> |
Contributor
There was a problem hiding this comment.
Ah yes, I see there was a second error before:
[openstudio.XMLValidator] <1> xsdValidate.parseFileError: XML error 17.1840: Element 'type': [facet 'enumeration'] The value 'Separator' is not an element of the set {'Boolean', 'Double', 'Integer', 'String', 'Choice', 'Path'}.
Collaborator
|
CI Results for 9adf6d8:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull request overview
Pull Request Author
Labels:
IDDChangeAPIChangePull Request - Ready for CIso that CI builds your PRReview Checklist
This will not be exhaustively relevant to every PR.