aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2016-12-16 17:17:10 +0000
committerRichard van der Hoff <richard@matrix.org>2016-12-19 09:43:58 +0000
commite2e398bd94c5e6be8b2e0a7ae9a74687a4dcf863 (patch)
treeec9603f71bdfab34e4b3e401f123698e0fde7196
parent819f0d24dbd92acd29b588f618d7830943bc18f9 (diff)
Add some tests for the Javascript wrappers
These would have helped avoid the recent FRV.
-rw-r--r--javascript/.gitignore1
-rw-r--r--javascript/package.json7
-rw-r--r--javascript/test/megolm.spec.js68
-rw-r--r--javascript/test/olm.spec.js94
-rwxr-xr-xjenkins.sh1
5 files changed, 169 insertions, 2 deletions
diff --git a/javascript/.gitignore b/javascript/.gitignore
index 603fe7c..ec22345 100644
--- a/javascript/.gitignore
+++ b/javascript/.gitignore
@@ -2,3 +2,4 @@
/node_modules
/npm-debug.log
/olm.js
+/reports
diff --git a/javascript/package.json b/javascript/package.json
index b65fb2e..5432883 100644
--- a/javascript/package.json
+++ b/javascript/package.json
@@ -9,7 +9,7 @@
],
"scripts": {
"build": "make -C .. js",
- "test": "echo \"Error: no test specified\" && exit 1"
+ "test": "jasmine-node test --verbose --junitreport --captureExceptions"
},
"repository": {
"type": "git",
@@ -23,5 +23,8 @@
"bugs": {
"url": "https://github.com/matrix-org/olm/issues"
},
- "homepage": "https://github.com/matrix-org/olm#readme"
+ "homepage": "https://github.com/matrix-org/olm#readme",
+ "devDependencies": {
+ "jasmine-node": "^1.14.5"
+ }
}
diff --git a/javascript/test/megolm.spec.js b/javascript/test/megolm.spec.js
new file mode 100644
index 0000000..8f9d24a
--- /dev/null
+++ b/javascript/test/megolm.spec.js
@@ -0,0 +1,68 @@
+/*
+Copyright 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+"use strict";
+
+var Olm = require('../olm');
+
+describe("megolm", function() {
+ var aliceSession, bobSession;
+
+ beforeEach(function() {
+ aliceSession = new Olm.OutboundGroupSession();
+ bobSession = new Olm.InboundGroupSession();
+ });
+
+ afterEach(function() {
+ if (aliceSession !== undefined) {
+ aliceSession.free();
+ aliceSession = undefined;
+ }
+
+ if (bobSession !== undefined) {
+ bobSession.free();
+ bobSession = undefined;
+ }
+ });
+
+ it("should encrypt and decrypt", function() {
+ aliceSession.create();
+ expect(aliceSession.message_index()).toEqual(0);
+ bobSession.create(aliceSession.session_key());
+
+ var TEST_TEXT='têst1';
+ var encrypted = aliceSession.encrypt(TEST_TEXT);
+ var decrypted = bobSession.decrypt(encrypted);
+ console.log(TEST_TEXT, "->", decrypted);
+ expect(decrypted.plaintext).toEqual(TEST_TEXT);
+ expect(decrypted.message_index).toEqual(0);
+
+ TEST_TEXT='hot beverage: ☕';
+ encrypted = aliceSession.encrypt(TEST_TEXT);
+ decrypted = bobSession.decrypt(encrypted);
+ console.log(TEST_TEXT, "->", decrypted);
+ expect(decrypted.plaintext).toEqual(TEST_TEXT);
+ expect(decrypted.message_index).toEqual(1);
+
+ // shorter text, to spot buffer overruns
+ TEST_TEXT='☕';
+ encrypted = aliceSession.encrypt(TEST_TEXT);
+ decrypted = bobSession.decrypt(encrypted);
+ console.log(TEST_TEXT, "->", decrypted);
+ expect(decrypted.plaintext).toEqual(TEST_TEXT);
+ expect(decrypted.message_index).toEqual(2);
+ });
+});
diff --git a/javascript/test/olm.spec.js b/javascript/test/olm.spec.js
new file mode 100644
index 0000000..b7cc3ae
--- /dev/null
+++ b/javascript/test/olm.spec.js
@@ -0,0 +1,94 @@
+/*
+Copyright 2016 OpenMarket Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+"use strict";
+
+var Olm = require('../olm');
+
+if (!Object.keys) {
+ Object.keys = function(o) {
+ var k=[], p;
+ for (p in o) if (Object.prototype.hasOwnProperty.call(o,p)) k.push(p);
+ return k;
+ }
+}
+
+describe("olm", function() {
+ var aliceAccount, bobAccount;
+ var aliceSession, bobSession;
+
+ beforeEach(function() {
+ aliceAccount = new Olm.Account();
+ bobAccount = new Olm.Account();
+ aliceSession = new Olm.Session();
+ bobSession = new Olm.Session();
+ });
+
+ afterEach(function() {
+ if (aliceAccount !== undefined) {
+ aliceAccount.free();
+ aliceAccount = undefined;
+ }
+
+ if (bobAccount !== undefined) {
+ bobAccount.free();
+ bobAccount = undefined;
+ }
+
+ if (aliceSession !== undefined) {
+ aliceSession.free();
+ aliceSession = undefined;
+ }
+
+ if (bobSession !== undefined) {
+ bobSession.free();
+ bobSession = undefined;
+ }
+ });
+
+ it('should encrypt and decrypt', function() {
+ aliceAccount.create();
+ bobAccount.create();
+
+ bobAccount.generate_one_time_keys(1);
+ var bobOneTimeKeys = JSON.parse(bobAccount.one_time_keys()).curve25519;
+ bobAccount.mark_keys_as_published();
+
+ var bobIdKey = JSON.parse(bobAccount.identity_keys()).curve25519;
+
+ var otk_id = Object.keys(bobOneTimeKeys)[0];
+
+ aliceSession.create_outbound(
+ aliceAccount, bobIdKey, bobOneTimeKeys[otk_id]
+ );
+
+ var TEST_TEXT='têst1';
+ var encrypted = aliceSession.encrypt(TEST_TEXT);
+ expect(encrypted.type).toEqual(0);
+ bobSession.create_inbound(bobAccount, encrypted.body);
+ bobAccount.remove_one_time_keys(bobSession);
+ var decrypted = bobSession.decrypt(encrypted.type, encrypted.body);
+ console.log(TEST_TEXT, "->", decrypted);
+ expect(decrypted).toEqual(TEST_TEXT);
+
+ TEST_TEXT='hot beverage: ☕';
+ encrypted = bobSession.encrypt(TEST_TEXT);
+ expect(encrypted.type).toEqual(1);
+ decrypted = aliceSession.decrypt(encrypted.type, encrypted.body);
+ console.log(TEST_TEXT, "->", decrypted);
+ expect(decrypted).toEqual(TEST_TEXT);
+ });
+});
diff --git a/jenkins.sh b/jenkins.sh
index 3b6fb1f..2faa3fd 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -11,4 +11,5 @@ make test
. ~/.emsdk_set_env.sh
make js
+(cd javascript && npm run test)
npm pack javascript