minor test fixes

storesafe · Oct 11, 2018 · 59f9d31 · 59f9d31
1 parent 8b981a9
commit 59f9d31
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/spec/www/spec/db-sql-operations-test.js b/spec/www/spec/db-sql-operations-test.js
@@ -1509,7 +1509,7 @@ var mytests = function() {
  // and finish this test:
  db.close(done, done);
  });
- });
+ }, MYTIMEOUT);
 
  });
 
@@ -1601,7 +1601,7 @@ var mytests = function() {
  if (checkCount === expectedCheckCount) db.close(done, done);
  });
  });
- });
+ }, MYTIMEOUT);
 
  });
 

diff --git a/spec/www/spec/db-tx-error-mapping-test.js b/spec/www/spec/db-tx-error-mapping-test.js
@@ -35,7 +35,6 @@ var mytests = function() {
  // TBD skip plugin test on browser platform (not yet supported):
  if (isBrowser && (i === 0)) continue;
 
- // GENERAL: SKIP ALL on WP8 for now
  describe(scenarioList[i] + ': db tx error mapping test(s)' +
  (isWindows ?
  ' [Windows version with INCORRECT error code (0) & INCONSISTENT error message (missing actual error info)]' :
@@ -244,8 +243,10 @@ var mytests = function() {
  expect(error.message).toMatch(/callback raised an exception.*or.*error callback did not return false/);
  else if (isWindows)
  expect(error.message).toMatch(/error callback did not return false.*Error preparing an SQLite statement/);
- //* else //* XXX TBD
- //* expect(error.message).toMatch(/error callback did not return false.*syntax error/);
+ else if (isAndroid && isImpl2)
+ expect(error.message).toMatch(/error callback did not return false.*syntax error/);
+ else
+ expect(error.message).toMatch(/error callback did not return false.*incomplete input/);
 
  isWebSql ? done() : db.close(done, done);
  }, function() {

diff --git a/spec/www/spec/db-tx-sql-select-value-test.js b/spec/www/spec/db-tx-sql-select-value-test.js
@@ -1069,7 +1069,7 @@ var mytests = function() {
  // - Android version returns result with missing row
  it(suiteName + "SELECT ABS(?) with '9e999' (Infinity) parameter argument" +
  ((!isWebSql && isAndroid) ? ' [Android PLUGIN BROKEN: result with missing row]' : ''), function(done) {
- if (!isWebSql && !isAndroid && !isWindows) pending('SKIP for iOS/macOS plugin due to CRASH');
+ if (!isWebSql && (isAppleMobileOS || isMac)) pending('KNOWN CRASH on iOS/macOS'); // XXX (litehelpers/Cordova-sqlite-storage#405)
 
  var db = openDatabase('SELECT-ABS-Infinite-parameter-results-test.db', '1.0', 'Test', DEFAULT_SIZE);
 

diff --git a/spec/www/spec/db-tx-value-bindings-test.js b/spec/www/spec/db-tx-value-bindings-test.js
@@ -1111,7 +1111,7 @@ var mytests = function() {
  });
  }, MYTIMEOUT);
 
- it(suiteName + "INSERT inline BLOB value (X'FFD1FFD2') and check stored data [XXX SKIP FINAL CHECK on default Android NDK access implementation due to CRASH ISSUE; OTHER PLUGIN ISSUES REPRODUCED: missing result column data; SELECT BLOB VALUE ERROR on Android & Windows; missing result column data on iOS/macOS]", function(done) {
+ it(suiteName + "INSERT inline BLOB value (X'FFD1FFD2') and check stored data [XXX SKIP FINAL SELECT CHECK on default Android NDK access implementation due to CRASH ISSUE; OTHER PLUGIN ISSUES REPRODUCED: missing result column data; SELECT BLOB VALUE ERROR on Android & Windows; missing result column data on iOS/macOS]", function(done) {
  var db = openDatabase('INSERT-inline-BLOB-value-FFD1FFD2-and-check-stored-data.db', '1.0', 'Demo', DEFAULT_SIZE);
 
  db.transaction(function(tx) {
@@ -1593,7 +1593,7 @@ var mytests = function() {
  it(suiteName +
  ' handles UNICODE \\u2028 line separator correctly in database', function (done) {
  if (!isWebSql && !isWindows && isAndroid) pending('SKIP for Android plugin (cordova-android 6.x BUG: cordova/cordova-discuss#57)');
- if (!isWebSql && !isWindows && !isAndroid) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)');
+ if (!isWebSql && (isAppleMobileOS || isMac)) pending('SKIP for iOS/macOS plugin (Cordova BUG: CB-9435)');
 
  var db = openDatabase('UNICODE-line-separator-INSERT-test.db');
 

diff --git a/spec/www/spec/sql-batch-test.js b/spec/www/spec/sql-batch-test.js
@@ -321,7 +321,7 @@ var mytests = function() {
  }, MYTIMEOUT);
 
  it(suiteName + 'sql batch with changing argument value [TBD POSSIBLY INCONSISTENT BEHAVIOR]', function(done) {
- var db = openDatabase('sql-batch-with-changing-sql-test.db');
+ var db = openDatabase('sql-batch-with-changing-argument-value-test.db');
 
  var mybatch = [
  'DROP TABLE IF EXISTS MyTable',

diff --git a/spec/www/spec/tx-semantics-test.js b/spec/www/spec/tx-semantics-test.js
@@ -271,7 +271,7 @@ var mytests = function() {
  expect(rs4.insertId).toBe(1);
  } catch(ex) {
  // SHOULD NOT CATCH EXCEPTION on plugin:
- if (!isWebSql) expect('EXCEPTION NOT EXPECTED on plugin with message: ' + e.message).toBe('--');
+ if (!isWebSql) expect('EXCEPTION NOT EXPECTED on plugin with message: ' + ex.message).toBe('--');
  expect(ex).toBeDefined();
  expect(ex.message).toBeDefined();
  // FUTURE TBD check message
@@ -297,9 +297,9 @@ var mytests = function() {
 
  if (!(isAndroid && isImpl2))
  expect(rs5.insertId).toBe(1);
- } catch(e) {
+ } catch(ex) {
  // SHOULD NOT CATCH EXCEPTION on plugin:
- if (!isWebSql) expect('EXCEPTION NOT EXPECTED on plugin').toBe('--');
+ if (!isWebSql) expect('EXCEPTION NOT EXPECTED on plugin with message: ' + ex.message).toBe('--');
  // XXX TODO CHECK message, etc.
  }