* Fixed up Alert to postpone raises/clears within initial sleep period for old alerts

 * Fixed up AlertChanged to do the same
 * Added a migration method for the new AlertHistories table
 * added singleton cleanup for tests
 * moar tests
 * cleaned up Alert a bit

4 files changed, 223 insertions, 45 deletions

diff --git a/test/tc_mauve_alert.rb b/test/tc_mauve_alert.rb
index f79859f..738489d 100644
--- a/test/tc_mauve_alert.rb
+++ b/test/tc_mauve_alert.rb
@@ -17,6 +17,20 @@ class TcMauveAlert < Mauve::UnitTest
   def setup
     super
     setup_database
+    @test_config =<<EOF
+person ("test") {
+  all { true }
+}
+
+alert_group("default") {
+  level URGENT 
+
+  notify("test") {
+    every 10.minutes
+  }
+}
+EOF
+
   end
 
   def teardown
@@ -24,7 +38,14 @@ class TcMauveAlert < Mauve::UnitTest
     super
   end
 
-  def test_source_list
+  def test_alert_group
+
+  end
+
+  #
+  # This is also the test for in_source_list?
+  #
+  def test_source_lists
     config=<<EOF
 source_list "test", %w(test-1.example.com)
 
@@ -46,45 +67,93 @@ EOF
     assert_equal( %w(has_ipv6 has_ipv4).sort, a.source_lists.sort )
   end
 
+  def test_level
 
-  def test_summary
+  end
 
+  def test_summary
     a = Alert.new
     a.summary = "Free swap memory (MB) (memory_swap) is too low"
 
     assert_match(/memory_swap/, a.summary)
-
   end
 
 
-  def test_raise
+  def test_raise!
+    Server.instance.setup
 
-  config=<<EOF
+    a = Alert.new(:source => "test-host", :alert_id => "test_raise!", :subject => "test")
 
-alert_group("test") {
+    a.raise!
 
-}
+    assert_equal(Time.now, a.raised_at)
 
-EOF
+    assert(a.raised?)
+    assert(!a.cleared?)
+    assert(!a.acknowledged?)
+  end
 
-    Configuration.current = ConfigurationBuilder.parse(config)
+  def test_acknowledge!
+    person = Mauve::Person.new
+    person.username = "test-user"
 
     Server.instance.setup
 
-    a= Alert.new(:source => "test-host",
-          :alert_id => "test" )    
+    Mauve::Configuration.current.people[person.username] = person
 
-    a.raise!
+    alert = Alert.new(
+      :alert_id  => "test_acknowledge!",
+      :source    => "test",
+      :subject   => "test"
+    )
+
+    alert.raise!
+    assert(alert.raised?)
+
+    #
+    # This acknowledges an alert for 3 mins.
+    #
+    alert.acknowledge!(person, Time.now + 3.minutes)
+    assert_equal(person.username, alert.acknowledged_by)
+    assert_equal(Time.now, alert.acknowledged_at)
+    assert_equal(Time.now + 3.minutes, alert.will_unacknowledge_at)
+    assert(alert.acknowledged?)
+
+
+    next_alert = Alert.find_next_with_event
+    assert_equal(next_alert.id, alert.id)
+    assert_equal(Time.now+3.minutes, next_alert.due_at)    
+
+    Timecop.freeze(Time.now + 3.minutes)
+
+
+    #
+    # The alert should unacknowledge itself.
+    #
+    alert.poll
+    assert(!alert.acknowledged?)
+  end
+
+  def test_unacknowledge!
   end
 
-  def test_alert_reception
+  def test_clear!
+  end
+
+  def test_due_at
+  end
+
+  def test_poll
+  end
+
+  def test_recieve_update
     Server.instance.setup
 
     update = Proto::AlertUpdate.new
     update.source = "test-host"
     message = Proto::Alert.new
     update.alert << message
