Merge pull request #45 in MOBILE-SDK/app_mobile-sdk-ios from MS-2664-…

…Unit-Test-Fixes to master * commit '4c4d1eb0e0586c8b466804c6de13fef44134d9c7': MS-2664 Use acdn.adnxs.com/mobile endpoint for unit test assets
appnexus · Aug 29, 2016 · 6181955 · 6181955
2 parents 26e5308 + 4c4d1eb
commit 6181955
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 57 deletions.
diff --git a/tests/MediationAdapterAppTests/MediationAdaptersTestCase.m b/tests/MediationAdapterAppTests/MediationAdaptersTestCase.m
@@ -105,22 +105,23 @@ - (void)testMillennialSuccessfulBanner {
 }
 
 - (void)testiAdSuccessfulBanner {
-    ANBannerAdView *bannerAdView = [self.rootViewController loadiAdBannerWithDelegate:self];
-    [self.rootViewController.view addSubview:bannerAdView];
-
-    self.adResponseExpectation = [self expectationWithDescription:@"ad received/failed response"];
-    [self waitForExpectationsWithTimeout:kAppNexusRequestTimeoutInterval handler:nil];
-    XCTAssertFalse(self.didFailToReceiveAd, @"Received successful callback, but no ad was received.");
-
-#if kANMediationAdaptersUITesting
-    bannerAdView.accessibilityLabel = @"banner";
-    [tester tapViewWithAccessibilityLabel:@"banner"];
-    [tester waitForTimeInterval:3.0];
-    XCTAssertTrue(self.adWasClicked, @"expected adWasClicked callback");
-    XCTAssertTrue(self.adWillPresent, @"expected adWillPresent callback");
-    XCTAssertTrue(self.adDidPresent, @"expected adDidPresent callback");
-    [tester waitForTimeInterval:3.0];
-#endif
+    // iAd App Network shut down as of July 1, 2016
+//    ANBannerAdView *bannerAdView = [self.rootViewController loadiAdBannerWithDelegate:self];
+//    [self.rootViewController.view addSubview:bannerAdView];
+//    
+//    self.adResponseExpectation = [self expectationWithDescription:@"ad received/failed response"];
+//    [self waitForExpectationsWithTimeout:kAppNexusRequestTimeoutInterval handler:nil];
+//    XCTAssertFalse(self.didFailToReceiveAd, @"Received successful callback, but no ad was received.");
+//    
+//#if kANMediationAdaptersUITesting
+//    bannerAdView.accessibilityLabel = @"banner";
+//    [tester tapViewWithAccessibilityLabel:@"banner"];
+//    [tester waitForTimeInterval:3.0];
+//    XCTAssertTrue(self.adWasClicked, @"expected adWasClicked callback");
+//    XCTAssertTrue(self.adWillPresent, @"expected adWillPresent callback");
+//    XCTAssertTrue(self.adDidPresent, @"expected adDidPresent callback");
+//    [tester waitForTimeInterval:3.0];
+//#endif
 }
 
 - (void)testFacebookSuccessfulBanner {

diff --git a/tests/NativeUnitTests/ANNativeAdResponseTestCase.m b/tests/NativeUnitTests/ANNativeAdResponseTestCase.m
@@ -212,7 +212,7 @@ - (void)testAppNexusWithMultipleMainMedia {
     [self iconImageShouldBePresentInResponse:YES];
     [self mainImageShouldBePresentInResponse:YES];
 
-    XCTAssertTrue([self.adResponse.mainImageURL.absoluteString containsString:@"rlissack.adnxs.net"]);
+    XCTAssertTrue([self.adResponse.mainImageURL.absoluteString containsString:@"acdn.adnxs.com/mobile"]);
 
     [self createMainImageNativeView];
     [self populateNativeViewWithResponse];
@@ -246,7 +246,7 @@ - (void)testAppNexusWithMultipleMainMediaDefault {
     [self iconImageShouldBePresentInResponse:YES];
     [self mainImageShouldBePresentInResponse:YES];
 
-    XCTAssertTrue([self.adResponse.mainImageURL.absoluteString containsString:@"rlissack.adnxs.net"]);
+    XCTAssertTrue([self.adResponse.mainImageURL.absoluteString containsString:@"acdn.adnxs.com/mobile"]);
 
     [self createMainImageNativeView];
     [self populateNativeViewWithResponse];

diff --git a/tests/NativeUnitTests/ANNativeImpressionTrackerManagerTestCase.m b/tests/NativeUnitTests/ANNativeImpressionTrackerManagerTestCase.m
@@ -48,7 +48,7 @@ - (void)testSimulateOffline {
                                                  name:kANHTTPStubURLProtocolRequestDidLoadNotification
                                                object:nil];
     [ANReachability toggleNonReachableNetworkStatusSimulationEnabled:YES];
-    self.URL = [NSURL URLWithString:@"http://rlissack.adnxs.net:8080/jtest/native/empty_response.json"];
+    self.URL = [NSURL URLWithString:@"https://acdn.adnxs.com/mobile/native_test/empty_response.json"];
     [ANNativeImpressionTrackerManager fireImpressionTrackerURL:self.URL];
     [XCTestCase delayForTimeInterval:3.0];
     XCTAssertFalse(self.urlWasFired);

diff --git a/tests/NativeUnitTests/Native Responses/appnexus_click_fallback_example.json b/tests/NativeUnitTests/Native Responses/appnexus_click_fallback_example.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"
@@ -25,7 +25,7 @@
             "scale":5
          },
          "impression_trackers":[  
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression"
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression"
          ],
          "click_trackers":[  
             "http://nym1.ib.adnxs.com/click?AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA_AAAAAAAAAAAAAAAAAAAAAJkJvjGlBMFaZyDVla9jmxLH_n1UAAAAAJ-nIAC-AwAAvgMAAAIAAACL37AAtZgCAAAAAQBVU0QAVVNEACwB-gARIAAA5uUAAgMCAQIAAAAAJBbkOAAAAAA./cnd=%21-gXbOAi9vKkBEIu_wwUYtbEKIAQ./referrer=http%3A%2F%2Fapps.mobile.adnxs.com/clickenc="

diff --git a/tests/NativeUnitTests/Native Responses/appnexus_multiple_main_media.json b/tests/NativeUnitTests/Native Responses/appnexus_multiple_main_media.json
@@ -11,7 +11,7 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[
             {
                "url":"http://upload.wikimedia.org/wikipedia/commons/0/0a/Eastern_Grey_Squirrel.jpg",
@@ -20,7 +20,7 @@
                "label":"banner"
             },
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"
@@ -37,7 +37,7 @@
             "scale":5
          },
          "impression_trackers":[  
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression"
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression"
          ],
          "click_trackers":[  
             "http://nym1.ib.adnxs.com/click?AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA_AAAAAAAAAAAAAAAAAAAAAJkJvjGlBMFaZyDVla9jmxLH_n1UAAAAAJ-nIAC-AwAAvgMAAAIAAACL37AAtZgCAAAAAQBVU0QAVVNEACwB-gARIAAA5uUAAgMCAQIAAAAAJBbkOAAAAAA./cnd=%21-gXbOAi9vKkBEIu_wwUYtbEKIAQ./referrer=http%3A%2F%2Fapps.mobile.adnxs.com/clickenc="

diff --git a/tests/NativeUnitTests/Native Responses/appnexus_multiple_main_media_default.json b/tests/NativeUnitTests/Native Responses/appnexus_multiple_main_media_default.json
@@ -11,7 +11,7 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[
             {
                "url":"http://upload.wikimedia.org/wikipedia/commons/0/0a/Eastern_Grey_Squirrel.jpg",
@@ -20,7 +20,7 @@
                "label":"banner"
             },
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"
@@ -37,7 +37,7 @@
             "scale":5
          },
          "impression_trackers":[  
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression"
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression"
          ],
          "click_trackers":[  
             "http://nym1.ib.adnxs.com/click?AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA_AAAAAAAAAAAAAAAAAAAAAJkJvjGlBMFaZyDVla9jmxLH_n1UAAAAAJ-nIAC-AwAAvgMAAAIAAACL37AAtZgCAAAAAQBVU0QAVVNEACwB-gARIAAA5uUAAgMCAQIAAAAAJBbkOAAAAAA./cnd=%21-gXbOAi9vKkBEIu_wwUYtbEKIAQ./referrer=http%3A%2F%2Fapps.mobile.adnxs.com/clickenc="

diff --git a/tests/NativeUnitTests/Native Responses/appnexus_multiple_trackers.json b/tests/NativeUnitTests/Native Responses/appnexus_multiple_trackers.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"
@@ -25,15 +25,15 @@
             "scale":5
          },
          "impression_trackers":[  
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression",
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression2",
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression3",
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression",
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression2",
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression3",
          ],
          "click_trackers":[  
             "http://nym1.ib.adnxs.com/click?AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA_AAAAAAAAAAAAAAAAAAAAAJkJvjGlBMFaZyDVla9jmxLH_n1UAAAAAJ-nIAC-AwAAvgMAAAIAAACL37AAtZgCAAAAAQBVU0QAVVNEACwB-gARIAAA5uUAAgMCAQIAAAAAJBbkOAAAAAA./cnd=%21-gXbOAi9vKkBEIu_wwUYtbEKIAQ./referrer=http%3A%2F%2Fapps.mobile.adnxs.com/clickenc=",
-            "http://rlissack.adnxs.net:8080/jtest/trackClick",
-            "http://rlissack.adnxs.net:8080/jtest/trackClick2",
-            "http://rlissack.adnxs.net:8080/jtest/trackClick3"
+            "https://acdn.adnxs.com/mobile/native_test/trackClick",
+            "https://acdn.adnxs.com/mobile/native_test/trackClick2",
+            "https://acdn.adnxs.com/mobile/native_test/trackClick3"
          ],
          "click_url":"http://appnexus.com"
       }

diff --git a/tests/NativeUnitTests/Native Responses/appnexus_standard_response.json b/tests/NativeUnitTests/Native Responses/appnexus_standard_response.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"
@@ -25,7 +25,7 @@
             "scale":5
          },
          "impression_trackers":[  
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression"
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression"
          ],
          "click_trackers":[  
             "http://nym1.ib.adnxs.com/click?AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA_AAAAAAAAAAAAAAAAAAAAAJkJvjGlBMFaZyDVla9jmxLH_n1UAAAAAJ-nIAC-AwAAvgMAAAIAAACL37AAtZgCAAAAAQBVU0QAVVNEACwB-gARIAAA5uUAAgMCAQIAAAAAJBbkOAAAAAA./cnd=%21-gXbOAi9vKkBEIu_wwUYtbEKIAQ./referrer=http%3A%2F%2Fapps.mobile.adnxs.com/clickenc="

diff --git a/tests/NativeUnitTests/Native Responses/appnexus_standard_response_store_url.json b/tests/NativeUnitTests/Native Responses/appnexus_standard_response_store_url.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"
@@ -25,7 +25,7 @@
             "scale":5
          },
          "impression_trackers":[  
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression"
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression"
          ],
          "click_trackers":[  
             "http://nym1.ib.adnxs.com/click?AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA_AAAAAAAAAAAAAAAAAAAAAJkJvjGlBMFaZyDVla9jmxLH_n1UAAAAAJ-nIAC-AwAAvgMAAAIAAACL37AAtZgCAAAAAQBVU0QAVVNEACwB-gARIAAA5uUAAgMCAQIAAAAAJBbkOAAAAAA./cnd=%21-gXbOAi9vKkBEIu_wwUYtbEKIAQ./referrer=http%3A%2F%2Fapps.mobile.adnxs.com/clickenc="

diff --git a/tests/NativeUnitTests/Native Responses/custom_adapter_to_native_ad.json b/tests/NativeUnitTests/Native Responses/custom_adapter_to_native_ad.json
@@ -8,10 +8,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"
@@ -22,7 +22,7 @@
             "scale":5
          },
          "impression_trackers":[  
-            "http://rlissack.adnxs.net:8080/jtest/trackImpression"
+            "https://acdn.adnxs.com/mobile/native_test/trackImpression"
          ],
          "click_trackers":[  
             "http://nym1.ib.adnxs.com/click?AAAAAAAAAAAAAAAAAAAAAAAAAAAAAPA_AAAAAAAAAAAAAAAAAAAAAJkJvjGlBMFaZyDVla9jmxLH_n1UAAAAAJ-nIAC-AwAAvgMAAAIAAACL37AAtZgCAAAAAQBVU0QAVVNEACwB-gARIAAA5uUAAgMCAQIAAAAAJBbkOAAAAAA./cnd=%21-gXbOAi9vKkBEIu_wwUYtbEKIAQ./referrer=http%3A%2F%2Fapps.mobile.adnxs.com/clickenc="
@@ -49,7 +49,7 @@
             }
          ],
          "init_cb":"",
-         "result_cb":"http://rlissack.adnxs.net:8080/jtest/native/empty_mediated_ad_response.json"
+         "result_cb":"https://acdn.adnxs.com/mobile/native_test/empty_mediated_ad_response.json"
       }
    ]
 }
