comparison UnitTestsSources/MultiThreadingTests.cpp @ 2715:73bc0c32547c jobs

fix embedding openssl within a DLL
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 09 Jul 2018 13:02:56 +0200
parents 06c0a6b8a871
children 46061a91c88a
comparison
equal deleted inserted replaced
2714:28dc5bb9a7e6 2715:73bc0c32547c
1302 1302
1303 { 1303 {
1304 RemoteModalityParameters modality; 1304 RemoteModalityParameters modality;
1305 modality.SetApplicationEntityTitle("REMOTE"); 1305 modality.SetApplicationEntityTitle("REMOTE");
1306 modality.SetHost("192.168.1.1"); 1306 modality.SetHost("192.168.1.1");
1307 modality.SetPort(1000); 1307 modality.SetPortNumber(1000);
1308 modality.SetManufacturer(ModalityManufacturer_StoreScp); 1308 modality.SetManufacturer(ModalityManufacturer_StoreScp);
1309 1309
1310 StoreScuOperation operation("TEST", modality); 1310 StoreScuOperation operation("TEST", modality);
1311 1311
1312 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, operation)); 1312 ASSERT_TRUE(CheckIdempotentSerialization(unserializer, operation));
1317 operation.reset(unserializer.UnserializeOperation(s)); 1317 operation.reset(unserializer.UnserializeOperation(s));
1318 1318
1319 const StoreScuOperation& tmp = dynamic_cast<StoreScuOperation&>(*operation); 1319 const StoreScuOperation& tmp = dynamic_cast<StoreScuOperation&>(*operation);
1320 ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle()); 1320 ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle());
1321 ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost()); 1321 ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost());
1322 ASSERT_EQ(1000, tmp.GetRemoteModality().GetPort()); 1322 ASSERT_EQ(1000, tmp.GetRemoteModality().GetPortNumber());
1323 ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer()); 1323 ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer());
1324 ASSERT_EQ("TEST", tmp.GetLocalAet()); 1324 ASSERT_EQ("TEST", tmp.GetLocalAet());
1325 } 1325 }
1326 1326
1327 // SystemCallOperation 1327 // SystemCallOperation
1388 1388
1389 { 1389 {
1390 RemoteModalityParameters modality; 1390 RemoteModalityParameters modality;
1391 modality.SetApplicationEntityTitle("REMOTE"); 1391 modality.SetApplicationEntityTitle("REMOTE");
1392 modality.SetHost("192.168.1.1"); 1392 modality.SetHost("192.168.1.1");
1393 modality.SetPort(1000); 1393 modality.SetPortNumber(1000);
1394 modality.SetManufacturer(ModalityManufacturer_StoreScp); 1394 modality.SetManufacturer(ModalityManufacturer_StoreScp);
1395 1395
1396 DicomModalityStoreJob job(GetContext()); 1396 DicomModalityStoreJob job(GetContext());
1397 job.SetLocalAet("LOCAL"); 1397 job.SetLocalAet("LOCAL");
1398 job.SetRemoteModality(modality); 1398 job.SetRemoteModality(modality);
1408 1408
1409 DicomModalityStoreJob& tmp = dynamic_cast<DicomModalityStoreJob&>(*job); 1409 DicomModalityStoreJob& tmp = dynamic_cast<DicomModalityStoreJob&>(*job);
1410 ASSERT_EQ("LOCAL", tmp.GetLocalAet()); 1410 ASSERT_EQ("LOCAL", tmp.GetLocalAet());
1411 ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle()); 1411 ASSERT_EQ("REMOTE", tmp.GetRemoteModality().GetApplicationEntityTitle());
1412 ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost()); 1412 ASSERT_EQ("192.168.1.1", tmp.GetRemoteModality().GetHost());
1413 ASSERT_EQ(1000, tmp.GetRemoteModality().GetPort()); 1413 ASSERT_EQ(1000, tmp.GetRemoteModality().GetPortNumber());
1414 ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer()); 1414 ASSERT_EQ(ModalityManufacturer_StoreScp, tmp.GetRemoteModality().GetManufacturer());
1415 ASSERT_TRUE(tmp.HasMoveOriginator()); 1415 ASSERT_TRUE(tmp.HasMoveOriginator());
1416 ASSERT_EQ("MOVESCU", tmp.GetMoveOriginatorAet()); 1416 ASSERT_EQ("MOVESCU", tmp.GetMoveOriginatorAet());
1417 ASSERT_EQ(42, tmp.GetMoveOriginatorId()); 1417 ASSERT_EQ(42, tmp.GetMoveOriginatorId());
1418 } 1418 }