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

b/trunk/Pithos.Network.Test/FolderTests.cs
43 43
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
44 44
            client.Authenticate(_userName, _apiKey);
45 45

  
46
            client.CreateContainer("Pithos");
46
            client.CreateContainer(null, "Pithos");
47 47

  
48
            client.CreateFolder("Pithos", "RootFolder");
48
            client.CreateFolder(null, "Pithos", "RootFolder");
49 49

  
50
            Assert.IsTrue(client.ObjectExists("Pithos","RootFolder"));
51
            var info = client.GetObjectInfo("Pithos", "RootFolder");
50
            Assert.IsTrue(client.ObjectExists(null, "Pithos","RootFolder"));
51
            var info = client.GetObjectInfo(null, "Pithos", "RootFolder");
52 52
            Assert.AreEqual(@"application/directory",info.Content_Type);
53 53
            
54 54
        } 
......
59 59
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
60 60
            client.Authenticate(_userName, _apiKey);
61 61

  
62
            client.CreateContainer("Pithos");
62
            client.CreateContainer(null, "Pithos");
63 63

  
64
            client.CreateFolder("Pithos", "RootFolder");
65
            client.CreateFolder("Pithos", "RootFolder/Folder1");            
66
            client.PutObject("Pithos","RootFolder/Folder1/test.txt","test.txt");
64
            client.CreateFolder(null, "Pithos", "RootFolder");
65
            client.CreateFolder(null, "Pithos", "RootFolder/Folder1");            
66
            client.PutObject(null, "Pithos","RootFolder/Folder1/test.txt","test.txt");
67 67

  
68 68

  
69
            Assert.IsTrue(client.ObjectExists("Pithos", "RootFolder/Folder1"));
70
            var folderInfo = client.GetObjectInfo("Pithos", "RootFolder/Folder1");
69
            Assert.IsTrue(client.ObjectExists(null, "Pithos", "RootFolder/Folder1"));
70
            var folderInfo = client.GetObjectInfo(null, "Pithos", "RootFolder/Folder1");
71 71
            Assert.AreEqual(@"application/directory",folderInfo.Content_Type);
72 72

  
73 73

  
74
            Assert.IsTrue(client.ObjectExists("Pithos", "RootFolder/Folder1/test.txt"));
75
            var fileInfo = client.GetObjectInfo("Pithos", "RootFolder/Folder1/test.txt");
74
            Assert.IsTrue(client.ObjectExists(null, "Pithos", "RootFolder/Folder1/test.txt"));
75
            var fileInfo = client.GetObjectInfo(null, "Pithos", "RootFolder/Folder1/test.txt");
76 76
            Assert.AreEqual(@"application/octet-stream", fileInfo.Content_Type);
77 77
            
78 78
        }
......
80 80
        [Test]
81 81
        public void TestDeleteSubFolders([Values(true, false)]bool usePithos)
82 82
        {
83
            throw new NotImplementedException();
84 83
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
85 84
            client.Authenticate(_userName, _apiKey);
86 85

  
87
            client.CreateContainer("Pithos");
86
            client.CreateContainer(null, "Pithos");
88 87

  
89
            client.CreateFolder("Pithos", "RootFolder");
90
            client.CreateFolder("Pithos", "RootFolder/Folder1");
88
            client.CreateFolder(null, "Pithos", "RootFolder");
89
            client.CreateFolder(null, "Pithos", "RootFolder/Folder1");
91 90
            var localInfo = new FileInfo("test.txt");
92
            client.PutObject("Pithos","RootFolder/Folder1/test.txt","test.txt");
91
            client.PutObject(null, "Pithos","RootFolder/Folder1/test.txt","test.txt");
93 92

  
94
            client.DeleteObject("Pithos", "RootFolder/Folder1");
93
            client.DeleteObject(null, "pithos", "RootFolder/Folder1","trash");
95 94

  
96
            Assert.IsTrue(client.ObjectExists("Pithos", "RootFolder/Folder1"));
97
            var folderInfo = client.GetObjectInfo("Pithos", "RootFolder/Folder1");
95
            Assert.IsTrue(client.ObjectExists(null, "Pithos", "RootFolder/Folder1"));
96
            var folderInfo = client.GetObjectInfo(null, "Pithos", "RootFolder/Folder1");
98 97
            Assert.AreEqual(@"application/directory",folderInfo.Content_Type);
99 98

  
100 99

  
101
            Assert.IsTrue(client.ObjectExists("Pithos", "RootFolder/Folder1/test.txt"));
102
            var fileInfo = client.GetObjectInfo("Pithos", "RootFolder/Folder1/test.txt");
100
            Assert.IsTrue(client.ObjectExists(null, "Pithos", "RootFolder/Folder1/test.txt"));
101
            var fileInfo = client.GetObjectInfo(null, "Pithos", "RootFolder/Folder1/test.txt");
103 102
            Assert.AreEqual(@"application/octet-stream", fileInfo.Content_Type);
104 103
            
105 104
        } 
