[couchdb] branch remove-deprecated-dbinfo-bits updated: Use new size fields in JS tests

[ko...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

kocolosk pushed a commit to branch remove-deprecated-dbinfo-bits
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/remove-deprecated-dbinfo-bits by this push:
     new 45dc653  Use new size fields in JS tests
45dc653 is described below

commit 45dc653d2c81d6d0d908fb9f8c68c3976f4be33f
Author: Adam Kocoloski <ko...@apache.org>
AuthorDate: Thu Sep 5 10:26:06 2019 -0400

    Use new size fields in JS tests
---
 test/javascript/tests/compact.js         | 16 ++++++++--------
 test/javascript/tests/view_compaction.js |  8 ++++----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/javascript/tests/compact.js b/test/javascript/tests/compact.js
index e0b052a..4a029ac 100644
--- a/test/javascript/tests/compact.js
+++ b/test/javascript/tests/compact.js
@@ -30,19 +30,19 @@ couchTests.compact = function(debug) {
 
   T(db.save(binAttDoc).ok);
 
-  var originalsize = db.info().disk_size;
-  var originaldatasize = db.info().data_size;
+  var originalsize = db.info().sizes.disk;
+  var originaldatasize = db.info().sizes.active;
   var start_time = db.info().instance_start_time;
 
-  TEquals("number", typeof originaldatasize, "data_size is a number");
+  TEquals("number", typeof originaldatasize, "data size is a number");
   T(originaldatasize < originalsize, "data size is < then db file size");
 
   for(var i in docs) {
       db.deleteDoc(docs[i]);
   }
   T(db.ensureFullCommit().ok);
-  var deletesize = db.info().disk_size;
-  var deletedatasize = db.info().data_size;
+  var deletesize = db.info().sizes.disk;
+  var deletedatasize = db.info().sizes.active;
   T(deletesize > originalsize);
   T(db.setDbProperty("_revs_limit", 666).ok);
 
@@ -59,9 +59,9 @@ couchTests.compact = function(debug) {
   T(xhr.responseText == "This is a base64 encoded text");
   T(xhr.getResponseHeader("Content-Type") == "text/plain");
   T(db.info().doc_count == 1);
-  // XXX BUGGED! T(db.info().data_size < deletedatasize);
-  TEquals("number", typeof db.info().data_size, "data_size is a number");
-  T(db.info().data_size < db.info().disk_size, "data size is < then db file size");
+  // XXX BUGGED! T(db.info().sizes.active < deletedatasize);
+  TEquals("number", typeof db.info().sizes.active, "data size is a number");
+  T(db.info().sizes.active < db.info().sizes.disk, "data size is < then db file size");
 
   // cleanup
   db.deleteDb();
diff --git a/test/javascript/tests/view_compaction.js b/test/javascript/tests/view_compaction.js
index 03e8395..e0b14b5 100644
--- a/test/javascript/tests/view_compaction.js
+++ b/test/javascript/tests/view_compaction.js
@@ -78,8 +78,8 @@ couchTests.view_compaction = function(debug) {
   resp = db.designInfo("_design/foo");
   TEquals(30001, resp.view_index.update_seq);
 
-  var disk_size_before_compact = resp.view_index.disk_size;
-  var data_size_before_compact = resp.view_index.data_size;
+  var disk_size_before_compact = resp.view_index.sizes.disk;
+  var data_size_before_compact = resp.view_index.sizes.active;
 
   TEquals("number", typeof data_size_before_compact, "data size is a number");
   T(data_size_before_compact < disk_size_before_compact, "data size < file size");
@@ -103,8 +103,8 @@ couchTests.view_compaction = function(debug) {
   resp = db.designInfo("_design/foo");
   TEquals(30001, resp.view_index.update_seq);
   T(resp.view_index.disk_size < disk_size_before_compact);
-  TEquals("number", typeof resp.view_index.data_size, "data size is a number");
-  T(resp.view_index.data_size < resp.view_index.disk_size, "data size < file size");
+  TEquals("number", typeof resp.view_index.sizes.active, "data size is a number");
+  T(resp.view_index.sizes.active < resp.view_index.sizes.disk, "data size < file size");
 
   // cleanup
   db.deleteDb();