Issue 147 - [Typed objects] Implement object types

test/tests/typedObjects.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 (function()
 {
   module("Typed objects");
 
   test("Math utilities", function()
   {
-    let {ceilLog2, log2} = require("typedObjects/utils");
+    let {nextPow2, ilog2} = require("typedObjects/utils");
 
-    equal(ceilLog2(0), 0, "ceilLog2(0)");
-    equal(ceilLog2(1), 1, "ceilLog2(1)");
-    equal(ceilLog2(2), 2, "ceilLog2(2)");
-    equal(ceilLog2(3), 4, "ceilLog2(3)");
-    equal(ceilLog2(7), 8, "ceilLog2(7)");
-    equal(ceilLog2(8), 8, "ceilLog2(8)");
-    equal(ceilLog2(9), 16, "ceilLog2(9)");
-    equal(ceilLog2(13), 16, "ceilLog2(16)");

[René Jeschke, 2014/04/21 17:24:12]

I think this should read "ceilLog2(13)" instead of "ceilLog2(16)".

-    equal(ceilLog2(1000), 1024, "ceilLog2(1000)");
-    equal(ceilLog2(0x5123), 0x8000, "ceilLog2(0x5123)");
-    equal(ceilLog2(0x31234567), 0x40000000, "ceilLog2(0x31234567)");
+    equal(nextPow2(0), 0, "nextPow2(0)");
+    equal(nextPow2(1), 1, "nextPow2(1)");
+    equal(nextPow2(2), 2, "nextPow2(2)");
+    equal(nextPow2(3), 4, "nextPow2(3)");
+    equal(nextPow2(7), 8, "nextPow2(7)");
+    equal(nextPow2(8), 8, "nextPow2(8)");
+    equal(nextPow2(9), 16, "nextPow2(9)");
+    equal(nextPow2(13), 16, "nextPow2(13)");
+    equal(nextPow2(1000), 1024, "nextPow2(1000)");
+    equal(nextPow2(0x5123), 0x8000, "nextPow2(0x5123)");
+    equal(nextPow2(0x31234567), 0x40000000, "nextPow2(0x31234567)");
 
-    equal(log2(1), 0, "log2(1)");
-    equal(log2(2), 1, "log2(2)");
-    equal(log2(3), 1, "log2(3)");
-    equal(log2(7), 2, "log2(7)");
-    equal(log2(8), 3, "log2(8)");
-    equal(log2(9), 3, "log2(9)");
-    equal(log2(13), 3, "log2(16)");

[René Jeschke, 2014/04/21 17:24:12]

I think this should read "log2(13)" instead of "log2(16)".

-    equal(log2(1000), 9, "log2(1000)");
-    equal(log2(0x5123), 14, "log2(0x5123)");
-    equal(log2(0x31234567), 29, "log2(0x31234567)");
+    equal(ilog2(-1), 0, "ilog2(-1)");
+    equal(ilog2(1), 0, "ilog2(1)");
+    equal(ilog2(2), 1, "ilog2(2)");
+    equal(ilog2(3), 1, "ilog2(3)");
+    equal(ilog2(7), 2, "ilog2(7)");
+    equal(ilog2(8), 3, "ilog2(8)");
+    equal(ilog2(9), 3, "ilog2(9)");
+    equal(ilog2(13), 3, "ilog2(13)");
+    equal(ilog2(1000), 9, "ilog2(1000)");
+    equal(ilog2(0x5123), 14, "ilog2(0x5123)");
+    equal(ilog2(0x31234567), 29, "ilog2(0x31234567)");
   });
 
   test("Object creation and property access", function()
   {
     // Create a type and check its properties
     let {ObjectType, uint8, float32} = require("typedObjects");
     let type = new ObjectType({
       foo: uint8,
       bar: float32,
       mtd: function() {
@@ skipping 99 matching lines @@
 
     let obj3 = type2();
     obj3.bar = obj1;
     ok(obj3.bar, "Object reference set on new object");
     equal(obj3.bar.typeId, obj1.typeId);
     equal(obj3.bar.bufferIndex, obj1.bufferIndex);
     equal(obj3.bar.byteOffset, obj1.byteOffset);
     ok(!obj2.bar);
   });
 })();