Merge pull request #90 from longbai/release7.0.14

release7.0.14

Author: longbai

CHANGELOG.md

@@ -1,5 +1,10 @@
 #Changelog
 
+## 7.0.13 (2015-11-08)
+
+### 增加
+* 上传性能统计
+
 ## 7.0.13 (2015-10-28)
 
 ### 增加

Qiniu.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = 'Qiniu'
-  s.version      = '7.0.13'
+  s.version      = '7.0.14'
   s.summary      = 'Qiniu Resource Storage SDK for iOS and Mac'
   s.homepage     = 'https://github.com/qiniu/objc-sdk'
   s.social_media_url = 'http://weibo.com/qiniutek'
@@ -18,7 +18,7 @@ Pod::Spec.new do |s|
   s.license = { :type => 'MIT', :text => <<-LICENSE
 The MIT License (MIT)
 
-Copyright (c) 2012-2014 qiniu.com
+Copyright (c) 2011-2015 qiniu.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

QiniuSDK/Common/QNVersion.h

@@ -11,4 +11,4 @@
 /**
  *    sdk 版本
  */
-static const NSString *kQiniuVersion = @"7.0.13";
+static const NSString *kQiniuVersion = @"7.0.14";

QiniuSDKTests/QNEtagTest.m

@@ -21,15 +21,22 @@ - (void)testEtagZero {
 	XCTAssert([@"Fto5o-5ea0sNMlW_75VgGJCv2AcJ" isEqualToString:[QNEtag data:nil]], @"Pass");
 }
 
-- (void)testFile {
+- (void)testFile5M {
 	NSError *error;
 	NSURL *file = [QNTempFile createTempfileWithSize:5 * 1024 * 1024];
 	NSString *x = [QNEtag file:[file relativePath] error:&error];
-	NSLog(@"%@", x);
 	XCTAssert([@"lrMhp7oU8rzWSRlmUeGJ73Q2pVa-" isEqualToString:x], @"Pass");
 	[QNTempFile removeTempfile:file];
 }
 
+- (void)testFile3M {
+    NSError *error;
+    NSURL *file = [QNTempFile createTempfileWithSize:3 * 1024 * 1024];
+    NSString *x = [QNEtag file:[file relativePath] error:&error];
+    XCTAssert([@"Fh5fje9Auwyw9xVrnCurnvtJz7aZ" isEqualToString:x], @"Pass");
+    [QNTempFile removeTempfile:file];
+}
+
 - (void)testData {
 	NSData *data = [@"etag" dataUsingEncoding:NSUTF8StringEncoding];
 	NSLog(@"%@", [QNEtag data:data]);