Test bytesNeeded

dingosky · dingosky · commit 71c0a359d8de · 2017-08-18T14:29:28.000-07:00
diff --git a/test/charSet.js b/test/charSet.js
@@ -1,6 +1,6 @@
 import test from 'ava'
 
-import CharSet from '../lib/charSet';
+import CharSet, {charSet64, charSet32, charSet16, charSet8, charSet4, charSet2} from '../lib/charSet'
 
 test.beforeEach('Create CharSets', t => {
   t.context.charSet64 = new CharSet('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_')
@@ -167,3 +167,23 @@ test('Custom chars: 2', t => {
   t.regex(error.message, /.*count/)
 })
 
+test('Bytes needed', t => {
+  let BITS_PER_BYTE = 8
+  let doTest = (charSet, bits) => {
+    let bytesNeeded = charSet.bytesNeeded(bits)
+    let atLeast = Math.ceil(bits/BITS_PER_BYTE)
+    t.true(atLeast <= bytesNeeded, 'CharSet: ' + charSet.chars() + ', Bits ' + bits)
+    let atMost = atLeast + 1
+    t.true(bytesNeeded <= atMost, 'CharSet: ' + charSet.chars() + ', Bits ' + bits)
+  }
+  
+  let charSets = [charSet64, charSet32, charSet16, charSet8, charSet4, charSet2]
+  charSets.forEach( (charSet) => {
+    for (let bits = 0; bits <= 10; bits++) {
+      doTest(charSet, bits)
+    }
+    for (let bits = 12; bits <= 132; bits += 5) {
+      doTest(charSet, bits)
+    }
+  })
+})
diff --git a/test/random.js b/test/random.js
@@ -103,29 +103,6 @@ test('Session ID', t => {
   t.is(random.sessionID(charSet2).length,  128)
 })
 
-test('Bytes needed', t => {
-  let random = new Random()
-  let charSets = [charSet64, charSet32, charSet16, charSet8, charSet4, charSet2]
-
-  let doTest = (charSet, bits) => {
-    let bytesNeeded = charSet.bytesNeeded(bits)
-    let atLeast = Math.ceil(bits/8)
-    t.true(atLeast <= bytesNeeded, 'CharSet: ' + charSet.chars() + ', Bits ' + bits)
-    let atMost = atLeast + 1
-    t.true(bytesNeeded <= atMost, 'CharSet: ' + charSet.chars() + ', Bits ' + bits)
-  }
-  
-  charSets.forEach( (charSet) => {
-    random.use(charSet)
-    for (let bits = 0; bits < 10; bits++) {
-      doTest(charSet, bits)
-    }
-    for (let bits = 12; bits < 133; bits += 5) {
-      doTest(charSet, bits)
-    }
-  })
-})
-
 test('Invalid bytes', t => {
   let random
   let regex = /Insufficient/
