BUG: Refs #212. Removed commented out code and obsolete comment.

midasplatform · Oct 18, 2011 · ef7a5f4 · ef7a5f4
1 parent 136068e
commit ef7a5f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/modules/batchmake/tests/controllers/BatchmakeControllerTest.php b/modules/batchmake/tests/controllers/BatchmakeControllerTest.php
@@ -49,7 +49,7 @@ public function setupAndGetConfig()
     MIDAS_BATCHMAKE_SCRIPT_DIR_PROPERTY => $tmpDir.'/batchmake/tests/script',
     MIDAS_BATCHMAKE_APP_DIR_PROPERTY => $tmpDir.'/batchmake/tests/bin',
     MIDAS_BATCHMAKE_DATA_DIR_PROPERTY => $tmpDir.'/batchmake/tests/data',
-    MIDAS_BATCHMAKE_CONDOR_BIN_DIR_PROPERTY => $tmpDir.'/batchmake/tests/condorbin');//change this with mocks??
+    MIDAS_BATCHMAKE_CONDOR_BIN_DIR_PROPERTY => $tmpDir.'/batchmake/tests/condorbin');
     // now make sure these dirs exist
     // later can actually add some stuff to these dirs
     foreach($configProps as $prop => $dir)

diff --git a/modules/batchmake/tests/controllers/components/KWBatchmakeComponentTest.php b/modules/batchmake/tests/controllers/components/KWBatchmakeComponentTest.php
@@ -37,7 +37,6 @@ public function setUp()
       require_once BASE_PATH.'/modules/batchmake/tests/library/ExecutorMock.php';
       $executor = new Batchmake_ExecutorMock();
       $this->kwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($this->setupAndGetConfig(), $executor);
-//      $this->kwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($this->setupAndGetConfig());
       }
     }
 
@@ -53,8 +52,8 @@ public function testIsConfigCorrect()
     // now make a change to something that shouldn't work
     $badConfigVals = $this->setupAndGetConfig();
     $badConfigVals[MIDAS_BATCHMAKE_DATA_DIR_PROPERTY] = '/unlikely/to/work/right';
-    $badKwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($badConfigVals);//BASE_PATH.'/modules/batchmake/tests/configs/module.local.ini');
-    $this->assertFalse($badKwBatchmakeComponent->isConfigCorrect());//$badConfigVals));
+    $badKwBatchmakeComponent = new Batchmake_KWBatchmakeComponent($badConfigVals);
+    $this->assertFalse($badKwBatchmakeComponent->isConfigCorrect());
     }
 
   /**