Mercurial > hg > orthanc-stone
comparison UnitTestsSources/TestCommands.cpp @ 1298:8a0a62189f46
replacing std::auto_ptr by std::unique_ptr
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 02 Mar 2020 16:31:30 +0100 |
parents | 2d8ab34c8c91 |
children | 30deba7bc8e2 |
comparison
equal
deleted
inserted
replaced
1296:86400fa16091 | 1298:8a0a62189f46 |
---|---|
58 // factory.RegisterCommandClass<OrthancStone::NoopCommand>(); | 58 // factory.RegisterCommandClass<OrthancStone::NoopCommand>(); |
59 | 59 |
60 // Json::Value cmdJson; | 60 // Json::Value cmdJson; |
61 // cmdJson["command"] = "noop"; | 61 // cmdJson["command"] = "noop"; |
62 | 62 |
63 // std::auto_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)); | 63 // std::unique_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)); |
64 | 64 |
65 // ASSERT_TRUE(command.get() != NULL); | 65 // ASSERT_TRUE(command.get() != NULL); |
66 // ASSERT_EQ("noop", command->GetName()); | 66 // ASSERT_EQ("noop", command->GetName()); |
67 //} | 67 //} |
68 | 68 |
75 | 75 |
76 // Json::Value cmdJson; | 76 // Json::Value cmdJson; |
77 // cmdJson["command"] = "increment"; | 77 // cmdJson["command"] = "increment"; |
78 // cmdJson["args"]["increment"] = 2; | 78 // cmdJson["args"]["increment"] = 2; |
79 | 79 |
80 // std::auto_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)); | 80 // std::unique_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)); |
81 | 81 |
82 // ASSERT_TRUE(command.get() != NULL); | 82 // ASSERT_TRUE(command.get() != NULL); |
83 // CommandIncrement::counter = 0; | 83 // CommandIncrement::counter = 0; |
84 // command->Execute(); | 84 // command->Execute(); |
85 // ASSERT_EQ(2, CommandIncrement::counter); | 85 // ASSERT_EQ(2, CommandIncrement::counter); |
91 // factory.RegisterCommandClass<OrthancStone::NoopCommand>(); | 91 // factory.RegisterCommandClass<OrthancStone::NoopCommand>(); |
92 | 92 |
93 // Json::Value cmdJson; | 93 // Json::Value cmdJson; |
94 // cmdJson["command"] = "unknown"; | 94 // cmdJson["command"] = "unknown"; |
95 | 95 |
96 // ASSERT_THROW(std::auto_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)), Orthanc::OrthancException); | 96 // ASSERT_THROW(std::unique_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)), Orthanc::OrthancException); |
97 //} | 97 //} |
98 | 98 |
99 //TEST(Commands, TryCreateCommandFromInvalidJson) | 99 //TEST(Commands, TryCreateCommandFromInvalidJson) |
100 //{ | 100 //{ |
101 // OrthancStone::BaseCommandFactory factory; | 101 // OrthancStone::BaseCommandFactory factory; |
102 // factory.RegisterCommandClass<OrthancStone::NoopCommand>(); | 102 // factory.RegisterCommandClass<OrthancStone::NoopCommand>(); |
103 | 103 |
104 // Json::Value cmdJson; | 104 // Json::Value cmdJson; |
105 // cmdJson["command-name"] = "noop"; | 105 // cmdJson["command-name"] = "noop"; |
106 | 106 |
107 // ASSERT_THROW(std::auto_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)), Orthanc::OrthancException); | 107 // ASSERT_THROW(std::unique_ptr<OrthancStone::ICommand> command(factory.CreateFromJson(cmdJson)), Orthanc::OrthancException); |
108 //} | 108 //} |