aboutsummaryrefslogtreecommitdiff
path: root/devel/ice/files/patch-cpp-test-IceGrid-deployer-AllTests.cpp
blob: f30051f81dbcd5ea7e517d9d02493d1bdb4fd86f (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
--- cpp/test/IceGrid/deployer/AllTests.cpp.orig	2015-07-04 13:12:57.306420997 +0200
+++ cpp/test/IceGrid/deployer/AllTests.cpp	2015-07-04 13:13:30.146599997 +0200
@@ -126,21 +126,21 @@
         //
         // Test with empty file.
         //
-        string path = testDir + "/log1.txt";
+        string path = testDir + "/db/log1.txt";
         ofstream os(path.c_str());
         os.close();
 
-        it = session->openServerLog("LogServer", testDir + "/log1.txt", -1);
+        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", -1);
         test(it->read(1024, lines) && lines.empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 0);
+        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 0);
         test(it->read(1024, lines) && lines.empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 100);
+        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 100);
         test(it->read(1024, lines) && lines.empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
@@ -156,29 +156,29 @@
         //
         // Test with log file with one line with no EOL on last line.
         //
-        string path = testDir + "/log2.txt";
+        string path = testDir + "/db/log2.txt";
         ofstream os(path.c_str());
         os << "one line file with no EOL on last line";
         os.close();
 
-        it = session->openServerLog("LogServer", testDir + "/log2.txt", -1);
+        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", -1);
         test(it->read(1024, lines) && lines.size() == 1);
         test(lines[0] == "one line file with no EOL on last line");
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log2.txt", 0);
+        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 0);
         test(it->read(1024, lines) && lines.empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
         
-        it = session->openServerLog("LogServer", testDir + "/log2.txt", 1);
+        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 1);
         test(it->read(1024, lines) && lines.size() == 1);
         test(lines[0] == "one line file with no EOL on last line");
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log2.txt", 100);
+        it = session->openServerLog("LogServer", testDir + "/db/log2.txt", 100);
         test(it->read(1024, lines) && lines.size() == 1);
         test(lines[0] == "one line file with no EOL on last line");
         test(it->read(1024, lines) && lines.empty());
@@ -195,37 +195,37 @@
         //
         // Test with log file with one line with EOL on last line.
         // 
-        string path = testDir + "/log3.txt";
+        string path = testDir + "/db/log3.txt";
         ofstream os(path.c_str());
         os << "one line file with EOL on last line" << endl;
         os.close();
 
-        it = session->openServerLog("LogServer", testDir + "/log3.txt", -1);
+        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", -1);
         test(it->read(1024, lines) && lines.size() == 2);
         test(lines[0] == "one line file with EOL on last line");
         test(lines[1].empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 0);
+        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 0);
         test(it->read(1024, lines) && lines.empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
         
-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 1);
+        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 1);
         test(it->read(1024, lines) && lines.size() == 2);
         test(lines[0] == "one line file with EOL on last line");
         test(lines[1].empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 100);
+        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 100);
         test(it->read(1024, lines) && lines.size() == 2);
         test(lines[0] == "one line file with EOL on last line");
         test(lines[1].empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log3.txt", 2);
+        it = session->openServerLog("LogServer", testDir + "/db/log3.txt", 2);
         test(it->read(1024, lines) && lines.size() == 2);
         test(lines[0] == "one line file with EOL on last line");
         test(lines[1].empty());
@@ -242,14 +242,14 @@
         //
         // Test with log file with multiple lines
         //
-        string path = testDir + "/log4.txt";
+        string path = testDir + "/db/log4.txt";
         ofstream os(path.c_str());
         os << "line 1" << endl;
         os << "line 2" << endl;
         os << "line 3" << endl;
         os.close();
 
-        it = session->openServerLog("LogServer", testDir + "/log4.txt", -1);
+        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", -1);
         test(it->read(1024, lines) && lines.size() == 4);
         test(lines[0] == "line 1");
         test(lines[1] == "line 2");
@@ -258,25 +258,25 @@
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 0);
+        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 0);
         test(it->read(1024, lines) && lines.empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
         
-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 1);
+        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 1);
         test(it->read(1024, lines) && lines.size() == 2);
         test(lines[0] == "line 3");
         test(lines[1].empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 2);
+        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 2);
         test(it->read(1024, lines) && lines.size() == 3);
         test(lines[0] == "line 2");
         test(lines[1] == "line 3");
         test(lines[2].empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log4.txt", 100);
+        it = session->openServerLog("LogServer", testDir + "/db/log4.txt", 100);
         test(it->read(1024, lines) && lines.size() == 4);
         test(lines[0] == "line 1");
         test(lines[1] == "line 2");
@@ -292,11 +292,11 @@
 
     try
     {
-        string path = testDir + "/log1.txt";
+        string path = testDir + "/db/log1.txt";
         ofstream os(path.c_str(), ios_base::out | ios_base::trunc);
         os << flush;
 
-        it = session->openServerLog("LogServer", testDir + "/log1.txt", -1);
+        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", -1);
         test(it->read(1024, lines) && lines.empty());
 
         os << "started a line" << flush;
@@ -347,18 +347,18 @@
 
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 0);
+        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 0);
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
 
-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 1);
+        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 1);
         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineStart(lines[0]));
         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineContent(lines[0]));
         test(it->read(1024, lines) && lines.size() == 2 && isLongLineEnd(lines[0]) && lines[1].empty());
         test(it->read(1024, lines) && lines.empty());
         it->destroy();
         
-        it = session->openServerLog("LogServer", testDir + "/log1.txt", 2);
+        it = session->openServerLog("LogServer", testDir + "/db/log1.txt", 2);
         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineStart(lines[0]));
         test(!it->read(1024, lines) && lines.size() == 1 && isLongLineContent(lines[0]));
         test(!it->read(1024, lines) && lines.size() == 2 && isLongLineEnd(lines[0]) && isLongLineStart(lines[1]));