Revision cfed7823 trunk/Pithos.Network.Test/NetworkOpsTest.cs

b/trunk/Pithos.Network.Test/NetworkOpsTest.cs
35 35
        {
36 36
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
37 37
            client.Authenticate(_userName, _apiKey);
38
            client.CreateContainer("PITHOS");
38
            client.CreateContainer(null, "PITHOS");
39 39

  
40 40
            IList<ContainerInfo> containers=client.ListContainers();
41 41
            Assert.IsTrue(containers.Count()>1);
......
46 46
        {
47 47
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
48 48
            client.Authenticate(_userName, _apiKey);
49
            client.CreateContainer("PITHOS");            
50
            client.PutObject("PITHOS","devguide.pdf","devguide.pdf");
49
            client.CreateContainer(null, "PITHOS");            
50
            client.PutObject(null, "PITHOS","devguide.pdf","devguide.pdf");
51 51

  
52
            IList<ObjectInfo> objects=client.ListObjects("PITHOS");
52
            IList<ObjectInfo> objects=client.ListObjects(null, "PITHOS");
53 53
            Assert.IsTrue(objects.Count()>=1);
54 54
        }
55 55

  
......
58 58
        {
59 59
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
60 60
            client.Authenticate(_userName, _apiKey);
61
            client.CreateContainer("TestContainer");
62
            bool dnzExists=client.ContainerExists("TestContainer");
61
            client.CreateContainer(null, "TestContainer");
62
            bool dnzExists=client.ContainerExists(null, "TestContainer");
63 63
            
64
            bool mooExists = client.ContainerExists("Moo");
64
            bool mooExists = client.ContainerExists(null, "Moo");
65 65
            Assert.IsTrue(dnzExists);
66 66
            
67 67
            Assert.IsFalse(mooExists);
......
73 73
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
74 74
            client.Authenticate(_userName, _apiKey);
75 75

  
76
            client.CreateContainer("PITHOS");
77
            client.CreateContainer("DotNetZone");
76
            client.CreateContainer(null, "PITHOS");
77
            client.CreateContainer(null, "DotNetZone");
78 78

  
79
            var dnzInfo =client.GetContainerInfo("DotNetZone");
79
            var dnzInfo =client.GetContainerInfo(null, "DotNetZone");
80 80
            Assert.AreNotEqual(ContainerInfo.Empty, dnzInfo,"Expected DotNetZone container not found");
81 81

  
82
            var pithosInfo = client.GetContainerInfo("PITHOS");
82
            var pithosInfo = client.GetContainerInfo(null, "PITHOS");
83 83
            Assert.AreNotEqual(ContainerInfo.Empty, pithosInfo,"Expected PITHOS container not found");
84 84

  
85
            var mooInfo = client.GetContainerInfo("moo");
85
            var mooInfo = client.GetContainerInfo(null, "moo");
86 86
            Assert.AreEqual(ContainerInfo.Empty, mooInfo);
87 87
        }
88 88

  
......
94 94
                                        ICloudClient client = new CloudFilesClient{UsePithos=usePithos};
95 95
                                        client.Authenticate(_userName, _apiKey);
96 96

  
97
                                        client.CreateContainer("Shares2");
98
                                        Assert.IsTrue(client.ContainerExists("Shares2"));
99
                                        client.DeleteContainer("Shares2");
97
                                        client.CreateContainer(null, "Shares2");
98
                                        Assert.IsTrue(client.ContainerExists(null, "Shares2"));
99
                                        client.DeleteContainer(null, "Shares2");
100 100

  
101
                                        client.CreateContainer("Shares");
102
                                        Assert.IsTrue(client.ContainerExists("Shares"));
103
                                        client.CreateContainer("DotNetZone");
104
                                        Assert.IsTrue(client.ContainerExists("DotNetZone"));
101
                                        client.CreateContainer(null, "Shares");
102
                                        Assert.IsTrue(client.ContainerExists(null, "Shares"));
103
                                        client.CreateContainer(null, "DotNetZone");
104
                                        Assert.IsTrue(client.ContainerExists(null, "DotNetZone"));
105 105
                                    });
106 106
        }
107 107

  
......
113 113
                ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
114 114
                client.Authenticate(_userName, _apiKey);
115 115
                //Prepare test file
116
                client.CreateContainer("Shares");                
116
                client.CreateContainer(null, "Shares");                
117 117
                string testFileName = "test.txt";                
118 118
                var info = new FileInfo(testFileName);
119
                client.PutObject("Shares",testFileName,testFileName);
119
                client.PutObject(null, "Shares",testFileName,testFileName);
120 120
                
121 121

  
122 122
                string downloadFile = "test2.txt";
123
                client.GetObject("Shares", testFileName, downloadFile)
123
                client.GetObject(null, "Shares", testFileName, downloadFile)
124 124
                    .Wait();
125 125

  
126 126
                Assert.IsTrue(File.Exists(downloadFile));
......
137 137
                                        ICloudClient client = new CloudFilesClient {UsePithos = usePithos};
138 138
                                        client.Authenticate(_userName, _apiKey);
139 139

  
140
                                        client.CreateContainer("Shares");
141
                                        Assert.IsTrue(client.ContainerExists("Shares"));
140
                                        client.CreateContainer(null, "Shares");
141
                                        Assert.IsTrue(client.ContainerExists(null, "Shares"));
142 142

  
143 143
                                        var filePath = "devguide.pdf";
144 144
                                        FileInfo info = new FileInfo(filePath);