......
110 109
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
111 110
            client.Authenticate(_userName, _apiKey);
112 111

  
113
            client.CreateContainer("Pithos");
114
            client.CreateFolder("Pithos", "RootFolder3");
115
            client.CreateFolder("Pithos", "RootFolder3/Folder1");
112
            client.CreateContainer(null, "Pithos");
113
            client.CreateFolder(null, "Pithos", "RootFolder3");
114
            client.CreateFolder(null, "Pithos", "RootFolder3/Folder1");
116 115

  
117 116
            
118
            client.PutObject("Pithos", "RootFolder3/test1.txt", "test.txt");
119
            client.PutObject("Pithos", "RootFolder3/test2.txt", "test.txt");
120
            client.PutObject("Pithos", "RootFolder3/Folder1/test2.txt", "test.txt");
117
            client.PutObject(null, "Pithos", "RootFolder3/test1.txt", "test.txt");
118
            client.PutObject(null, "Pithos", "RootFolder3/test2.txt", "test.txt");
119
            client.PutObject(null, "Pithos", "RootFolder3/Folder1/test2.txt", "test.txt");
121 120

  
122 121
            var files=client.ListObjects("Pithos", "RootFolder3");
123 122
            Assert.AreEqual(3,files.Count,"Unexpected number of root items");
......
135 134
            ICloudClient client = new CloudFilesClient { UsePithos = usePithos };
136 135
            client.Authenticate(_userName, _apiKey);
137 136

  
138
            client.CreateContainer("Pithos");
137
            client.CreateContainer(null, "Pithos");
139 138
            
140
            client.CreateFolder("Pithos", "RootFolder2/Folder1");
139
            client.CreateFolder(null, "Pithos", "RootFolder2/Folder1");
141 140

  
142
            Assert.IsTrue(client.ObjectExists("Pithos", "RootFolder2/Folder1"));
143
            var folderInfo = client.GetObjectInfo("Pithos", "RootFolder2/Folder1");
141
            Assert.IsTrue(client.ObjectExists(null, "Pithos", "RootFolder2/Folder1"));
142
            var folderInfo = client.GetObjectInfo(null, "Pithos", "RootFolder2/Folder1");
144 143
            Assert.AreEqual(@"application/directory",folderInfo.Content_Type);
145 144

  
146
            Assert.IsTrue(client.ObjectExists("Pithos", "RootFolder2"));
147
            folderInfo = client.GetObjectInfo("Pithos", "RootFolder2");
145
            Assert.IsTrue(client.ObjectExists(null, "Pithos", "RootFolder2"));
146
            folderInfo = client.GetObjectInfo(null, "Pithos", "RootFolder2");
148 147
            Assert.AreEqual(@"application/directory", folderInfo.Content_Type);
149 148

  
150 149

  
151
            Assert.IsTrue(client.ObjectExists("Pithos", "RootFolder2/Folder1/test.txt"));
152
            var fileInfo = client.GetObjectInfo("Pithos", "RootFolder2/Folder1/test.txt");
150
            Assert.IsTrue(client.ObjectExists(null, "Pithos", "RootFolder2/Folder1/test.txt"));
151
            var fileInfo = client.GetObjectInfo(null, "Pithos", "RootFolder2/Folder1/test.txt");
153 152
            Assert.AreEqual(@"application/octet-stream", fileInfo.Content_Type);
154 153
            
155 154
        }

Also available in: Unified diff