Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move all DAOs into their own folder
  • Loading branch information
ginatrapani committed Sep 6, 2012
1 parent 2246c55 commit 7aa9fb1
Show file tree
Hide file tree
Showing 71 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion tests/TestOfBackupController.php
Expand Up @@ -29,7 +29,7 @@
require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
require_once THINKUP_WEBAPP_PATH.'config.inc.php';
if (!class_exists('BackupDAO')) {
require_once THINKUP_WEBAPP_PATH.'_lib/model/interface.BackupDAO.php';
require_once THINKUP_WEBAPP_PATH.'_lib/dao/interface.BackupDAO.php';
}

class TestOfBackupController extends ThinkUpUnitTestCase {
Expand Down
4 changes: 2 additions & 2 deletions tests/TestOfExportServiceUserDataController.php
Expand Up @@ -28,9 +28,9 @@
require_once THINKUP_WEBAPP_PATH.'_lib/extlib/simpletest/autorun.php';
require_once THINKUP_WEBAPP_PATH.'config.inc.php';
if (!class_exists('ExportDAO')) {
require_once THINKUP_WEBAPP_PATH.'_lib/model/interface.ExportDAO.php';
require_once THINKUP_WEBAPP_PATH.'_lib/dao/interface.ExportDAO.php';
}
require_once THINKUP_WEBAPP_PATH.'_lib/model/class.ExportMySQLDAO.php';
require_once THINKUP_WEBAPP_PATH.'_lib/dao/class.ExportMySQLDAO.php';

class TestOfExportServiceUserDataController extends ThinkUpUnitTestCase {

Expand Down
5 changes: 5 additions & 0 deletions tests/TestOfLoader.php
Expand Up @@ -50,6 +50,7 @@ public function testLoaderRegisterDefault() {
$this->assertEqual( Loader::getLookupPath(), array(
THINKUP_WEBAPP_PATH . '_lib/',
THINKUP_WEBAPP_PATH . '_lib/model/',
THINKUP_WEBAPP_PATH . "_lib/dao/",
THINKUP_WEBAPP_PATH . '_lib/controller/',
THINKUP_WEBAPP_PATH . '_lib/exceptions/'
));
Expand All @@ -70,6 +71,7 @@ public function testLoaderRegisterWithStringAdditionalPath() {
$this->assertEqual( Loader::getLookupPath(), array(
THINKUP_WEBAPP_PATH . '_lib/',
THINKUP_WEBAPP_PATH . '_lib/model/',
THINKUP_WEBAPP_PATH . "_lib/dao/",
THINKUP_WEBAPP_PATH . '_lib/controller/',
THINKUP_WEBAPP_PATH . '_lib/exceptions/',
THINKUP_ROOT_PATH . 'tests/classes'
Expand All @@ -90,6 +92,7 @@ public function testLoaderRegisterWithArrayAdditionalPaths() {
$this->assertEqual( Loader::getLookupPath(), array(
THINKUP_WEBAPP_PATH . '_lib/',
THINKUP_WEBAPP_PATH . '_lib/model/',
THINKUP_WEBAPP_PATH . "_lib/dao/",
THINKUP_WEBAPP_PATH . '_lib/controller/',
THINKUP_WEBAPP_PATH . '_lib/exceptions/',
THINKUP_ROOT_PATH . 'tests',
Expand Down Expand Up @@ -127,6 +130,7 @@ public function testAdditionalPathAfterInitialRegister() {
$this->assertEqual( Loader::getLookupPath(), array(
THINKUP_WEBAPP_PATH . '_lib/',
THINKUP_WEBAPP_PATH . '_lib/model/',
THINKUP_WEBAPP_PATH . "_lib/dao/",
THINKUP_WEBAPP_PATH . '_lib/controller/',
THINKUP_WEBAPP_PATH . '_lib/exceptions/',
));
Expand All @@ -135,6 +139,7 @@ public function testAdditionalPathAfterInitialRegister() {
$this->assertEqual( Loader::getLookupPath(), array(
THINKUP_WEBAPP_PATH . '_lib/',
THINKUP_WEBAPP_PATH . '_lib/model/',
THINKUP_WEBAPP_PATH . "_lib/dao/",
THINKUP_WEBAPP_PATH . '_lib/controller/',
THINKUP_WEBAPP_PATH . '_lib/exceptions/',
THINKUP_ROOT_PATH . 'tests/classes'
Expand Down
2 changes: 1 addition & 1 deletion tests/TestOfPostController.php
Expand Up @@ -36,7 +36,7 @@
require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterOAuthThinkUp.php';
require_once THINKUP_WEBAPP_PATH.'plugins/twitter/model/class.TwitterPlugin.php';

require_once THINKUP_WEBAPP_PATH.'_lib/model/class.OwnerInstanceMySQLDAO.php';
require_once THINKUP_WEBAPP_PATH.'_lib/dao/class.OwnerInstanceMySQLDAO.php';

class TestOfPostController extends ThinkUpUnitTestCase {
public function setUp(){
Expand Down
1 change: 1 addition & 0 deletions webapp/_lib/class.Loader.php
Expand Up @@ -85,6 +85,7 @@ private static function setLookupPath(Array $paths = null) {
self::$lookup_path = array(
THINKUP_WEBAPP_PATH . "_lib/",
THINKUP_WEBAPP_PATH . "_lib/model/",
THINKUP_WEBAPP_PATH . "_lib/dao/",
THINKUP_WEBAPP_PATH . "_lib/controller/",
THINKUP_WEBAPP_PATH . "_lib/exceptions/"
);
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 7aa9fb1

Please sign in to comment.