javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-16 11:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3062 from NativeScript/nnikolov/DeprecateCameraAndRemoveLocationTests

Browse Source 
Removed location tests and deprecated camera module.
This commit is contained in:
Nedyalko Nikolov
2016-11-10 17:32:31 +02:00
committed by GitHub
parent 7d48c523ee 3d9631bd00
commit 16fb5865cb
9 changed files with 26 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

176
tests/app/location-tests.ts
View File

@ -1,176 +0,0 @@
// >> location-require
import locationModule = require("location");
// << location-require
import TKUnit = require("./TKUnit");
var LocationManager = locationModule.LocationManager;
var Location = locationModule.Location;
var locationIsEnabled: boolean;
export function setUp() {
locationIsEnabled = LocationManager.isEnabled();
}
export function tearDown() {
locationIsEnabled = undefined;
}
export var testIsEnabled = function () {
if (!locationIsEnabled) {
console.log("Location service is not enabled!!!");
return;
}
// >> location-funcs
//var LocationManager = require("location").LocationManager;
var isEnabled = LocationManager.isEnabled();
// << location-funcs
TKUnit.assert(isEnabled);
};
export var testDistance = function () {
// >> location-distance
//var Location = require("location").Location;
var locSofia = new Location();
locSofia.longitude = 42.696552;
locSofia.latitude = 23.32601;
var locNewYork = new Location();
locNewYork.longitude = 40.71448;
locNewYork.latitude = -74.00598;
var distance = LocationManager.distance(locSofia, locNewYork);
// << location-distance
TKUnit.assert((distance > 10780000) && (distance < 10860000), "invalid distance " + distance);
};
export var testLocation = function (done) {
if (!locationIsEnabled) {
done(null);
}
var locationReceived;
// >> location-updates
//var LocationManager = require("location").LocationManager;
var locationManager = new LocationManager();
locationManager.startLocationMonitoring(function (location) {
//console.log('Location received: ' + JSON.stringify(location));
// >> (hide)
locationReceived = true;
locationManager.stopLocationMonitoring();
try {
TKUnit.assert(true === locationReceived, locationReceived);
done(null);
}
catch (e) {
done(e);
}
// << (hide)
}, function (error) {
//console.log('Location error received: ' + error);
// >> (hide)
locationReceived = error;
locationManager.stopLocationMonitoring();
done(error);
// << (hide)
}
);
// << location-updates
//var isReady = function () {
// return locationReceived;
//}
//TKUnit.waitUntilReady(isReady, 10);
//TKUnit.assert(true === locationReceived, locationReceived);
};
export var testLastKnownLocation = function () {
if (!locationIsEnabled) {
return;
}
TKUnit.waitUntilReady(function () { return false; }, 1); // give it some time after the last test
// >> location-last-known
// var LocationManager = require("location").LocationManager;
var locationManager = new LocationManager();
var lastKnownLocation = locationManager.lastKnownLocation;
// << location-last-known
TKUnit.assert((lastKnownLocation != null), "There is no last known location");
};
function doOnce(options: locationModule.Options, done) {
if (!locationIsEnabled) {
return done(null);
}
var locationReceived;
locationModule.getLocation(options).then(function (location) {
locationReceived = true;
try {
TKUnit.assert(true === locationReceived, locationReceived);
done(null);
}
catch (e) {
done(e);
}
}, function (error) {
locationReceived = error;
done(error);
});
}
export var testLocationOnce = function (done) {
doOnce(undefined, done);
};
export var testLocationOnceTimeout0 = function (done) {
doOnce({ timeout: 0 }, done);
};
export var testLocationOnceMaximumAge = function (done) {
if (!locationIsEnabled) {
return done(null);
}
TKUnit.waitUntilReady(function () { return false; }, 2);
doOnce({ maximumAge: 86400000, timeout: 0 }, done); // this should pass max age denotes that Real location is taken today.
doOnce({ maximumAge: 1000, timeout: 0 }, (err) => {
if (err && err.message === "timeout is 0 and last known location is older than maximumAge") {
// since last known location is taken before 1 sec (what is the meaning of the maximumAge: 1000 value)
// we consider this as a successful test since we test that maxAge check is working
done(null);
}
else {
done(new Error("maximumAge check failed"));
}
});
};
export var testLocationOnceTimeout10000 = function (done) {
doOnce({ timeout: 10000 }, done);
};
export var testSnippet = function (done) {
if (!locationIsEnabled) {
return done(null);
}
var locationReceived;
// >> location-timeour
// var locationModule = require("location");
//// options can also look like { maximumAge: 2000, timeout: 20 * 1000 }
locationModule.getLocation({ maximumAge: 30000, timeout: 5000 }).then(function (location) {
//console.log('Location received: ' + location);
// >> (hide)
locationReceived = true;
done(null);
// << (hide)
}, function (error) {
//console.log('Location error received: ' + error);
// >> (hide)
locationReceived = error;
done(error);
// << (hide)
});
// << location-timeour
};

29
tests/app/location.md
View File

