Mercurial > hg > orthanc

comparison OrthancFramework/UnitTestsSources/JobsTests.cpp @ 4888:8523078f3f4b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
added new configuration to authorize C-Find for worklist independently from other C-Find
author Alain Mazy <am@osimis.io>
date Fri, 18 Feb 2022 15:45:28 +0100
parents 43e613a7756b
children 6d4e8d90ca02
comparison
equal deleted inserted replaced
4887:a29a6bdba9dd 4888:8523078f3f4b
1310 ASSERT_EQ("127.0.0.1", modality.GetHost()); 1310 ASSERT_EQ("127.0.0.1", modality.GetHost());
1311 ASSERT_EQ(104u, modality.GetPortNumber()); 1311 ASSERT_EQ(104u, modality.GetPortNumber());
1312 ASSERT_EQ(ModalityManufacturer_Generic, modality.GetManufacturer()); 1312 ASSERT_EQ(ModalityManufacturer_Generic, modality.GetManufacturer());
1313 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Echo)); 1313 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Echo));
1314 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find)); 1314 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find));
1315 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_FindWorklist));
1315 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get)); 1316 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get));
1316 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store)); 1317 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store));
1317 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move)); 1318 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move));
1318 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction)); 1319 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
1319 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport)); 1320 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
1349 ASSERT_EQ("world", modality.GetHost()); 1350 ASSERT_EQ("world", modality.GetHost());
1350 ASSERT_EQ(45u, modality.GetPortNumber()); 1351 ASSERT_EQ(45u, modality.GetPortNumber());
1351 ASSERT_EQ(ModalityManufacturer_GenericNoWildcardInDates, modality.GetManufacturer()); 1352 ASSERT_EQ(ModalityManufacturer_GenericNoWildcardInDates, modality.GetManufacturer());
1352 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Echo)); 1353 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Echo));
1353 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find)); 1354 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find));
1355 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_FindWorklist));
1354 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get)); 1356 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get));
1355 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store)); 1357 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store));
1356 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move)); 1358 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move));
1357 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction)); 1359 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
1358 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport)); 1360 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
1375 s["Port"] = "nope"; ASSERT_THROW(RemoteModalityParameters m(s), OrthancException); 1377 s["Port"] = "nope"; ASSERT_THROW(RemoteModalityParameters m(s), OrthancException);
1376 1378
1377 std::set<DicomRequestType> operations; 1379 std::set<DicomRequestType> operations;
1378 operations.insert(DicomRequestType_Echo); 1380 operations.insert(DicomRequestType_Echo);
1379 operations.insert(DicomRequestType_Find); 1381 operations.insert(DicomRequestType_Find);
1382 operations.insert(DicomRequestType_FindWorklist);
1380 operations.insert(DicomRequestType_Get); 1383 operations.insert(DicomRequestType_Get);
1381 operations.insert(DicomRequestType_Move); 1384 operations.insert(DicomRequestType_Move);
1382 operations.insert(DicomRequestType_Store); 1385 operations.insert(DicomRequestType_Store);
1383 operations.insert(DicomRequestType_NAction); 1386 operations.insert(DicomRequestType_NAction);
1384 operations.insert(DicomRequestType_NEventReport); 1387 operations.insert(DicomRequestType_NEventReport);