# HG changeset patch # User am@osimis.io # Date 1536574925 -7200 # Node ID 1992f7b8563efc1725ab596d4b1f33cd811e1ece # Parent ac9fd144feae921ff4a856c52721282b5541961f introduced StoneException diff -r ac9fd144feae -r 1992f7b8563e Framework/StoneException.h --- a/Framework/StoneException.h Mon Sep 10 12:20:14 2018 +0200 +++ b/Framework/StoneException.h Mon Sep 10 12:22:05 2018 +0200 @@ -22,10 +22,91 @@ #pragma once #include "Core/OrthancException.h" +#include namespace OrthancStone { + enum ErrorCode + { + ErrorCode_Success, + ErrorCode_OrthancError, // this StoneException is actually an OrthancException with an Orthanc error code + ErrorCode_ApplicationException, // this StoneException is specific to an application (and should have its own internal error code) + ErrorCode_NotImplemented, // case not implemented + ErrorCode_PromiseSingleSuccessHandler, // a Promise can only have a single success handler + ErrorCode_PromiseSingleFailureHandler, // a Promise can only have a single failure handler + ErrorCode_Last + }; + + + + class StoneException + { + protected: + OrthancStone::ErrorCode errorCode_; + + public: + explicit StoneException(ErrorCode errorCode) : + errorCode_(errorCode) + { + } + + ErrorCode GetErrorCode() const + { + return errorCode_; + } + + virtual const char* What() const + { + return "TODO: EnumerationToString for StoneException"; + } + }; + + class StoneOrthancException : public StoneException + { + protected: + Orthanc::OrthancException& orthancException_; + + public: + explicit StoneOrthancException(Orthanc::OrthancException& orthancException) : + StoneException(ErrorCode_OrthancError), + orthancException_(orthancException) + { + } + + Orthanc::ErrorCode GetOrthancErrorCode() const + { + return orthancException_.GetErrorCode(); + } + + virtual const char* What() const + { + return orthancException_.What(); + } + }; + + class StoneApplicationException : public StoneException + { + protected: + int applicationErrorCode_; + + public: + explicit StoneApplicationException(int applicationErrorCode) : + StoneException(ErrorCode_ApplicationException), + applicationErrorCode_(applicationErrorCode) + { + } + + int GetApplicationErrorCode() const + { + return applicationErrorCode_; + } + + virtual const char* What() const + { + return boost::lexical_cast(applicationErrorCode_).c_str(); + } + }; } diff -r ac9fd144feae -r 1992f7b8563e UnitTestsSources/TestExceptions.cpp --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/UnitTestsSources/TestExceptions.cpp Mon Sep 10 12:22:05 2018 +0200 @@ -0,0 +1,43 @@ +/** + * Stone of Orthanc + * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics + * Department, University Hospital of Liege, Belgium + * Copyright (C) 2017-2018 Osimis S.A., Belgium + * + * This program is free software: you can redistribute it and/or + * modify it under the terms of the GNU Affero General Public License + * as published by the Free Software Foundation, either version 3 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + **/ + + +#include "gtest/gtest.h" + +#include "../Framework/StoneException.h" + + + +TEST(StoneExceptions, OrthancToStoneConversion) +{ + bool hasBeenCatched = false; + try { + throw Orthanc::OrthancException(Orthanc::ErrorCode_InternalError); + } + catch (Orthanc::OrthancException& orthancException) + { + hasBeenCatched = true; + OrthancStone::StoneOrthancException stoneException(orthancException); + ASSERT_EQ(OrthancStone::ErrorCode_OrthancError, stoneException.GetErrorCode()); + ASSERT_EQ(Orthanc::ErrorCode_InternalError, stoneException.GetOrthancErrorCode()); + } + + ASSERT_TRUE(hasBeenCatched); +}