@ -1,29 +0,0 @@
---
nav-title: "location How-To"
title: "location"
environment: nativescript
description: "Examples for using location"
previous_url: /ApiReference/location/HOW-TO
---
# Location
Using the location requires the Location module.
{%snippet location-require%}
## Other functions
### Test are location services available for this device
{%snippet location-funcs%}
### Get distance between two locations
{%snippet location-distance%}
## Getting location
### Receive continuous location updates
{%snippet location-updates%}
### Get last known location
{%snippet location-last-known%}
### Get location once
if there is `options.timeout` you will receive error on timeout. If `options.timeout` is 0 then the result is the same as the result from `LocationManager.lastKnownLocation`
and there will be no wait. You can use `options.maximumAge` to specify you don't want to receive locations older than specified time in ms.
{%snippet location-timeour%}

3
tests/app/testRunner.ts
View File

@ -28,9 +28,6 @@ export function isRunningOnEmulator(): boolean {
}
export var allTests = {};
if (!isRunningOnEmulator()) {
allTests["LOCATION"] = require("./location-tests");
}
allTests["PLATFORM"] = require("./platform-tests");
allTests["FILE SYSTEM"] = require("./file-system-tests");

2
tns-core-modules/camera/Readme.md
View File

@ -1 +1 @@
Allows you to take pictures with the device's camera.
Deprecated. Please use same functionality from `nativescript-camera` npm module.

6
tns-core-modules/camera/camera.android.ts
View File

@ -7,6 +7,9 @@ import * as platform from "platform";
var REQUEST_IMAGE_CAPTURE = 3453;
/**
* [Deprecated. Please use same functionality from `nativescript-camera` npm module]
*/
export var takePicture = function (options?): Promise<any> {
return new Promise((resolve, reject) => {
try {
@ -96,6 +99,9 @@ export var takePicture = function (options?): Promise<any> {
});
}
/**
* [Deprecated. Please use same functionality from `nativescript-camera` npm module]
*/
export var isAvailable = function () {
var utils: typeof utilsModule = require("utils/utils");

8
tns-core-modules/camera/camera.d.ts vendored
View File

@ -6,16 +6,18 @@ declare module "camera" {
import imageSource = require("image-source");
/**
* Take a photo using the camera.
* @param options - Optional parameter for setting different camera options.
* [Deprecated. Please use same functionality from `nativescript-camera` npm module]
*/
export function takePicture(options?: CameraOptions): Promise<imageSource.ImageSource>;
/**
* Is the camera available to use
* [Deprecated. Please use same functionality from `nativescript-camera` npm module]
*/
export function isAvailable(): Boolean;
/**
* [Deprecated. Please use same functionality from `nativescript-camera` npm module]
*/
export interface CameraOptions {
/**
* Defines the desired width (in device independent pixels) of the taken image. It should be used with height property.

7
tns-core-modules/camera/camera.ios.ts
View File

@ -3,6 +3,7 @@ import * as cameraCommonModule from "./camera-common";
import * as imageSourceModule from "image-source";
import * as frameModule from "ui/frame";
@Deprecated
class UIImagePickerControllerDelegateImpl extends NSObject implements UIImagePickerControllerDelegate {
public static ObjCProtocols = [UIImagePickerControllerDelegate];
@ -79,6 +80,9 @@ class UIImagePickerControllerDelegateImpl extends NSObject implements UIImagePic
var listener;
/**
* [Deprecated. Please use same functionality from `nativescript-camera` npm module]
*/
export var takePicture = function (options): Promise<any> {
return new Promise((resolve, reject) => {
listener = null;
@ -125,6 +129,9 @@ export var takePicture = function (options): Promise<any> {
});
}
/**
* [Deprecated. Please use same functionality from `nativescript-camera` npm module]
*/
export var isAvailable = function () {
return UIImagePickerController.isSourceTypeAvailable(UIImagePickerControllerSourceType.Camera);
}

2
tns-core-modules/location/Readme.md
View File

@ -1 +1 @@
Allows you to use the geolocation of the device.
Deprecated. Please use same functionality from `nativescript-geolocation` npm module.

6
tns-core-modules/location/location.d.ts vendored
View File

@ -12,6 +12,7 @@ declare module "location" {
/**
* A data class that encapsulates common properties for a geolocation.
* [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
*/
export class Location {
/**
@ -67,6 +68,7 @@ declare module "location" {
/**
* Provides options for location monitoring.
* [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
*/
export interface Options {
/**
@ -97,6 +99,7 @@ declare module "location" {
/**
* Provides methods for querying geolocation (in case available) on the target platform.
* [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
*/
export class LocationManager {
/**
@ -157,6 +160,7 @@ declare module "location" {
/**
* Provides Android specific data related to location.
* [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
*/
export interface AndroidLocationManager {
/**
@ -175,12 +179,14 @@ declare module "location" {
* If you specify timeout = 0 it just requests the last known location.
* However if you specify maximumAge and the location received is older it won't be received.
* @param options - An optional object specifying location update settings.
* [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
*/
export function getLocation(options?: Options): Promise<Location>;
/* tslint:disable */
/**
* Provides iOS specific data related to location.
* [Deprecated. Please use same functionality from `nativescript-geolocation` npm module]
*/
export interface iOSLocationManager {
/**