Sounds like a plan. I’m not surprised there are better ways to do this than what I’m doing – a few of us just hacked this together because we needed something that worked

My selling point is that it all is in one header file so you have no library logic or include paths to worry about. Also, the part after this (argument matching) is very neatly implemented with true objects and operator== calls for the classes instead of a hack as you’re insinuating.

Maybe worth a look to see if we can merge the code bases? I have no support whatsoever for repetition mentioning since I don’t see the value of it over looping on a single expectation (except for optimization – which I don’t do in my unit tests).