Mercurial > hg > orthanc

comparison UnitTests/FileStorage.cpp @ 232:5368bbe813cf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring of attachments
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 30 Nov 2012 14:22:27 +0100
parents 4eb0c7ce86c9
children c11273198cef
comparison
equal deleted inserted replaced
231:8098448bd827 232:5368bbe813cf
64 { 64 {
65 FileStorage s("FileStorageUnitTests"); 65 FileStorage s("FileStorageUnitTests");
66 FileStorageAccessor accessor(s); 66 FileStorageAccessor accessor(s);
67 67
68 std::string data = "Hello world"; 68 std::string data = "Hello world";
69 std::string id = accessor.Write(data); 69 FileInfo info = accessor.Write(data, FileType_Dicom);
70 70
71 std::string r; 71 std::string r;
72 accessor.Read(r, id); 72 accessor.Read(r, info.GetUuid());
73 73
74 ASSERT_EQ(data, r); 74 ASSERT_EQ(data, r);
75 ASSERT_EQ(CompressionType_None, info.GetCompressionType());
76 ASSERT_EQ(11u, info.GetUncompressedSize());
77 ASSERT_EQ(11u, info.GetCompressedSize());
78 ASSERT_EQ(FileType_Dicom, info.GetFileType());
75 } 79 }
76 80
77 81
78 TEST(FileStorageAccessor, NoCompression) 82 TEST(FileStorageAccessor, NoCompression)
79 { 83 {
80 FileStorage s("FileStorageUnitTests"); 84 FileStorage s("FileStorageUnitTests");
81 CompressedFileStorageAccessor accessor(s); 85 CompressedFileStorageAccessor accessor(s);
82 86
83 accessor.SetCompressionForNextOperations(CompressionType_None); 87 accessor.SetCompressionForNextOperations(CompressionType_None);
84 std::string data = "Hello world"; 88 std::string data = "Hello world";
85 std::string id = accessor.Write(data); 89 FileInfo info = accessor.Write(data, FileType_Dicom);
86 90
87 std::string r; 91 std::string r;
88 accessor.Read(r, id); 92 accessor.Read(r, info.GetUuid());
89 93
90 ASSERT_EQ(data, r); 94 ASSERT_EQ(data, r);
95 ASSERT_EQ(CompressionType_None, info.GetCompressionType());
96 ASSERT_EQ(11u, info.GetUncompressedSize());
97 ASSERT_EQ(11u, info.GetCompressedSize());
98 ASSERT_EQ(FileType_Dicom, info.GetFileType());
91 } 99 }
92 100
93 101
94 TEST(FileStorageAccessor, Compression) 102 TEST(FileStorageAccessor, Compression)
95 { 103 {
96 FileStorage s("FileStorageUnitTests"); 104 FileStorage s("FileStorageUnitTests");
97 CompressedFileStorageAccessor accessor(s); 105 CompressedFileStorageAccessor accessor(s);
98 106
99 accessor.SetCompressionForNextOperations(CompressionType_Zlib); 107 accessor.SetCompressionForNextOperations(CompressionType_Zlib);
100 std::string data = "Hello world"; 108 std::string data = "Hello world";
101 std::string id = accessor.Write(data); 109 FileInfo info = accessor.Write(data, FileType_Dicom);
102 110
103 std::string r; 111 std::string r;
104 accessor.Read(r, id); 112 accessor.Read(r, info.GetUuid());
105 113
106 ASSERT_EQ(data, r); 114 ASSERT_EQ(data, r);
115 ASSERT_EQ(CompressionType_Zlib, info.GetCompressionType());
116 ASSERT_EQ(11u, info.GetUncompressedSize());
117 ASSERT_EQ(FileType_Dicom, info.GetFileType());
107 } 118 }
108 119
109 120
110 TEST(FileStorageAccessor, Mix) 121 TEST(FileStorageAccessor, Mix)
111 { 122 {
115 std::string r; 126 std::string r;
116 std::string compressedData = "Hello"; 127 std::string compressedData = "Hello";
117 std::string uncompressedData = "HelloWorld"; 128 std::string uncompressedData = "HelloWorld";
118 129
119 accessor.SetCompressionForNextOperations(CompressionType_Zlib); 130 accessor.SetCompressionForNextOperations(CompressionType_Zlib);
120 std::string compressedId = accessor.Write(compressedData); 131 FileInfo compressedInfo = accessor.Write(compressedData, FileType_Dicom);
121 132
122 accessor.SetCompressionForNextOperations(CompressionType_None); 133 accessor.SetCompressionForNextOperations(CompressionType_None);
123 std::string uncompressedId = accessor.Write(uncompressedData); 134 FileInfo uncompressedInfo = accessor.Write(uncompressedData, FileType_Dicom);
124 135
125 accessor.SetCompressionForNextOperations(CompressionType_Zlib); 136 accessor.SetCompressionForNextOperations(CompressionType_Zlib);
126 accessor.Read(r, compressedId); 137 accessor.Read(r, compressedInfo.GetUuid());
127 ASSERT_EQ(compressedData, r); 138 ASSERT_EQ(compressedData, r);
128 139
129 accessor.SetCompressionForNextOperations(CompressionType_None); 140 accessor.SetCompressionForNextOperations(CompressionType_None);
130 accessor.Read(r, compressedId); 141 accessor.Read(r, compressedInfo.GetUuid());
131 ASSERT_NE(compressedData, r); 142 ASSERT_NE(compressedData, r);
132 143
133 #if defined(__linux) 144 /*
134 // This test is too slow on Windows 145 // This test is too slow on Windows
135 accessor.SetCompressionForNextOperations(CompressionType_Zlib); 146 accessor.SetCompressionForNextOperations(CompressionType_Zlib);
136 ASSERT_THROW(accessor.Read(r, uncompressedId), OrthancException); 147 ASSERT_THROW(accessor.Read(r, uncompressedInfo.GetUuid()), OrthancException);
137 #endif 148 */
138 } 149 }
139 150
140 151
141 152
142 #if 0 153 #if 0