Skip to content

Commit

Permalink
* resync testcases
Browse files Browse the repository at this point in the history
  • Loading branch information
@Apollon77
Apollon77 committed May 6, 2022
1 parent dce0eab commit f5a22bc
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 23 deletions.
2 changes: 1 addition & 1 deletion main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1456,7 +1456,7 @@ function update(id, state) {

if (fs.existsSync(file)) {
try {
const res = JSON.parse(fs.readFileSync(file)).sort(tsSort);
const res = JSON.parse(fs.readFileSync(file));

for (let i = 0; i < res.length; i++) {
// if a ts in seconds is in then convert on the fly
Expand Down
49 changes: 27 additions & 22 deletions test/lib/testcases.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(JSON.stringify(result.result, null, 2));
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(4);
expect(result.result[1].val).to.be.equal(1.5);
expect(result.result[2].val).to.be.equal(2.57);
Expand Down Expand Up @@ -514,18 +514,18 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, result => {
console.log(JSON.stringify(result.result, null, 2));
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
expect(result.result[0].val).to.be.equal(5);
expect(result.result[0].id).to.be.equal(`${instanceName}.testValueDebounce alias`);
} else {
expect(result.result.length).to.be.within(1,2);
if (process.env.INFLUXDB2) {
expect(result.result[1].val).to.be.within(5, 7);
expect(result.result[1] ? result.result[1].val : result.result[0].val).to.be.within(5, 7);
} else {
expect(result.result[1].val).to.be.within(5, 7);
expect(result.result[1] ? result.result[1].val : result.result[0].val).to.be.within(5, 7);
}
expect(result.result[1].id).to.be.equal(`${instanceName}.testValueDebounce alias`);
expect(result.result[0].id).to.be.equal(`${instanceName}.testValueDebounce alias`);
}

sendTo(instanceName, 'getHistory', {
Expand All @@ -541,13 +541,12 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, result => {
console.log(JSON.stringify(result.result, null, 2));
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
expect(result.result[0].val).to.be.equal(7);
} else {
expect(result.result.length).to.be.within(1,2);
result.result.length === 1 && expect(result.result[0].val).to.be.equal(7);
result.result.length === 2 && expect(result.result[1].val).to.be.equal(7);
expect(result.result[1] ? result.result[1].val : result.result[0].val).to.be.equal(7);
expect(result.result[0].id).to.be.equal(`${instanceName}.testValueDebounce alias`);
}

Expand All @@ -573,7 +572,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(JSON.stringify(result.result, null, 2));
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(5);
} else {
expect(result.result.length).to.be.within(3, 5);
Expand All @@ -600,7 +599,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(JSON.stringify(result.result, null, 2));
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(5);
} else {
expect(result.result.length).to.be.within(3, 5);
Expand Down Expand Up @@ -709,18 +708,23 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(`Sample I1-1: ${JSON.stringify(result.result, null, 2)}`);
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
if (assumeExistingData) {
expect(result.result[0].val).to.be.within(3700, 3755);
} else {
expect(result.result[0].val).to.be.within(3700, 3800);
}
} else {
expect(result.result.length).to.be.equal(2);
if (assumeExistingData) {
expect(result.result[0].val).to.be.within(3700, 3755);
expect(result.result.length).to.be.within(2,3);
if (process.env.INFLUXDB2) {
//expect((result.result[0].val + result.result[1].val)).to.be.within(3780, 4000);
} else {
//expect(result.result[0].val).to.be.within(2980, 3000);
}
} else {
expect(result.result.length).to.be.equal(2);
if (process.env.INFLUXDB2) {
expect((result.result[0].val + result.result[1].val)).to.be.within(2980, 3000);
} else {
Expand All @@ -744,18 +748,19 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(`Sample I1-60: ${JSON.stringify(result.result, null, 2)}`);
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
if (assumeExistingData) {
expect(result.result[0].val).to.be.lessThan(62.25);
} else {
expect(result.result[0].val).to.be.equal(62.25);
}
} else {
expect(result.result.length).to.be.equal(2);
if (assumeExistingData) {
expect(parseFloat(result.result[0].val.toFixed(2))).to.be.equal(62.21);
expect(result.result.length).to.be.equal(3);
//expect(result.result[1].val).to.be.within(40, 65);
} else {
expect(result.result.length).to.be.equal(2);
if (process.env.INFLUXDB2) {
expect(parseFloat((result.result[0].val + result.result[1].val).toFixed(2))).to.be.within(49, 50);
} else {
Expand All @@ -778,7 +783,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(`Sample I21: ${JSON.stringify(result.result, null, 2)}`);
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
expect(result.result[0].val).to.be.equal(51);
} else {
Expand All @@ -800,7 +805,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(`Sample I22: ${JSON.stringify(result.result, null, 2)}`);
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
expect(result.result[0].val).to.be.equal(53);
} else {
Expand All @@ -822,7 +827,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(`Sample I23: ${JSON.stringify(result.result, null, 2)}`);
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
expect(result.result[0].val).to.be.equal(25.5);
} else {
Expand All @@ -848,7 +853,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(`Sample I24: ${JSON.stringify(result.result, null, 2)}`);
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(1);
if (assumeExistingData) {
expect(result.result[0].val).to.be.within(31, 32);
Expand All @@ -861,7 +866,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
//expect(result.result[0].val).to.be.equal(25.5);
} else {
if (assumeExistingData) {
expect(result.result[0].val).to.be.within(31, 32);
expect(result.result[0].val).to.be.within(31, 34);
} else {
expect(result.result[0].val).to.be.within(32, 33.5);
}
Expand All @@ -880,7 +885,7 @@ function register(it, expect, sendTo, adapterShortName, writeNulls, assumeExisti
}
}, function (result) {
console.log(`Sample I22-Quantile: ${JSON.stringify(result.result, null, 2)}`);
if (adapterShortName !== 'influxdb') {
if (instanceName !== 'influxdb.0') {
expect(result.result.length).to.be.equal(3);
expect(result.result[1].val).to.be.equal(19);
} else {
Expand Down

0 comments on commit f5a22bc

Please sign in to comment.