diff --git a/tests/NativeUnitTests/Native Responses/custom_adapter_to_standard_response.json b/tests/NativeUnitTests/Native Responses/custom_adapter_to_standard_response.json
@@ -22,7 +22,7 @@
             }
          ],
          "init_cb":"",
-         "result_cb":"http://rlissack.adnxs.net:8080/jtest/native/appnexus_standard_response.json"
+         "result_cb":"https://acdn.adnxs.com/mobile/native_test/appnexus_standard_response.json"
       }
    ]
 }
diff --git a/tests/NativeUnitTests/Native Responses/nativeResponse1.json b/tests/NativeUnitTests/Native Responses/nativeResponse1.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"

diff --git a/tests/NativeUnitTests/Native Responses/nativeResponse2.json b/tests/NativeUnitTests/Native Responses/nativeResponse2.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"

diff --git a/tests/NativeUnitTests/Native Responses/nativeResponse3.json b/tests/NativeUnitTests/Native Responses/nativeResponse3.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[
             {
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"

diff --git a/tests/NativeUnitTests/Native Responses/nativeResponse4.json b/tests/NativeUnitTests/Native Responses/nativeResponse4.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"

diff --git a/tests/NativeUnitTests/Native Responses/nativeResponse5.json b/tests/NativeUnitTests/Native Responses/nativeResponse5.json
@@ -11,10 +11,10 @@
          "title":"AppNexusSDKApp",
          "description":"Showcases the AppNexus mobile SDK and all its features. Works with placements generated under a publisher in the AppNexus Console.",
          "cta":"Install Now!",
-         "icon_img_url":"http://rlissack.adnxs.net:8080/jtest/appnexus_logo_icon@2x.png",
+         "icon_img_url":"https://acdn.adnxs.com/mobile/native_test/icon_image_100_100.png",
          "main_media":[  
             {  
-               "url":"http://rlissack.adnxs.net:8080/jtest/MainImageAppNexusSDKApp@2x.png",
+               "url":"https://acdn.adnxs.com/mobile/native_test/main_image_640_334.png",
                "width":300,
                "height":250,
                "label":"default"