← Back to branch summary

~chris-rogers/maus/emr_mc_digitization

« back to all changes in this revision

Viewing changes to tests/cpp_unit/JsonCppProcessors/ObjectMapProcessorsTest.cc

  • Committer: Chris Rogers
  • Date: 2014-04-16 11:48:45 UTC
  • mfrom: (707 merge)
  • mto: This revision was merged to the branch mainline in revision 711.
  • Revision ID: chris.rogers@stfc.ac.uk-20140416114845-h3u3q7pdcxkxvovs
Update to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/cpp_unit/JsonCppProcessors/ObjectMapProcessorsTest.cc
42
42
    ObjectMapValueProcessor<int> test(new IntProcessor());
43
43
    Json::Value value_in;
44
44
    value_in["one"] = "bob";
45
 
    EXPECT_THROW(test.JsonToCpp(value_in), Squeal);
 
45
    EXPECT_THROW(test.JsonToCpp(value_in), MAUS::Exception);
46
46
}
47
47
 
48
48
TEST(ObjectMapProcessorsTest, ObjectMapValueJsonToCppNullTest) {
56
56
TEST(ObjectMapProcessorsTest, ObjectMapValueJsonToCppBadTypeTest) {
57
57
    ObjectMapValueProcessor<int> test(new IntProcessor());
58
58
    Json::Value value_in(1);
59
 
    EXPECT_THROW(test.JsonToCpp(value_in), Squeal);
 
59
    EXPECT_THROW(test.JsonToCpp(value_in), MAUS::Exception);
60
60
}
61
61
 
62
62
TEST(ObjectMapProcessorsTest, ObjectMapValueCppToJsonTest) {