Skip to content
This repository has been archived by the owner on Apr 3, 2020. It is now read-only.

Fix Locations tests which are broken on Windows #35

Merged
merged 1 commit into from Mar 10, 2014
Merged

Fix Locations tests which are broken on Windows #35

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
36 changes: 18 additions & 18 deletions test/unit/locations.test.js
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@ var os = require('os');
var path = require('path'); var path = require('path');


var Locations = require('../../src/locations'); var Locations = require('../../src/locations');
var fixsep = require('../../src/path-helpers').fixSeparators; var pr = path.resolve;


var app = { var app = {
sanitisedName: 'AppOne', sanitisedName: 'AppOne',
Expand All @@ -28,7 +28,7 @@ describe('locations', function () {


it('should set destination dir when passed to constructor', function () { it('should set destination dir when passed to constructor', function () {
var locations = Locations(app.sanitisedName, app.pkg, 'x86', '/out'); var locations = Locations(app.sanitisedName, app.pkg, 'x86', '/out');
locations.destDir.should.eql('/out'); locations.destDir.should.eql(pr('/out'));
}); });


it('configure() should throw an error for missing parameters', function () { it('configure() should throw an error for missing parameters', function () {
Expand Down Expand Up @@ -57,28 +57,28 @@ describe('locations', function () {
it('should set destination paths when configured for an app', function () { it('should set destination paths when configured for an app', function () {
var locations = Locations(app.sanitisedName, app.pkg, 'x86', '/out'); var locations = Locations(app.sanitisedName, app.pkg, 'x86', '/out');


locations.classesDir.should.eql(fixsep('/out/classes')); locations.classesDir.should.eql(pr('/out/classes'));
locations.dexFile.should.eql(fixsep('/out/classes.dex')); locations.dexFile.should.eql(pr('/out/classes.dex'));


locations.resPackageApk.should.eql(fixsep('/out/AppOne.x86.ap_')); locations.resPackageApk.should.eql(pr('/out/AppOne.x86.ap_'));
locations.unsignedApk.should.eql(fixsep('/out/AppOne-unsigned.x86.apk')); locations.unsignedApk.should.eql(pr('/out/AppOne-unsigned.x86.apk'));
locations.signedApk.should.eql(fixsep('/out/AppOne-signed.x86.apk')); locations.signedApk.should.eql(pr('/out/AppOne-signed.x86.apk'));
locations.finalApk.should.eql(fixsep('/out/AppOne.x86.apk')); locations.finalApk.should.eql(pr('/out/AppOne.x86.apk'));


locations.resDir.should.eql(fixsep('/out/res')); locations.resDir.should.eql(pr('/out/res'));
locations.assetsDir.should.eql(fixsep('/out/assets')); locations.assetsDir.should.eql(pr('/out/assets'));
locations.srcDir.should.eql(fixsep('/out/src')); locations.srcDir.should.eql(pr('/out/src'));


locations.javaPackageDir.should.eql(fixsep('/out/src/org01/test')); locations.javaPackageDir.should.eql(pr('/out/src/org01/test'));


locations.androidManifest.should.eql(fixsep('/out/AndroidManifest.xml')); locations.androidManifest.should.eql(pr('/out/AndroidManifest.xml'));


locations.defaultDrawableDir.should.eql(fixsep('/out/res/drawable')); locations.defaultDrawableDir.should.eql(pr('/out/res/drawable'));
locations.drawableDirs.should.eql({ locations.drawableDirs.should.eql({
xhdpi: fixsep('/out/res/drawable-xhdpi'), xhdpi: pr('/out/res/drawable-xhdpi'),
hdpi: fixsep('/out/res/drawable-hdpi'), hdpi: pr('/out/res/drawable-hdpi'),
mdpi: fixsep('/out/res/drawable-mdpi'), mdpi: pr('/out/res/drawable-mdpi'),
ldpi: fixsep('/out/res/drawable-ldpi') ldpi: pr('/out/res/drawable-ldpi')
}); });
}); });
}); });