Return-Path: X-Original-To: apmail-cordova-commits-archive@www.apache.org Delivered-To: apmail-cordova-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2D82618B17 for ; Mon, 21 Mar 2016 10:02:54 +0000 (UTC) Received: (qmail 55681 invoked by uid 500); 21 Mar 2016 10:02:54 -0000 Delivered-To: apmail-cordova-commits-archive@cordova.apache.org Received: (qmail 55656 invoked by uid 500); 21 Mar 2016 10:02:54 -0000 Mailing-List: contact commits-help@cordova.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list commits@cordova.apache.org Received: (qmail 55647 invoked by uid 99); 21 Mar 2016 10:02:54 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Mar 2016 10:02:54 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E4737DFA42; Mon, 21 Mar 2016 10:02:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: daserge@apache.org To: commits@cordova.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: cordova-plugin-camera git commit: CB-10865 Run ios native tests on Travis Date: Mon, 21 Mar 2016 10:02:53 +0000 (UTC) Repository: cordova-plugin-camera Updated Branches: refs/heads/master 0cd962466 -> fb871d40e CB-10865 Run ios native tests on Travis Updated cordova-ios tests dependency version to latest published Changed the tests to reflect the current scaling behavior Fixed a typo in manual test img.onloadend -> img.onload Project: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/commit/fb871d40 Tree: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/tree/fb871d40 Diff: http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/diff/fb871d40 Branch: refs/heads/master Commit: fb871d40e2076c11a34a224479dbd2ff3c27358b Parents: 0cd9624 Author: daserge Authored: Mon Mar 21 12:54:07 2016 +0300 Committer: daserge Committed: Mon Mar 21 12:54:07 2016 +0300 ---------------------------------------------------------------------- .travis.yml | 6 +++++- .../CDVCameraTest/CDVCameraLibTests/CameraTest.m | 17 ++++++++++------- tests/ios/package.json | 6 +++--- tests/tests.js | 3 ++- 4 files changed, 20 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fb871d40/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index b9af4c5..93e7dd6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,8 @@ -language: node_js +language: objective-c sudo: false node_js: - "4.2" +env: + - TEST_DIR=. + - TEST_DIR=./tests/ios +script: cd $TEST_DIR && npm install && npm test http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fb871d40/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m ---------------------------------------------------------------------- diff --git a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m index d1da2fa..b9439d1 100644 --- a/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m +++ b/tests/ios/CDVCameraTest/CDVCameraLibTests/CameraTest.m @@ -21,9 +21,6 @@ #import #import "CDVCamera.h" #import "UIImage+CropScaleOrientation.h" -#import -#import -#import #import @@ -291,12 +288,14 @@ // test 640x480 - targetSize = CGSizeMake(640, 480); + targetSize = CGSizeMake(480, 640); targetImage = [sourceImagePortrait imageByScalingNotCroppingForSize:targetSize]; XCTAssertEqual(targetImage.size.width, targetSize.width); XCTAssertEqual(targetImage.size.height, targetSize.height); - + + targetSize = CGSizeMake(640, 480); + targetImage = [sourceImageLandscape imageByScalingNotCroppingForSize:targetSize]; XCTAssertEqual(targetImage.size.width, targetSize.width); XCTAssertEqual(targetImage.size.height, targetSize.height); @@ -304,24 +303,28 @@ // test 800x600 - targetSize = CGSizeMake(800, 600); + targetSize = CGSizeMake(600, 800); targetImage = [sourceImagePortrait imageByScalingNotCroppingForSize:targetSize]; XCTAssertEqual(targetImage.size.width, targetSize.width); XCTAssertEqual(targetImage.size.height, targetSize.height); + targetSize = CGSizeMake(800, 600); + targetImage = [sourceImageLandscape imageByScalingNotCroppingForSize:targetSize]; XCTAssertEqual(targetImage.size.width, targetSize.width); XCTAssertEqual(targetImage.size.height, targetSize.height); // test 1024x768 - targetSize = CGSizeMake(1024, 768); + targetSize = CGSizeMake(768, 1024); targetImage = [sourceImagePortrait imageByScalingNotCroppingForSize:targetSize]; XCTAssertEqual(targetImage.size.width, targetSize.width); XCTAssertEqual(targetImage.size.height, targetSize.height); + targetSize = CGSizeMake(1024, 768); + targetImage = [sourceImageLandscape imageByScalingNotCroppingForSize:targetSize]; XCTAssertEqual(targetImage.size.width, targetSize.width); XCTAssertEqual(targetImage.size.height, targetSize.height); http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fb871d40/tests/ios/package.json ---------------------------------------------------------------------- diff --git a/tests/ios/package.json b/tests/ios/package.json index 84bd9ec..4b9486f 100644 --- a/tests/ios/package.json +++ b/tests/ios/package.json @@ -5,9 +5,9 @@ "author": "Apache Software Foundation", "license": "Apache Version 2.0", "dependencies": { - "cordova-ios": "^3.7.0" + "cordova-ios": "*" }, "scripts": { "test": "xcodebuild -scheme CordovaLib && xcodebuild test -scheme CDVCameraLibTests -destination 'platform=iOS Simulator,name=iPhone 5'" - } -} \ No newline at end of file + } +} http://git-wip-us.apache.org/repos/asf/cordova-plugin-camera/blob/fb871d40/tests/tests.js ---------------------------------------------------------------------- diff --git a/tests/tests.js b/tests/tests.js index fd7bd6f..1513f14 100644 --- a/tests/tests.js +++ b/tests/tests.js @@ -125,7 +125,8 @@ exports.defineManualTests = function (contentEl, createActionButton) { var img = document.getElementById('camera_image'); var startTime = new Date(); img.src = url; - img.onloadend = function () { + img.onload = function () { + log('Img size: ' + img.naturalWidth + 'x' + img.naturalHeight); log('Image tag load time: ' + (new Date() - startTime)); if (callback) { callback(); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@cordova.apache.org For additional commands, e-mail: commits-help@cordova.apache.org