145 145

  
146 146

  
147
                                        client.PutObject("Shares", info.Name, filePath);
147
                                        client.PutObject(null, "Shares", info.Name, filePath);
148 148

  
149 149

  
150 150
                                    });
......
159 159
                ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
160 160
                client.Authenticate(_userName, _apiKey);
161 161

  
162
                client.CreateContainer("Shares");
163
                Assert.IsTrue(client.ContainerExists("Shares"));
162
                client.CreateContainer(null, "Shares");
163
                Assert.IsTrue(client.ContainerExists(null, "Shares"));
164 164

  
165 165
                var filePath = "devguide.pdf";
166 166
                FileInfo info = new FileInfo(filePath);
167 167

  
168 168
               
169
                    client.PutObject("Shares", info.Name, filePath);
169
                    client.PutObject(null, "Shares", info.Name, filePath);
170 170
                
171 171

  
172 172

  
173 173
                
174
                var meta=client.GetObjectInfo("Shares", filePath);
174
                var meta=client.GetObjectInfo(null, "Shares", filePath);
175 175
                Assert.IsNotEmpty(meta.Hash);
176 176
                Assert.AreEqual(meta.Name,filePath);
177 177

  
......
187 187
                ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
188 188
                client.Authenticate(_userName, _apiKey);
189 189

  
190
                client.CreateContainer("Shares");
191
                Assert.IsTrue(client.ContainerExists("Shares"),"Container Exists");                
190
                client.CreateContainer(null, "Shares");
191
                Assert.IsTrue(client.ContainerExists(null, "Shares"),"Container Exists");                
192 192

  
193 193
                var filePath = "devguide.pdf";
194 194
                FileInfo info=new FileInfo(filePath);
195 195
                
196 196
               
197
                    client.PutObject("Shares",info.Name, filePath);
197
                    client.PutObject(null, "Shares",info.Name, filePath);
198 198
                
199 199

  
200
                Assert.IsTrue(client.ObjectExists("Shares",info.Name),"File Created");
200
                Assert.IsTrue(client.ObjectExists(null, "Shares",info.Name),"File Created");
201 201

  
202
                client.DeleteObject("Shares/devguide.pdf",info.Name);
202
                client.DeleteObject(null, "Shares/devguide.pdf",info.Name,"trash");
203 203
                
204 204
            });
205 205

  
......
213 213
                ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
214 214
                client.Authenticate(_userName, _apiKey);
215 215

  
216
                client.CreateContainer("Shares");
217
                Assert.IsTrue(client.ContainerExists("Shares"),"Container Exists");                
216
                client.CreateContainer(null, "Shares");
217
                Assert.IsTrue(client.ContainerExists(null, "Shares"),"Container Exists");                
218 218

  
219 219
                var filePath = "devguide.pdf";
220 220
                FileInfo info=new FileInfo(filePath);
221 221
                
222 222
               
223
                    client.PutObject("Shares",info.Name, filePath );
223
                    client.PutObject(null, "Shares",info.Name, filePath );
224 224
                
225 225

  
226
                Assert.IsTrue(client.ObjectExists("Shares",info.Name),"File Created");
226
                Assert.IsTrue(client.ObjectExists(null, "Shares",info.Name),"File Created");
227 227

  
228
                client.DeleteObject("Shares",info.Name);
229
                Assert.IsFalse(client.ObjectExists("Shares", info.Name),"Container Deleted");
228
                client.DeleteObject(null, "Shares",info.Name,"trash");
229
                Assert.IsFalse(client.ObjectExists(null, "Shares", info.Name),"Container Deleted");
230 230
                
231
                client.DeleteObject("Moo",info.Name);
232
                Assert.IsFalse(client.ObjectExists("Moo", info.Name),"Container Deleted");
231
                client.DeleteObject(null, "Moo",info.Name,"trash");
232
                Assert.IsFalse(client.ObjectExists(null, "Moo", info.Name),"Container Deleted");
233 233
                
234 234
            });
235 235

  
......
272 272
                ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
273 273
                client.Authenticate(_userName, _apiKey);
274 274

  
275
                client.CreateContainer("Shares");
276
                Assert.IsTrue(client.ContainerExists("Shares"),"Container Exists");                
275
                client.CreateContainer(null, "Shares");
276
                Assert.IsTrue(client.ContainerExists(null, "Shares"),"Container Exists");                
277 277

  
278 278
                var filePath = "devguide.pdf";
279 279
                FileInfo info=new FileInfo(filePath);
280 280
                
281 281
               
282
                    client.PutObject("Shares",info.Name, filePath);
282
                    client.PutObject(null, "Shares",info.Name, filePath);
283 283
                
284 284

  
285
                Assert.IsTrue(client.ObjectExists("Shares",info.Name),"File Created");
285
                Assert.IsTrue(client.ObjectExists(null, "Shares",info.Name),"File Created");
286 286

  
287
                client.MoveObject("Shares",info.Name,"Shares","smoo.pdf");
288
                Assert.IsFalse(client.ObjectExists("Shares", info.Name),"Original File Deleted");
289
                Assert.IsTrue(client.ObjectExists("Shares", "smoo.pdf"), "Target File Created");
287
                client.MoveObject(null, "Shares",info.Name,"Shares","smoo.pdf");
288
                Assert.IsFalse(client.ObjectExists(null, "Shares", info.Name),"Original File Deleted");
289
                Assert.IsTrue(client.ObjectExists(null, "Shares", "smoo.pdf"), "Target File Created");
290 290

  
291 291
            });
292 292

  

Also available in: Unified diff