-    message.id = "test1"
+    message.id = "test_recieve_update"
     message.summary = "test summary"
     message.detail  = "test detail"
     message.raise_time = Time.now.to_i
@@ -92,7 +161,7 @@ EOF
 
     Alert.receive_update(update, Time.now, "127.0.0.1")
 
-    a = Alert.first(:alert_id => 'test1')
+    a = Alert.first(:alert_id => 'test_recieve_update')
 
     assert(a.raised?)
     assert_equal("test-host",    a.subject)
@@ -102,40 +171,98 @@ EOF
     
   end
 
-  def test_alert_ackowledgement
-    person = Mauve::Person.new
-    person.username = "test-user"
-
+  def test_notify_if_needed
+    Configuration.current = ConfigurationBuilder.parse(@test_config)
     Server.instance.setup
-
-    Mauve::Configuration.current.people[person.username] = person
-
+    #
+    # Notifications should be sent if:
+    #
+    #  * the alert has changed state (update_type); or
+    #  * the alert new and "raised".
+    
     alert = Alert.new(
-      :alert_id  => "test-acknowledge",
+      :alert_id  => "test_notify_if_needed",
       :source    => "test",
       :subject   => "test"
     )
+
+    #
+    # Must not notify -- this is a new alert which is not raised.
+    #
+    alert.clear!
+    assert_equal(0, Server.instance.notification_buffer.size, "Notifications sent erroneously on clear.")
+
+    #
+    # Now raise.
+    #
     alert.raise!
-    assert(alert.raised?)
+    assert_equal(1, Server.instance.notification_buffer.size, "Wrong number of notifications sent out when new alert raised.")
 
-    alert.acknowledge!(person, Time.now + 3.minutes)
-    assert(alert.acknowledged?)
+    #
+    # Empty the buffer.
+    Server.instance.notification_buffer.pop
+    
+    Timecop.freeze(Time.now+5)
+    alert.raise!
+    #
+    # Should not re-raise.
+    #
+    assert_equal(0, Server.instance.notification_buffer.size, "Notification sent erroneously on second raise.")
+    
+    alert.acknowledge!(Mauve::Configuration.current.people["test"])
+    assert_equal(1, Server.instance.notification_buffer.size, "Wrong number of notifications sent erroneously on acknowledge.")
+    #
+    # Empty the buffer.
+    Server.instance.notification_buffer.pop
 
-    next_alert = Alert.find_next_with_event
-    assert_equal(next_alert.id, alert.id)
-    assert_equal(Time.now+3.minutes, next_alert.due_at)    
+    alert.subject = "changed subject"
+    assert(alert.save)
+    assert_equal(0, Server.instance.notification_buffer.size, "Notification sent erroneously on change of subject.")
+
+    alert.clear!
+    assert_equal(1, Server.instance.notification_buffer.size, "Wrong number of notifications sent erroneously on clear.")
+  end
 
-    Timecop.freeze(next_alert.due_at)
 
-    alert.poll
+  #
+  # These are more in-depth tests
+  #
+  def test_no_notification_for_old_alerts
+    Configuration.current = ConfigurationBuilder.parse(@test_config)
+    Server.instance.setup
 
+    assert_equal(Time.now, Server.instance.started_at)
+
+    Timecop.freeze(Time.now - 10.minutes)
+    alert = Alert.new(
+      :alert_id  => "test_no_notification_for_old_alerts",
+      :source    => "test",
+      :subject   => "test",
+      :will_raise_at => Time.now + 10.minutes
+    )
+    alert.clear!
+
+    Timecop.freeze(Time.now + 10.minutes)
+    assert_equal(Time.now - 10.minutes, alert.updated_at, "Alert should be last updated before the server instance thinks it started.")
+
+    5.times do 
+      assert(Server.instance.in_initial_sleep?,"Server not in initial sleep when it should be.")
+      alert.poll
+      assert_equal(Server.instance.started_at + Server.instance.initial_sleep, alert.will_raise_at) 
+      assert_equal(0, Server.instance.notification_buffer.size, "Notification sent for old alert")
+      Timecop.freeze(Time.now + 1.minute)
+    end
     #
