comparison UnitTestsSources/MultiThreadingTests.cpp @ 2659:c27f7ecf9b54 jobs

cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 07 Jun 2018 12:24:17 +0200
parents ce770f095092
children 27b7884512be
comparison
equal deleted inserted replaced
2658:ce770f095092 2659:c27f7ecf9b54
977 std::string id; 977 std::string id;
978 ASSERT_TRUE(CreateInstance(id)); 978 ASSERT_TRUE(CreateInstance(id));
979 979
980 Json::Value s; 980 Json::Value s;
981 981
982 // DeleteResourceOperation
983
982 { 984 {
983 DeleteResourceOperation operation(GetContext()); 985 DeleteResourceOperation operation(GetContext());
984 operation.Serialize(s); 986 operation.Serialize(s);
985 } 987 }
986 988
987 OrthancJobUnserializer unserializer(GetContext()); 989 OrthancJobUnserializer unserializer(GetContext());
990 std::auto_ptr<IJobOperation> operation;
991
992 {
993 operation.reset(unserializer.UnserializeOperation(s));
994
995 ASSERT_THROW(dynamic_cast<LogJobOperation&>(*operation), std::bad_cast);
996 dynamic_cast<DeleteResourceOperation&>(*operation);
997 }
998
999 // StorePeerOperation
1000
1001 {
1002 WebServiceParameters peer;
1003 peer.SetUrl("http://localhost/");
1004 peer.SetUsername("username");
1005 peer.SetPassword("password");
1006 peer.SetPkcs11Enabled(true);
1007
1008 StorePeerOperation operation(peer);
1009 operation.Serialize(s);
1010 }
1011
1012 {
1013 operation.reset(unserializer.UnserializeOperation(s));
1014
1015 const StorePeerOperation& tmp = dynamic_cast<StorePeerOperation&>(*operation);
1016 ASSERT_EQ("http://localhost/", tmp.GetPeer().GetUrl());
1017 ASSERT_EQ("username", tmp.GetPeer().GetUsername());
1018 ASSERT_EQ("password", tmp.GetPeer().GetPassword());
1019 ASSERT_TRUE(tmp.GetPeer().IsPkcs11Enabled());
1020 }
1021
1022 // StoreScuOperation
1023
1024 {
1025 RemoteModalityParameters modality;
1026 modality.SetApplicationEntityTitle("REMOTE");
1027 modality.SetHost("192.168.1.1");
1028 modality.SetPort(1000);
1029 modality.SetManufacturer(ModalityManufacturer_StoreScp);
1030
1031 StoreScuOperation operation("TEST", modality);
1032 operation.Serialize(s);
1033 }
1034
1035 {
1036 operation.reset(unserializer.UnserializeOperation(s));
1037
1038 const StoreScuOperation& tmp = dynamic_cast<StoreScuOperation&>(*operation);
1039 ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle());
1040 ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost());
1041 ASSERT_EQ(1000, tmp.GetRemoteModality().GetPort());
1042 ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer());
1043 ASSERT_EQ("TEST", tmp.GetLocalAet());
1044 }
1045
1046 // SystemCallOperation
1047
1048 {
1049 SystemCallOperation operation(std::string("echo"));
1050 operation.AddPreArgument("a");
1051 operation.AddPreArgument("b");
1052 operation.AddPostArgument("c");
1053 operation.Serialize(s);
1054 }
1055
1056 {
1057 operation.reset(unserializer.UnserializeOperation(s));
1058
1059 const SystemCallOperation& tmp = dynamic_cast<SystemCallOperation&>(*operation);
1060 ASSERT_EQ("echo", tmp.GetCommand());
1061 ASSERT_EQ(2u, tmp.GetPreArgumentsCount());
1062 ASSERT_EQ(1u, tmp.GetPostArgumentsCount());
1063 ASSERT_EQ("a", tmp.GetPreArgument(0));
1064 ASSERT_EQ("b", tmp.GetPreArgument(1));
1065 ASSERT_EQ("c", tmp.GetPostArgument(0));
1066 }
1067
1068 // TODO : ModifyInstanceOperation
1069
1070 /*
1071 {
1072 std::auto_ptr<DicomModification> modification(new DicomModification);
988 1073
989 std::auto_ptr<IJobOperation> operation; 1074 ModifyInstanceOperation operation(GetContext(), RequestOrigin_Lua, modification.release());
990 operation.reset(unserializer.UnserializeOperation(s)); 1075 operation.Serialize(s);
991 1076 }
992 // TODO : StorePeerOperation 1077
993 1078 {
994 // TODO : StoreScuOperation 1079 operation.reset(unserializer.UnserializeOperation(s));
995 1080
996 // TODO : SystemCallOperation 1081 const ModifyInstanceOperation& tmp = dynamic_cast<ModifyInstanceOperation&>(*operation);
997 1082 ASSERT_EQ(RequestOrigin_Lua, tmp.GetRequestOrigin());
998 // TODO : ModifyInstanceOperation 1083 }*/
999 } 1084 }
1000 1085
1001 1086
1002 TEST_F(OrthancJobsSerialization, Jobs) 1087 TEST_F(OrthancJobsSerialization, Jobs)
1003 { 1088 {