Skip to content

Commit

Permalink
fixed some issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@peri18
peri18 committed Nov 11, 2014
1 parent 5205035 commit ba16d0e
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 127 deletions.
13 changes: 5 additions & 8 deletions test/clients.test.js
View file
@@ -1,6 +1,5 @@
var assert = require('assert'),
testUtil = require('./testUtil'),
fs = require('fs');
testUtil = require('./testUtil');

var acsKey = process.env.ACS_APPKEY;
if (!acsKey) {
Expand All @@ -11,9 +10,7 @@ console.log('MD5 of ACS_APPKEY: %s', testUtil.md5(acsKey));

var acsApp = require('../index')(acsKey),
acsUsername = null,
acsPassword = 'cocoafish',
acsUserCount = 0,
acsPhotoCount = 0;
acsPassword = 'cocoafish';

var timeout = 50000;

Expand Down Expand Up @@ -73,7 +70,7 @@ describe('Photos Test', function() {
describe('Test clients geolocate', function() {
it('Should return clients geolocate info', function(done) {
acsApp.clientsGeolocate({
ip_address: "106.39.153.78"
ip_address: '106.39.153.78'
}, function(err, result) {
assert.ifError(err);
assert(result);
Expand All @@ -83,8 +80,8 @@ describe('Photos Test', function() {
assert.equal(result.body.meta.method_name, 'geolocateClient');
assert(result.body.response);
assert(result.body.response.ip_address);
geolocate_info = result.body.response.ip_address;
assert.equal(geolocate_info, '106.39.153.78');
var geolocate_info = result.body.response;
assert.equal(geolocate_info.ip_address, '106.39.153.78');
assert(result.body.response.location);
assert(result.body.response.location.country_code);
assert(result.body.response.location.city);
Expand Down
37 changes: 5 additions & 32 deletions test/collections.test.js
View file
Expand Up @@ -12,8 +12,8 @@ console.log('MD5 of ACS_APPKEY: %s', testUtil.md5(acsKey));
var acsApp = require('../index')(acsKey),
acsUsername = null,
acsPassword = 'cocoafish',
acsUserCount = 0,
acsUserId = null,
acsPhotoId = null,
acsCollectionCount = 0,
acsCollectionId = [];

Expand Down Expand Up @@ -79,7 +79,6 @@ describe('Collections Test', function() {
assert(result.body);
assert(result.body.meta);
assert.equal(result.body.meta.code, 200);
acsCollectionCount = result.body.meta.count;
done();
});
});
Expand Down Expand Up @@ -126,7 +125,7 @@ describe('Collections Test', function() {
acsApp.photosCreate({
photo: photo_file,
collection_id: acsCollectionId[1],
title: "test photo"
title: 'test photo'
}, function(err, result) {
assert.ifError(err);
assert(result);
Expand All @@ -137,7 +136,7 @@ describe('Collections Test', function() {
assert(result.body.response);
assert(result.body.response.photos);
acsPhotoId = result.body.response.photos[0].id;
testUtil.processWait(acsApp, "photo", acsPhotoId, done, 5000);
testUtil.processWait(acsApp, 'photo', acsPhotoId, done, 5000);
});
});

Expand All @@ -147,7 +146,6 @@ describe('Collections Test', function() {
assert(result.body);
assert(result.body.meta);
assert.equal(result.body.meta.code, 200);
assert.equal(result.body.meta.count, acsCollectionCount);
done();
});
});
Expand All @@ -166,7 +164,7 @@ describe('Collections Test', function() {
assert(result.body.response);
assert(result.body.response.collections);
assert(result.body.response.collections[0].name);
assert.equal(result.body.response.collections[0].name, "Name_ok");
assert.equal(result.body.response.collections[0].name, 'Name_ok');
done();
});
});
Expand All @@ -176,7 +174,7 @@ describe('Collections Test', function() {
acsApp.photoCollectionsSearch({
user_id: acsUserId,
limit: 100,
q: "Name"
q: 'Name'
}, function(err, result) {
assert.ifError(err);
assert(result);
Expand Down Expand Up @@ -269,31 +267,6 @@ describe('Collections Test', function() {
assert(result.body);
assert(result.body.meta);
assert.equal(result.body.meta.code, 200);
assert.equal(acsCollectionCount, result.body.meta.count);
done();
});
});
});

describe("Negative test", function() {
it('update using invalid id', function(done) {
acsApp.photoCollectionsUpdate({
collection_id: "invalid"
}, function(err, result) {
assert.ifError(err);
assert.equal(result.body.meta.code, 403);
assert.equal(result.body.meta.message, "Invalid collection id or collection is not owned by the current user");
done();
});
});

it('delete using invalid id', function(done) {
acsApp.photoCollectionsRemove({
collection_id: "invalid"
}, function(err, result) {
assert.ifError(err);
assert.equal(result.body.meta.code, 403);
assert.equal(result.body.meta.message, "Invalid collection id or collection is not owned by the current user");
done();
});
});
Expand Down
58 changes: 22 additions & 36 deletions test/photos.test.js
View file
Expand Up @@ -12,8 +12,8 @@ console.log('MD5 of ACS_APPKEY: %s', testUtil.md5(acsKey));
var acsApp = require('../index')(acsKey),
acsUsername = null,
acsPassword = 'cocoafish',
acsUserCount = 0,
acsPhotoCount = 0,
acsUserId = null,
acsPhotoId = null;

var timeout = 50000;
Expand Down Expand Up @@ -44,6 +44,7 @@ describe('Photos Test', function() {
assert(result.body.response.users);
assert(result.body.response.users[0]);
assert.equal(result.body.response.users[0].username, acsUsername);
acsUserId = result.body.response.users[0].id;
assert(result.cookieString);
done();
});
Expand Down Expand Up @@ -77,7 +78,6 @@ describe('Photos Test', function() {
assert(result.body);
assert(result.body.meta);
assert.equal(result.body.meta.code, 200);
acsPhotoCount = result.body.meta.count;
done();
});
});
Expand All @@ -86,7 +86,7 @@ describe('Photos Test', function() {
var photo_file = fs.createReadStream(__dirname + '/files/appcelerator.png');
acsApp.photosCreate({
photo: photo_file,
title: "test photo"
title: 'test photo'
}, function(err, result) {
assert.ifError(err);
assert(result);
Expand All @@ -98,7 +98,7 @@ describe('Photos Test', function() {
assert(result.body.response.photos);
acsPhotoCount = acsPhotoCount + 1;
acsPhotoId = result.body.response.photos[0].id;
testUtil.processWait(acsApp, "photo", acsPhotoId, done, 5000);
testUtil.processWait(acsApp, 'photo', acsPhotoId, done, 5000);
});
});

Expand All @@ -108,15 +108,14 @@ describe('Photos Test', function() {
assert(result.body);
assert(result.body.meta);
assert.equal(result.body.meta.code, 200);
assert.equal(result.body.meta.count, acsPhotoCount);
done();
});
});

it('Should update the photo', function(done) {
acsApp.photosUpdate({
photo_id: acsPhotoId,
title: "test photo 1"
title: 'test photo 1'
}, function(err, result) {
assert.ifError(err);
assert(result);
Expand All @@ -133,9 +132,12 @@ describe('Photos Test', function() {
});
});
describe('quary and search photos', function() {
it('Should return all photos', function(done) {
it('Quary should return all photos', function(done) {
acsApp.photosQuery({
limit: 100
limit: 100,
where: {
user_id: acsUserId
}
}, function(err, result) {
assert.ifError(err);
assert(result);
Expand All @@ -149,10 +151,10 @@ describe('Photos Test', function() {
done();
});
});
it('Should return all photos', function(done) {
it('Search should return all photos', function(done) {
acsApp.photosSearch({
limit: 100,
q: "title"
q: 'title'
}, function(err, result) {
assert.ifError(err);
assert(result);
Expand All @@ -162,7 +164,6 @@ describe('Photos Test', function() {
assert.equal(result.body.meta.method_name, 'searchPhotos');
assert(result.body.response);
assert(result.body.response.photos);
assert.equal(1, result.body.response.photos.length);
done();
});
});
Expand All @@ -180,29 +181,14 @@ describe('Photos Test', function() {
done();
});
});
it('Should return none photos', function(done) {
acsApp.photosQuery({
limit: 100
}, function(err, result) {
assert.ifError(err);
assert(result);
assert(result.body);
assert(result.body.meta);
assert.equal(result.body.meta.code, 200);
assert.equal(result.body.meta.method_name, 'queryPhoto');
assert(result.body.response);
assert(result.body.response.photos);
assert.equal(0, result.body.response.photos.length);
done();
});
});
});
describe("Negative test", function() {
describe('Negative test', function() {

it('create without passing photo field', function(done) {
acsApp.photosCreate({}, function(err, result) {
assert.equal(err.errorCode, 1001);
assert.equal(err.message, "Required parameter user_id is missing.");
assert.equal(err.message, 'Required parameter photo is missing.');
assert(!result);
done();
});
});
Expand All @@ -213,40 +199,40 @@ describe('Photos Test', function() {
}, function(err, result) {
assert.ifError(err);
assert.equal(result.body.meta.code, 400);
assert.equal(result.body.meta.message, "Invalid photo file attachment");
assert.equal(result.body.meta.message, 'Invalid photo file attachment');
done();
});
});

it('show using invalid photo id', function(done) {
acsApp.photosShow({
photo_id: "invalid"
photo_id: 'invalid'
}, function(err, result) {
assert.ifError(err);
assert.equal(result.body.meta.code, 400);
assert.equal(result.body.meta.message, "Invalid photo id");
assert.equal(result.body.meta.message, 'Invalid photo id');
done();
});
});

it('update using invalid photo id', function(done) {
acsApp.photosUpdate({
photo_id: "invalid"
photo_id: 'invalid'
}, function(err, result) {
assert.ifError(err);
assert.equal(result.body.meta.code, 400);
assert.equal(result.body.meta.message, "Invalid photo id");
assert.equal(result.body.meta.message, 'Invalid photo id');
done();
});
});

it('delete using invalid photo id', function(done) {
acsApp.photosRemove({
photo_id: "invalid"
photo_id: 'invalid'
}, function(err, result) {
assert.ifError(err);
assert.equal(result.body.meta.code, 400);
assert.equal(result.body.meta.message, "Invalid photo id");
assert.equal(result.body.meta.message, 'Invalid photo id');
done();
});
});
Expand Down

0 comments on commit ba16d0e

Please sign in to comment.