Mercurial > hg > orthanc
diff UnitTestsSources/MultiThreadingTests.cpp @ 3857:67f988f42cef transcoding
integration mainline->transcoding
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 21 Apr 2020 16:33:59 +0200 |
parents | 023b2a9f3aa1 6498739a3c3c |
children | ea1d32861cfc |
line wrap: on
line diff
--- a/UnitTestsSources/MultiThreadingTests.cpp Mon Apr 20 14:04:14 2020 +0200 +++ b/UnitTestsSources/MultiThreadingTests.cpp Tue Apr 21 16:33:59 2020 +0200 @@ -1098,7 +1098,6 @@ StringOperationValue s2("world"); lock.AddInput(a, s1); lock.AddInput(a, s2); - lock.SetDicomAssociationTimeout(200); lock.SetTrailingOperationTimeout(300); } @@ -1284,7 +1283,6 @@ MemoryStorageArea storage_; SQLiteDatabaseWrapper db_; // The SQLite DB is in memory std::unique_ptr<ServerContext> context_; - TimeoutDicomConnectionManager manager_; public: OrthancJobsSerialization() @@ -1407,27 +1405,31 @@ // StoreScuOperation { - RemoteModalityParameters modality; - modality.SetApplicationEntityTitle("REMOTE"); - modality.SetHost("192.168.1.1"); - modality.SetPortNumber(1000); - modality.SetManufacturer(ModalityManufacturer_StoreScp); + TimeoutDicomConnectionManager luaManager; + + { + RemoteModalityParameters modality; + modality.SetApplicationEntityTitle("REMOTE"); + modality.SetHost("192.168.1.1"); + modality.SetPortNumber(1000); + modality.SetManufacturer(ModalityManufacturer_StoreScp); - StoreScuOperation operation("TEST", modality); + StoreScuOperation operation(luaManager, "TEST", modality); - ASSERT_TRUE(CheckIdempotentSerialization(unserializer, operation)); - operation.Serialize(s); - } + ASSERT_TRUE(CheckIdempotentSerialization(unserializer, operation)); + operation.Serialize(s); + } - { - operation.reset(unserializer.UnserializeOperation(s)); + { + operation.reset(unserializer.UnserializeOperation(s)); - const StoreScuOperation& tmp = dynamic_cast<StoreScuOperation&>(*operation); - ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle()); - ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost()); - ASSERT_EQ(1000, tmp.GetRemoteModality().GetPortNumber()); - ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer()); - ASSERT_EQ("TEST", tmp.GetLocalAet()); + const StoreScuOperation& tmp = dynamic_cast<StoreScuOperation&>(*operation); + ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle()); + ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost()); + ASSERT_EQ(1000, tmp.GetRemoteModality().GetPortNumber()); + ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer()); + ASSERT_EQ("TEST", tmp.GetLocalAet()); + } } // SystemCallOperation