comparison UnitTestsSources/MultiThreadingTests.cpp @ 3613:c1e2b91c2ab4 storage-commitment

all the abstractions for storage commitment are available
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 21 Jan 2020 17:01:46 +0100
parents 085283445db0
children f6a73611ec5c
comparison
equal deleted inserted replaced
3612:22eef03feed7 3613:c1e2b91c2ab4
1896 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find)); 1896 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find));
1897 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get)); 1897 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get));
1898 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store)); 1898 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store));
1899 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move)); 1899 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move));
1900 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction)); 1900 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
1901 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
1901 } 1902 }
1902 1903
1903 s = Json::nullValue; 1904 s = Json::nullValue;
1904 1905
1905 { 1906 {
1925 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find)); 1926 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Find));
1926 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get)); 1927 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Get));
1927 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store)); 1928 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Store));
1928 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move)); 1929 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_Move));
1929 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction)); 1930 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
1931 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
1930 } 1932 }
1931 1933
1932 s["Port"] = "46"; 1934 s["Port"] = "46";
1933 1935
1934 { 1936 {
1945 operations.insert(DicomRequestType_Find); 1947 operations.insert(DicomRequestType_Find);
1946 operations.insert(DicomRequestType_Get); 1948 operations.insert(DicomRequestType_Get);
1947 operations.insert(DicomRequestType_Move); 1949 operations.insert(DicomRequestType_Move);
1948 operations.insert(DicomRequestType_Store); 1950 operations.insert(DicomRequestType_Store);
1949 operations.insert(DicomRequestType_NAction); 1951 operations.insert(DicomRequestType_NAction);
1950 1952 operations.insert(DicomRequestType_NEventReport);
1951 ASSERT_EQ(6u, operations.size()); 1953
1954 ASSERT_EQ(7u, operations.size());
1952 1955
1953 for (std::set<DicomRequestType>::const_iterator 1956 for (std::set<DicomRequestType>::const_iterator
1954 it = operations.begin(); it != operations.end(); ++it) 1957 it = operations.begin(); it != operations.end(); ++it)
1955 { 1958 {
1956 { 1959 {
1975 ASSERT_TRUE(modality.IsRequestAllowed(*it2)); 1978 ASSERT_TRUE(modality.IsRequestAllowed(*it2));
1976 } 1979 }
1977 } 1980 }
1978 } 1981 }
1979 } 1982 }
1980 } 1983
1984 {
1985 Json::Value s;
1986 s["AllowStorageCommitment"] = false;
1987 s["AET"] = "AET";
1988 s["Host"] = "host";
1989 s["Port"] = "104";
1990
1991 RemoteModalityParameters modality(s);
1992 ASSERT_TRUE(modality.IsAdvancedFormatNeeded());
1993 ASSERT_EQ("AET", modality.GetApplicationEntityTitle());
1994 ASSERT_EQ("host", modality.GetHost());
1995 ASSERT_EQ(104u, modality.GetPortNumber());
1996 ASSERT_FALSE(modality.IsRequestAllowed(DicomRequestType_NAction));
1997 ASSERT_FALSE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
1998 }
1999
2000 {
2001 Json::Value s;
2002 s["AllowNAction"] = false;
2003 s["AllowNEventReport"] = true;
2004 s["AET"] = "AET";
2005 s["Host"] = "host";
2006 s["Port"] = "104";
2007
2008 RemoteModalityParameters modality(s);
2009 ASSERT_TRUE(modality.IsAdvancedFormatNeeded());
2010 ASSERT_EQ("AET", modality.GetApplicationEntityTitle());
2011 ASSERT_EQ("host", modality.GetHost());
2012 ASSERT_EQ(104u, modality.GetPortNumber());
2013 ASSERT_FALSE(modality.IsRequestAllowed(DicomRequestType_NAction));
2014 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
2015 }
2016
2017 {
2018 Json::Value s;
2019 s["AllowNAction"] = true;
2020 s["AllowNEventReport"] = true;
2021 s["AET"] = "AET";
2022 s["Host"] = "host";
2023 s["Port"] = "104";
2024
2025 RemoteModalityParameters modality(s);
2026 ASSERT_FALSE(modality.IsAdvancedFormatNeeded());
2027 ASSERT_EQ("AET", modality.GetApplicationEntityTitle());
2028 ASSERT_EQ("host", modality.GetHost());
2029 ASSERT_EQ(104u, modality.GetPortNumber());
2030 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NAction));
2031 ASSERT_TRUE(modality.IsRequestAllowed(DicomRequestType_NEventReport));
2032 }
2033 }