-    # The alert should unacknowledge itself.
+    # No longer in sleep period.
     #
-    assert(!alert.acknowledged?)
-
+    assert(!Server.instance.in_initial_sleep?,"Server in initial sleep when it shouldn't be.")
+    alert.poll
+    assert(alert.raised?)
+    assert_equal(1, Server.instance.notification_buffer.size, "Notification sent for old alert")
 
+    #
+    # TODO need to do for will_clear_at and will_unacknowledge_at
+    #
   end
 
 end
-
diff --git a/test/tc_mauve_notification.rb b/test/tc_mauve_notification.rb
index 435d5da..6b4c3d1 100644
--- a/test/tc_mauve_notification.rb
+++ b/test/tc_mauve_notification.rb
@@ -114,25 +114,19 @@ class TcMauveNotification < Mauve::UnitTest
   include Mauve
   
   def setup
-    @logger = setup_logger
-    Timecop.freeze(Time.local(2011,8,1,0,0,0,0))
+    super
+    setup_database
   end
 
   def teardown
-    teardown_logger
-    Timecop.return
-    DataObjects::Pooling.pools.each{|pool| pool.dispose}
+    teardown_database
+    super
   end
 
   def test_notify
     t = Time.now
 
     config=<<EOF
-
-server {
-  database "sqlite::memory:"
-}
-
 person ("test1") {
   all { true }
 }
diff --git a/test/tc_mauve_person.rb b/test/tc_mauve_person.rb
index 8ac3141..0026db6 100644
--- a/test/tc_mauve_person.rb
+++ b/test/tc_mauve_person.rb
@@ -9,8 +9,35 @@ require 'pp'
 
 class TcMauvePerson < Mauve::UnitTest 
 
+  def setup
+    super
+    setup_database
+  end
 
+  def teardown
+    teardown_database
+    super
+  end
 
+  def test_suppressed?
+
+  end
+
+  def test_send_alert
+
+  end
+
+  def test_do_send_alert
+
+  end
+
+  def test_current_alerts
+
+  end
+
+  def test_is_on_holiday? 
+
+  end
 end
 
 
diff --git a/test/th_mauve.rb b/test/th_mauve.rb
index a113ad0..76a4933 100644
--- a/test/th_mauve.rb
+++ b/test/th_mauve.rb
@@ -3,6 +3,27 @@ require 'mauve/datamapper'
 require 'timecop'
 require 'log4r'
 require 'pp'
+require 'singleton'
+
+# Taken from
+# 
+# http://blog.ardes.com/2006/12/11/testing-singletons-with-ruby
+#
+class <<Singleton
+
+  def included_with_reset(klass)
+    included_without_reset(klass)
+    class <<klass
+      def reset_instance
+        Singleton.send :__init__, self
+        self
+      end
+    end
+  end
+
+  alias_method :included_without_reset, :included
+  alias_method :included, :included_with_reset
+end
 
 module Mauve
   class TestOutputter < Log4r::Outputter
@@ -33,6 +54,7 @@ module Mauve
   class UnitTest < Test::Unit::TestCase
 
     def setup
+      reset_all_singletons
       setup_logger
       setup_time
     end
@@ -40,6 +62,7 @@ module Mauve
     def teardown
       teardown_logger
       teardown_time
+      reset_all_singletons
     end
 
     def setup_logger
@@ -81,6 +104,13 @@ module Mauve
       Timecop.return
     end
 
+    def reset_all_singletons
+      Mauve.constants.collect{|const| Mauve.const_get(const)}.each do |klass|
+        next unless klass.respond_to?(:instance)
+        klass.reset_instance
+      end
+    end
+
     def default_test
       #
       #