comparison UnitTests/ServerIndex.cpp @ 188:090cefdab1d1

fix because of Windows macros
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 12 Nov 2012 17:43:12 +0100
parents 5185ae1d9af5
children b6cef9d45cc3
comparison
equal deleted inserted replaced
187:8e673a65564d 188:090cefdab1d1
103 m.SetValue(0x0010, 0x0010, "PatientName"); 103 m.SetValue(0x0010, 0x0010, "PatientName");
104 index.SetMainDicomTags(a[3], m); 104 index.SetMainDicomTags(a[3], m);
105 105
106 int64_t b; 106 int64_t b;
107 ResourceType t; 107 ResourceType t;
108 ASSERT_TRUE(index.FindResource("g", b, t)); 108 ASSERT_TRUE(index.LookupResource("g", b, t));
109 ASSERT_EQ(7, b); 109 ASSERT_EQ(7, b);
110 ASSERT_EQ(ResourceType_Study, t); 110 ASSERT_EQ(ResourceType_Study, t);
111 111
112 ASSERT_TRUE(index.FindMetadata(s, a[4], MetadataType_Instance_RemoteAet)); 112 ASSERT_TRUE(index.LookupMetadata(s, a[4], MetadataType_Instance_RemoteAet));
113 ASSERT_FALSE(index.FindMetadata(s, a[4], MetadataType_Instance_IndexInSeries)); 113 ASSERT_FALSE(index.LookupMetadata(s, a[4], MetadataType_Instance_IndexInSeries));
114 ASSERT_EQ("PINNACLE", s); 114 ASSERT_EQ("PINNACLE", s);
115 ASSERT_EQ("PINNACLE", index.GetMetadata(a[4], MetadataType_Instance_RemoteAet)); 115 ASSERT_EQ("PINNACLE", index.GetMetadata(a[4], MetadataType_Instance_RemoteAet));
116 ASSERT_EQ("None", index.GetMetadata(a[4], MetadataType_Instance_IndexInSeries, "None")); 116 ASSERT_EQ("None", index.GetMetadata(a[4], MetadataType_Instance_IndexInSeries, "None"));
117 117
118 ASSERT_TRUE(index.FindGlobalProperty(s, "Hello")); 118 ASSERT_TRUE(index.LookupGlobalProperty(s, "Hello"));
119 ASSERT_FALSE(index.FindGlobalProperty(s, "Hello2")); 119 ASSERT_FALSE(index.LookupGlobalProperty(s, "Hello2"));
120 ASSERT_EQ("World", s); 120 ASSERT_EQ("World", s);
121 ASSERT_EQ("World", index.GetGlobalProperty("Hello")); 121 ASSERT_EQ("World", index.GetGlobalProperty("Hello"));
122 ASSERT_EQ("None", index.GetGlobalProperty("Hello2", "None")); 122 ASSERT_EQ("None", index.GetGlobalProperty("Hello2", "None"));
123 123
124 size_t us, cs; 124 uint64_t us, cs;
125 CompressionType ct; 125 CompressionType ct;
126 ASSERT_TRUE(index.FindFile(a[4], "_json", s, cs, us, ct)); 126 ASSERT_TRUE(index.LookupFile(a[4], "_json", s, cs, us, ct));
127 ASSERT_EQ("my json file", s); 127 ASSERT_EQ("my json file", s);
128 ASSERT_EQ(21, cs); 128 ASSERT_EQ(21, cs);
129 ASSERT_EQ(42, us); 129 ASSERT_EQ(42, us);
130 ASSERT_EQ(CompressionType_Zlib, ct); 130 ASSERT_EQ(CompressionType_Zlib, ct);
131 131
132 ASSERT_EQ(0, listener.deletedFiles_.size()); 132 ASSERT_EQ(0u, listener.deletedFiles_.size());
133 ASSERT_EQ(7, index.GetTableRecordCount("Resources")); 133 ASSERT_EQ(7, index.GetTableRecordCount("Resources"));
134 ASSERT_EQ(3, index.GetTableRecordCount("AttachedFiles")); 134 ASSERT_EQ(3, index.GetTableRecordCount("AttachedFiles"));
135 ASSERT_EQ(1, index.GetTableRecordCount("Metadata")); 135 ASSERT_EQ(1, index.GetTableRecordCount("Metadata"));
136 ASSERT_EQ(1, index.GetTableRecordCount("MainDicomTags")); 136 ASSERT_EQ(1, index.GetTableRecordCount("MainDicomTags"));
137 index.DeleteResource(a[0]); 137 index.DeleteResource(a[0]);