#233 fixed tests and searchVal

ka-vaNu · Dec 26, 2024 · 864b920 · 864b920
1 parent e926739
commit 864b920
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/lib/tools.js b/lib/tools.js
@@ -49,12 +49,12 @@ function isArray(it) {
  * @returns The value of the found property, or undefined if not found.
  */
 function findVal(obj, prop) {
-    prop = `${prop}`.toLowerCase();
     for (let p in obj) {
-        if (Object.prototype.hasOwnProperty.call(obj, p) && prop == `${p}`.toLowerCase()) {
+        if (prop.toLowerCase() == p.toLowerCase()) {
             return obj[p];
         }
     }
+    return null;
 }
 
 /**

diff --git a/lib/tools.test.js b/lib/tools.test.js
@@ -93,27 +93,28 @@ describe('Test tools.isArray', function () {
 
 describe('Test tools.findVal', function () {
     it('search lower same case', function () {
-        expect(tools.findVal(objCaseInsensitive, 'testlower')).to.equal('lower');
+        expect(tools.findVal(objCaseInsensitive, 'testlower')).to.equal(objCaseInsensitive.testlower);
     });
 
     it('search lower different case', function () {
-        expect(tools.findVal(objCaseInsensitive, 'TESTLOWER')).to.equal('lower');
+        expect(tools.findVal(objCaseInsensitive, 'TESTLOWER')).to.equal(objCaseInsensitive.testlower);
     });
 
     it('search UPPER same case', function () {
-        expect(tools.findVal(objCaseInsensitive, 'TESTUPPER')).to.equal('upper');
+        console.log(`objCaseInsensitive: ${objCaseInsensitive.TESTUPPER}`);
+        expect(tools.findVal(objCaseInsensitive, 'TESTUPPER')).to.equal(objCaseInsensitive.TESTUPPER);
     });
 
     it('search UPPER different case', function () {
-        expect(tools.findVal(objCaseInsensitive, 'testupper')).to.equal('upper');
+        expect(tools.findVal(objCaseInsensitive, 'testupper')).to.equal(objCaseInsensitive.TESTUPPER);
     });
 
     it('search Mixed', function () {
-        expect(tools.findVal(objCaseInsensitive, 'testmixed')).to.equal('mixed');
+        expect(tools.findVal(objCaseInsensitive, 'testmixed')).to.equal(objCaseInsensitive.TestMixed);
     });
 
     it('search not found', function () {
-        expect(tools.findVal(objCaseInsensitive, 'test')).to.be.undefined;
+        expect(tools.findVal(objCaseInsensitive, 'test')).to.be.null;
     });
 });