comparison UnitTests/Zip.cpp @ 249:5694365ecb96

fixes for windows
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 05 Dec 2012 09:28:06 +0100
parents c9b3ba0fd140
children 4dc9d00c359c
comparison
equal deleted inserted replaced
248:2442033911d6 249:5694365ecb96
11 TEST(ZipWriter, Basic) 11 TEST(ZipWriter, Basic)
12 { 12 {
13 Orthanc::ZipWriter w; 13 Orthanc::ZipWriter w;
14 w.SetOutputPath("hello.zip"); 14 w.SetOutputPath("hello.zip");
15 w.Open(); 15 w.Open();
16 w.CreateFileInZip("world/hello"); 16 w.OpenFile("world/hello");
17 w.Write("Hello world"); 17 w.Write("Hello world");
18 } 18 }
19 19
20 20
21 TEST(ZipWriter, Exceptions) 21 TEST(ZipWriter, Exceptions)
37 // http://code.google.com/p/googletest/wiki/AdvancedGuide#Private_Class_Members 37 // http://code.google.com/p/googletest/wiki/AdvancedGuide#Private_Class_Members
38 38
39 TEST(HierarchicalZipWriter, Index) 39 TEST(HierarchicalZipWriter, Index)
40 { 40 {
41 HierarchicalZipWriter::Index i; 41 HierarchicalZipWriter::Index i;
42 ASSERT_EQ("hello", i.CreateFile("hello")); 42 ASSERT_EQ("hello", i.OpenFile("hello"));
43 ASSERT_EQ("hello-2", i.CreateFile("hello")); 43 ASSERT_EQ("hello-2", i.OpenFile("hello"));
44 ASSERT_EQ("coucou", i.CreateFile("coucou")); 44 ASSERT_EQ("coucou", i.OpenFile("coucou"));
45 ASSERT_EQ("hello-3", i.CreateFile("hello")); 45 ASSERT_EQ("hello-3", i.OpenFile("hello"));
46 46
47 i.CreateDirectory("coucou"); 47 i.OpenDirectory("coucou");
48 48
49 ASSERT_EQ("coucou-2/world", i.CreateFile("world")); 49 ASSERT_EQ("coucou-2/world", i.OpenFile("world"));
50 ASSERT_EQ("coucou-2/world-2", i.CreateFile("world")); 50 ASSERT_EQ("coucou-2/world-2", i.OpenFile("world"));
51 51
52 i.CreateDirectory("world"); 52 i.OpenDirectory("world");
53 53
54 ASSERT_EQ("coucou-2/world-3/hello", i.CreateFile("hello")); 54 ASSERT_EQ("coucou-2/world-3/hello", i.OpenFile("hello"));
55 ASSERT_EQ("coucou-2/world-3/hello-2", i.CreateFile("hello")); 55 ASSERT_EQ("coucou-2/world-3/hello-2", i.OpenFile("hello"));
56 56
57 i.CloseDirectory(); 57 i.CloseDirectory();
58 58
59 ASSERT_EQ("coucou-2/world-4", i.CreateFile("world")); 59 ASSERT_EQ("coucou-2/world-4", i.OpenFile("world"));
60 60
61 i.CloseDirectory(); 61 i.CloseDirectory();
62 62
63 ASSERT_EQ("coucou-3", i.CreateFile("coucou")); 63 ASSERT_EQ("coucou-3", i.OpenFile("coucou"));
64 64
65 ASSERT_THROW(i.CloseDirectory(), OrthancException); 65 ASSERT_THROW(i.CloseDirectory(), OrthancException);
66 } 66 }
67 67
68 68
81 HierarchicalZipWriter w("hello2.zip"); 81 HierarchicalZipWriter w("hello2.zip");
82 82
83 w.SetCompressionLevel(0); 83 w.SetCompressionLevel(0);
84 84
85 // Inside "/" 85 // Inside "/"
86 w.CreateFile("hello"); 86 w.OpenFile("hello");
87 w.Write(SPACES + "hello\n"); 87 w.Write(SPACES + "hello\n");
88 w.CreateFile("hello"); 88 w.OpenFile("hello");
89 w.Write(SPACES + "hello-2\n"); 89 w.Write(SPACES + "hello-2\n");
90 w.CreateDirectory("hello"); 90 w.OpenDirectory("hello");
91 91
92 // Inside "/hello-3" 92 // Inside "/hello-3"
93 w.CreateFile("hello"); 93 w.OpenFile("hello");
94 w.Write(SPACES + "hello\n"); 94 w.Write(SPACES + "hello\n");
95 w.CreateDirectory("hello"); 95 w.OpenDirectory("hello");
96 96
97 w.SetCompressionLevel(9); 97 w.SetCompressionLevel(9);
98 98
99 // Inside "/hello-3/hello-2" 99 // Inside "/hello-3/hello-2"
100 w.CreateFile("hello"); 100 w.OpenFile("hello");
101 w.Write(SPACES + "hello\n"); 101 w.Write(SPACES + "hello\n");
102 w.CreateFile("hello"); 102 w.OpenFile("hello");
103 w.Write(SPACES + "hello-2\n"); 103 w.Write(SPACES + "hello-2\n");
104 w.CloseDirectory(); 104 w.CloseDirectory();
105 105
106 // Inside "/hello-3" 106 // Inside "/hello-3"
107 w.CreateFile("hello"); 107 w.OpenFile("hello");
108 w.Write(SPACES + "hello-3\n"); 108 w.Write(SPACES + "hello-3\n");
109 109
110 /** 110 /**
111 111
112 TO CHECK THE CONTENT OF THE "hello2.zip" FILE: 112 TO CHECK THE CONTENT OF THE "hello2.zip" FILE: