comparison UnitTestsSources/MultiThreadingTests.cpp @ 2871:6eebc2eb3168

refactoring serialization of RemoteModalityParameters
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 09 Oct 2018 12:51:20 +0200
parents abce036683cd
children 9d08edde614b
comparison
equal deleted inserted replaced
2870:716dd24974ef 2871:6eebc2eb3168
1865 } 1865 }
1866 1866
1867 ASSERT_THROW(job.Step(), OrthancException); 1867 ASSERT_THROW(job.Step(), OrthancException);
1868 } 1868 }
1869 } 1869 }
1870
1871
1872 TEST(JobsSerialization, RemoteModalityParameters)
1873 {
1874 Json::Value s;
1875
1876 {
1877 RemoteModalityParameters modality;
1878 modality.Serialize(s, false);
1879 ASSERT_EQ(Json::arrayValue, s.type());
1880 }
1881
1882 {
1883 RemoteModalityParameters modality(s);
1884 ASSERT_EQ("ORTHANC", modality.GetApplicationEntityTitle());
1885 ASSERT_EQ("127.0.0.1", modality.GetHost());
1886 ASSERT_EQ(104u, modality.GetPortNumber());
1887 ASSERT_EQ(ModalityManufacturer_Generic, modality.GetManufacturer());
1888 }
1889
1890 s = Json::nullValue;
1891
1892 {
1893 RemoteModalityParameters modality;
1894 ASSERT_FALSE(modality.IsAdvancedFormatNeeded());
1895 modality.SetApplicationEntityTitle("HELLO");
1896 modality.SetHost("world");
1897 modality.SetPortNumber(45);
1898 modality.SetManufacturer(ModalityManufacturer_Dcm4Chee);
1899 modality.Serialize(s, true);
1900 ASSERT_EQ(Json::objectValue, s.type());
1901 }
1902
1903 {
1904 RemoteModalityParameters modality(s);
1905 ASSERT_EQ("HELLO", modality.GetApplicationEntityTitle());
1906 ASSERT_EQ("world", modality.GetHost());
1907 ASSERT_EQ(45u, modality.GetPortNumber());
1908 ASSERT_EQ(ModalityManufacturer_Dcm4Chee, modality.GetManufacturer());
1909 }
1910
1911 s["Port"] = "46";
1912
1913 {
1914 RemoteModalityParameters modality(s);
1915 ASSERT_EQ(46u, modality.GetPortNumber());
1916 }
1917 }