From cd9ecc7a5422f91c1ee89383fe6aac8ab1185f34 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Wed, 17 Oct 2012 11:43:39 -0400
Subject: [PATCH] Update tests to pass

---
 test/index.html     |  3 ++-
 test/spec/Entity.js |  9 ---------
 test/spec/Util.js   | 13 +++++++++++++
 3 files changed, 15 insertions(+), 10 deletions(-)
 create mode 100644 test/spec/Util.js

diff --git a/test/index.html b/test/index.html
index 3dde62ee5..a2baae66d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -11,8 +11,8 @@
 
   <!-- include source files here... -->
   <script type="text/javascript" src="../js/lib/underscore-min.js"></script>
-  <script type="text/javascript" src="../js/lib/jshashtable.js"></script>
   <script type="text/javascript" src="../js/lib/jquery-1.8.2.min.js"></script>
+  <script type="text/javascript" src="../js/iD/Util.js"></script>
   <script type="text/javascript" src="../js/iD/Node.js"></script>
   <script type="text/javascript" src="../js/iD/Relation.js"></script>
   <script type="text/javascript" src="../js/iD/Entity.js"></script>
@@ -20,6 +20,7 @@
   <script type="text/javascript" src="../js/iD/Connection.js"></script>
 
   <!-- include spec files here... -->
+  <script type="text/javascript" src="spec/Util.js"></script>
   <script type="text/javascript" src="spec/Node.js"></script>
   <script type="text/javascript" src="spec/Entity.js"></script>
   <script type="text/javascript" src="spec/Relation.js"></script>
diff --git a/test/spec/Entity.js b/test/spec/Entity.js
index a36aadd85..3541f633d 100644
--- a/test/spec/Entity.js
+++ b/test/spec/Entity.js
@@ -8,13 +8,4 @@ describe('Entity', function() {
   it('has no entity type', function() {
       expect(entity.entityType).toEqual('');
   });
-
-  it('can count its tags', function() {
-      expect(entity.numTags()).toEqual(0);
-      entity.tags = {
-          foo: 'bar',
-          alice: 'bar'
-      };
-      expect(entity.numTags()).toEqual(2);
-  });
 });
diff --git a/test/spec/Util.js b/test/spec/Util.js
new file mode 100644
index 000000000..71616ca39
--- /dev/null
+++ b/test/spec/Util.js
@@ -0,0 +1,13 @@
+describe('Util', function() {
+  var util;
+
+  it('gives unique ids', function() {
+      var a = iD.Util.id(),
+          b = iD.Util.id(),
+          c = iD.Util.id(),
+          d = iD.Util.id();
+      expect(a === b).toEqual(false);
+      expect(b === c).toEqual(false);
+      expect(c === d).toEqual(false);
+  });
+});