From cb1fa4b20527b03b41b70b2891f4173f5beabf7c Mon Sep 17 00:00:00 2001
From: "Michael J. Rubinsky" <mrubinsk@horde.org>
Date: Sat, 2 Oct 2010 22:49:38 -0400
Subject: [PATCH] Get rid of Horde_Alarm::factory - it's only being used by the
 Horde_Alarm tests

---
 framework/Alarm/test/Horde/Alarm/HandlerTest.php | 2 +-
 framework/Alarm/test/Horde/Alarm/NullTest.php    | 2 +-
 framework/Alarm/test/Horde/Alarm/ObjectTest.php  | 2 +-
 framework/Alarm/test/Horde/Alarm/SqlTest.php     | 6 ++++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/framework/Alarm/test/Horde/Alarm/HandlerTest.php b/framework/Alarm/test/Horde/Alarm/HandlerTest.php
index d06472c0c..d899ff2ea 100644
--- a/framework/Alarm/test/Horde/Alarm/HandlerTest.php
+++ b/framework/Alarm/test/Horde/Alarm/HandlerTest.php
@@ -24,7 +24,7 @@ class Horde_Alarm_HandlerTest extends PHPUnit_Framework_TestCase
             return;
         }
 
-        self::$alarm = Horde_Alarm::factory('Object');
+        self::$alarm = new Horde_Alarm_Object();
         $now = time();
         $hash = array('id' => 'personalalarm',
                       'user' => 'john',
diff --git a/framework/Alarm/test/Horde/Alarm/NullTest.php b/framework/Alarm/test/Horde/Alarm/NullTest.php
index a054a649e..6f894dc5e 100644
--- a/framework/Alarm/test/Horde/Alarm/NullTest.php
+++ b/framework/Alarm/test/Horde/Alarm/NullTest.php
@@ -15,7 +15,7 @@ class Horde_Alarm_NullTest extends PHPUnit_Framework_TestCase
 
     public function testFactory()
     {
-        self::$alarm = Horde_Alarm::factory('Null');
+        self::$alarm = new Horde_Alarm_Null();
     }
 
     /**
diff --git a/framework/Alarm/test/Horde/Alarm/ObjectTest.php b/framework/Alarm/test/Horde/Alarm/ObjectTest.php
index e1e672055..4d8320f49 100644
--- a/framework/Alarm/test/Horde/Alarm/ObjectTest.php
+++ b/framework/Alarm/test/Horde/Alarm/ObjectTest.php
@@ -15,7 +15,7 @@ class Horde_Alarm_ObjectTest extends PHPUnit_Framework_TestCase
 
     public function testFactory()
     {
-        self::$alarm = Horde_Alarm::factory('Object');
+        self::$alarm = new Horde_Alarm_Object();
     }
 
     /**
diff --git a/framework/Alarm/test/Horde/Alarm/SqlTest.php b/framework/Alarm/test/Horde/Alarm/SqlTest.php
index 29784b407..5af5341a2 100644
--- a/framework/Alarm/test/Horde/Alarm/SqlTest.php
+++ b/framework/Alarm/test/Horde/Alarm/SqlTest.php
@@ -32,7 +32,7 @@ class Horde_Alarm_SqlTest extends PHPUnit_Framework_TestCase
             require $config;
         }
         if (!isset($conf['alarm']['test'])) {
-            $this->markTestSkipped('No configuration for Horde_Alarm test.');
+            self::markTestSkipped('No configuration for Horde_Alarm test.');
             return;
         }
 
@@ -53,7 +53,9 @@ class Horde_Alarm_SqlTest extends PHPUnit_Framework_TestCase
 
     public function testFactory()
     {
-        self::$alarm = Horde_Alarm::factory('Sql', self::$pearConf);
+        self::$alarm = new Horde_Alarm_Sql(self::$pearConf);
+        self::$alarm->initilize();
+        self::$alarm->gc();
     }
 
     /**
-- 
2.11.0