From f97c16d5c412a88e25d8eda160cee542d0bbd920 Mon Sep 17 00:00:00 2001
From: Shaun McDonald <shaun@shaunmcdonald.me.uk>
Date: Mon, 2 Jun 2008 15:28:03 +0000
Subject: [PATCH] You can now test nodes. This test needs looked at again, as
 it currently doesn't test the node tags

---
 test/fixtures/current_node_tags.yml | 15 +++++++++++++++
 test/fixtures/current_nodes.yml     |  5 -----
 test/fixtures/node_tags.yml         | 17 +++++++++++++++++
 test/fixtures/nodes.yml             |  5 -----
 test/unit/node_test.rb              | 25 +++++++++++++------------
 5 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 test/fixtures/current_node_tags.yml
 create mode 100644 test/fixtures/node_tags.yml

diff --git a/test/fixtures/current_node_tags.yml b/test/fixtures/current_node_tags.yml
new file mode 100644
index 000000000..d9f5448a4
--- /dev/null
+++ b/test/fixtures/current_node_tags.yml
@@ -0,0 +1,15 @@
+t1:
+  id: visible_node.id
+  k: testvisible
+  v: yes
+
+t2:
+  id: used_node_1.id
+  k: testused
+  v: yes
+
+t3:
+  id: used_node_2.id
+  k: test
+  v: yes
+
diff --git a/test/fixtures/current_nodes.yml b/test/fixtures/current_nodes.yml
index dd3bd2487..fa9f6f711 100644
--- a/test/fixtures/current_nodes.yml
+++ b/test/fixtures/current_nodes.yml
@@ -5,7 +5,6 @@ visible_node:
   longitude: 1
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 invisible_node:
@@ -14,7 +13,6 @@ invisible_node:
   longitude: 2
   user_id: 1
   visible: 0
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 used_node_1:
@@ -23,7 +21,6 @@ used_node_1:
   longitude: 3
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 used_node_2:
@@ -32,7 +29,6 @@ used_node_2:
   longitude: 4
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 node_used_by_relationship:
@@ -41,5 +37,4 @@ node_used_by_relationship:
   longitude: 5
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
diff --git a/test/fixtures/node_tags.yml b/test/fixtures/node_tags.yml
new file mode 100644
index 000000000..c32dc6c55
--- /dev/null
+++ b/test/fixtures/node_tags.yml
@@ -0,0 +1,17 @@
+t1:
+  id: visible_node
+  k: testvisible
+  v: yes
+  version: 1
+
+t2:
+  id: used_node_1
+  k: testused
+  v: yes
+  version: 1
+
+t3:
+  id: used_node_2
+  k: test
+  v: yes
+  version: 1
diff --git a/test/fixtures/nodes.yml b/test/fixtures/nodes.yml
index 37152c4d3..b10ce2fe7 100644
--- a/test/fixtures/nodes.yml
+++ b/test/fixtures/nodes.yml
@@ -5,7 +5,6 @@ visible_node:
   longitude: 1
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 invisible_node:
@@ -14,7 +13,6 @@ invisible_node:
   longitude: 2
   user_id: 1
   visible: 0
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 used_node_1:
@@ -23,7 +21,6 @@ used_node_1:
   longitude: 3
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 used_node_2:
@@ -32,7 +29,6 @@ used_node_2:
   longitude: 4
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
 node_used_by_relationship:
@@ -41,6 +37,5 @@ node_used_by_relationship:
   longitude: 5
   user_id: 1
   visible: 1
-  tags: test=yes
   timestamp: 2007-01-01 00:00:00
 
diff --git a/test/unit/node_test.rb b/test/unit/node_test.rb
index 95321b5cf..876b23b69 100644
--- a/test/unit/node_test.rb
+++ b/test/unit/node_test.rb
@@ -1,16 +1,18 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class NodeTest < Test::Unit::TestCase
-  fixtures :current_nodes, :nodes, :users
+  fixtures :current_nodes, :nodes, :users, :current_node_tags, :node_tags
   set_fixture_class :current_nodes => :Node
   set_fixture_class :nodes => :OldNode
+  set_fixture_class :node_tags => :OldNodeTag
+  set_fixture_class :currenr_node_tags => :NodeTag
 
   def test_create
     node_template = Node.new(:latitude => 12.3456,
                              :longitude => 65.4321,
-                             :user_id => users(:normal_user).id,
-                             :visible => 1,
-                             :tags => "")
+                             :user_id => users(:normal_user),
+                             :visible => 1, 
+                             :version => 1)
     assert node_template.save_with_history!
 
     node = Node.find(node_template.id)
@@ -19,7 +21,6 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible
-    assert_equal node_template.tags, node.tags
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
@@ -34,7 +35,7 @@ class NodeTest < Test::Unit::TestCase
   end
 
   def test_update
-    node_template = Node.find(1)
+    node_template = Node.find(current_nodes(:visible_node).id)
     assert_not_nil node_template
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
@@ -43,7 +44,7 @@ class NodeTest < Test::Unit::TestCase
 
     node_template.latitude = 12.3456
     node_template.longitude = 65.4321
-    node_template.tags = "updated=yes"
+    #node_template.tags = "updated=yes"
     assert node_template.save_with_history!
 
     node = Node.find(node_template.id)
@@ -52,7 +53,7 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible
-    assert_equal node_template.tags, node.tags
+    #assert_equal node_template.tags, node.tags
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
@@ -63,12 +64,12 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, old_node.longitude
     assert_equal node_template.user_id, old_node.user_id
     assert_equal node_template.visible, old_node.visible
-    assert_equal node_template.tags, old_node.tags
+    #assert_equal node_template.tags, old_node.tags
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
 
   def test_delete
-    node_template = Node.find(1)
+    node_template = Node.find(current_nodes(:visible_node))
     assert_not_nil node_template
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 1
@@ -84,7 +85,7 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, node.longitude
     assert_equal node_template.user_id, node.user_id
     assert_equal node_template.visible, node.visible
-    assert_equal node_template.tags, node.tags
+    #assert_equal node_template.tags, node.tags
     assert_equal node_template.timestamp.to_i, node.timestamp.to_i
 
     assert_equal OldNode.find(:all, :conditions => [ "id = ?", node_template.id ]).length, 2
@@ -95,7 +96,7 @@ class NodeTest < Test::Unit::TestCase
     assert_equal node_template.longitude, old_node.longitude
     assert_equal node_template.user_id, old_node.user_id
     assert_equal node_template.visible, old_node.visible
-    assert_equal node_template.tags, old_node.tags
+    #assert_equal node_template.tags, old_node.tags
     assert_equal node_template.timestamp.to_i, old_node.timestamp.to_i
   end
 end
-- 
2.43.2