Browse Source

add unit tests

hangzws 7 years ago
parent
commit
5a38bcad62
3 changed files with 29 additions and 8 deletions
  1. 11 5
      oss/bucket_test.go
  2. 2 2
      oss/multipart_test.go
  3. 16 1
      oss/option_test.go

+ 11 - 5
oss/bucket_test.go

@@ -864,6 +864,12 @@ func (s *OssBucketSuite) TestGetObject(c *C) {
 	_, err = s.bucket.GetObject(objectName, IfNoneMatch(meta.Get("Etag")))
 	_, err = s.bucket.GetObject(objectName, IfNoneMatch(meta.Get("Etag")))
 	c.Assert(err, NotNil)
 	c.Assert(err, NotNil)
 
 
+	// process
+	err = s.bucket.PutObjectFromFile(objectName, "../sample/BingWallpaper-2015-11-07.jpg")
+	c.Assert(err, IsNil)
+	_, err = s.bucket.GetObject(objectName, Process("image/format,png"))
+	c.Assert(err, IsNil)
+
 	err = s.bucket.DeleteObject(objectName)
 	err = s.bucket.DeleteObject(objectName)
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
 }
 }
@@ -970,7 +976,10 @@ func (s *OssBucketSuite) TestGetObjectToFile(c *C) {
 	eq, err = compareFileData(newFile, val)
 	eq, err = compareFileData(newFile, val)
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
 	c.Assert(eq, Equals, true)
 	c.Assert(eq, Equals, true)
-	os.Remove(newFile)
+
+	// If-None-Match
+	err = s.bucket.GetObjectToFile(objectName, newFile, IfNoneMatch(meta.Get("Etag")))
+	c.Assert(err, NotNil)
 
 
 	// Accept-Encoding:gzip
 	// Accept-Encoding:gzip
 	err = s.bucket.PutObjectFromFile(objectName, "../sample/The Go Programming Language.html")
 	err = s.bucket.PutObjectFromFile(objectName, "../sample/The Go Programming Language.html")
@@ -978,10 +987,7 @@ func (s *OssBucketSuite) TestGetObjectToFile(c *C) {
 	err = s.bucket.GetObjectToFile(objectName, newFile, AcceptEncoding("gzip"))
 	err = s.bucket.GetObjectToFile(objectName, newFile, AcceptEncoding("gzip"))
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
 
 
-	// If-None-Match
-	err = s.bucket.GetObjectToFile(objectName, newFile, IfNoneMatch(meta.Get("Etag")))
-	c.Assert(err, NotNil)
-
+	os.Remove(newFile)
 	err = s.bucket.DeleteObject(objectName)
 	err = s.bucket.DeleteObject(objectName)
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
 }
 }

+ 2 - 2
oss/multipart_test.go

@@ -622,7 +622,7 @@ func (s *OssBucketMultipartSuite) TestMultipartNegative(c *C) {
 	imur, err := s.bucket.InitiateMultipartUpload(string(data))
 	imur, err := s.bucket.InitiateMultipartUpload(string(data))
 	c.Assert(err, NotNil)
 	c.Assert(err, NotNil)
 
 
-	// Invalid imur 
+	// Invalid imur
 	fileName := "../sample/BingWallpaper-2015-11-07.jpg"
 	fileName := "../sample/BingWallpaper-2015-11-07.jpg"
 	fd, err := os.Open(fileName)
 	fd, err := os.Open(fileName)
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
@@ -668,7 +668,7 @@ func (s *OssBucketMultipartSuite) TestMultipartNegative(c *C) {
 	err = s.bucket.AbortMultipartUpload(imur)
 	err = s.bucket.AbortMultipartUpload(imur)
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
 
 
-	// Invalid option 
+	// Invalid option
 	_, err = s.bucket.InitiateMultipartUpload(objectName, IfModifiedSince(futureDate))
 	_, err = s.bucket.InitiateMultipartUpload(objectName, IfModifiedSince(futureDate))
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
 }
 }

+ 16 - 1
oss/option_test.go

@@ -196,6 +196,21 @@ var paramTestCases = []optionTestCase{
 		key:    "upload-id-marker",
 		key:    "upload-id-marker",
 		value:  "xyz",
 		value:  "xyz",
 	},
 	},
+	{
+		option: MaxParts(1000),
+		key:    "max-parts",
+		value:  "1000",
+	},
+	{
+		option: PartNumberMarker(1),
+		key:    "part-number-marker",
+		value:  "1",
+	},
+	{
+		option: Process("image/format,png"),
+		key:    "x-oss-process",
+		value:  "image/format,png",
+	},
 }
 }
 
 
 func (s *OssOptionSuite) TestParamOptions(c *C) {
 func (s *OssOptionSuite) TestParamOptions(c *C) {
@@ -246,7 +261,7 @@ func (s *OssOptionSuite) TestHandleParams(c *C) {
 	c.Assert(err, IsNil)
 	c.Assert(err, IsNil)
 
 
 	out := client.Conn.getURLParams(params)
 	out := client.Conn.getURLParams(params)
-	c.Assert(len(out), Equals, 120)
+	c.Assert(len(out), Equals, 191)
 
 
 	options = []Option{KeyMarker(""), nil}
 	options = []Option{KeyMarker(""), nil}