Improve error message for Downloader and add test case

Author: pandamicro

cocos/network/CCDownloader-apple.mm

@@ -25,6 +25,7 @@ of this software and associated documentation files (the "Software"), to deal
 #include "network/CCDownloader-apple.h"
 
 #include "network/CCDownloader.h"
+#include "CCString.h"
 #include <queue>
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -399,7 +400,7 @@ - (void)URLSession:(NSURLSession *)session task :(NSURLSessionTask *)task
         else if(![wrapper get]->storagePath.length()) {
             // call onTaskFinish for a data task
             // (for a file download task, callback is called in didFinishDownloadingToURL)
-            std::string errorString;
+            std::string errorString = cocos2d::StringUtils::format("Downloader: Failed to download %s with no error", [task.originalRequest.URL.absoluteString cStringUsingEncoding:NSUTF8StringEncoding]);
 
             const int64_t buflen = [wrapper totalBytesReceived];
             char buf[buflen];
@@ -522,7 +523,7 @@ - (void)URLSession:(NSURLSession *)session downloadTask :(NSURLSessionDownloadTa
     NSInteger statusCode = ((NSHTTPURLResponse*)downloadTask.response).statusCode;
     if (statusCode >= 400) {
         std::vector<unsigned char> buf; // just a placeholder
-        std::string response = [[NSString stringWithContentsOfURL:location] UTF8String] ?: "";
+        std::string response = cocos2d::StringUtils::format("Downloader: Failed to download %s with status code (%d)", [downloadTask.originalRequest.URL.absoluteString cStringUsingEncoding:NSUTF8StringEncoding], (int)statusCode);
         _outer->onTaskFinish(*[wrapper get], cocos2d::network::DownloadTask::ERROR_IMPL_INTERNAL, noErr, response, buf);
         return;
     }

tests/cpp-tests/Classes/DownloaderTest/DownloaderTest.cpp

@@ -36,15 +36,15 @@ static const char* sURLList[] =
 {
     "http://www.cocos2d-x.org/attachments/802/cocos2dx_landscape.png",
     "http://www.cocos2d-x.org/docs/manual/framework/native/wiki/logo-resources-of-cocos2d-x/res/2dx_icon_512_rounded.png",
-    "http://www.cocos2d-x.org/attachments/1503/Cocos2CoordinateRelease.png",
+    "http://www.cocos2d-x.org/attachments/1503/inexist.png",
     "http://download.sdkbox.com/installer/v1/sdkbox-iap_v1.2.3.3.tar.gz",
 };
 const static int sListSize = (sizeof(sURLList)/sizeof(sURLList[0]));
 static const char* sNameList[sListSize] =
 {
     "cocos2dx_landscape.png",
     "2dx_icon_512_rounded.png",
-    "Cocos2CoordinateRelease.png",
+    "inexist file",
     "big file",
 };
 
@@ -112,6 +112,7 @@ struct DownloaderTest : public TestCase
         label->setPosition(Vec2(viewSize.width / 2, viewSize.height / 2));
         label->setContentSize(Size(viewSize.width, 0));
         label->setAlignment(TextHAlignment::CENTER, TextVAlignment::CENTER);
+        label->setDimensions(viewSize.width, viewSize.height);
         bg->addChild(label, 20);
 
         return bg;

tests/cpp-tests/proj.ios/Info.plist

@@ -8,6 +8,15 @@
 		<false/>
 		<key>NSExceptionDomains</key>
 		<dict>
+			<key>sdkbox.com</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSTemporaryExceptionMinimumTLSVersion</key>
+				<string>TLSv1.1</string>
+			</dict>
 			<key>cocos2d-x.org</key>
 			<dict>
 				<key>NSIncludesSubdomains</key>

tests/js-tests/src/TextureCacheTest/TextureCacheTest.js

@@ -282,6 +282,8 @@ var RemoteTextureTest = TextureCacheTestBase.extend({
         for (var i = 0; i < imageUrlArray.length; i++) {
             cc.textureCache.addImageAsync(imageUrlArray[i], this.texLoaded, this);
         }
+
+        cc.loader.loadImg("http://www.cocos2d-x.org/no_such_file.jpg", this.failLoaded.bind(this));
     },
 
     texLoaded: function(texture) {
@@ -296,6 +298,21 @@ var RemoteTextureTest = TextureCacheTestBase.extend({
         else {
             cc.log("Fail to load remote texture");
         }
+    },
+
+    failLoaded: function (err, img) {
+        var str = "";
+        if (err) {
+            str = "Correct behavior: failed to download from wrong url";
+        }
+        else {
+            str = "!!! Wrong behavior: succeed to download from wrong url";
+        }
+
+        var label = new cc.LabelTTF(str, "Times New Roman", 28);
+        label.x = winSize.width / 2;
+        label.y = winSize.height / 2;
+        this.addChild(label, 100);
     }
 });