Updated local_dir to be optional

the `datawarehouse` test specified in `xdmod_config.json` didn't need a
`local_dir` so this was removed. To account for some entries having a local_dir
and others not I updated the config object construction to account for this.

open_xdmod/modules/xdmod/tests/lib/ETL/Configuration/EtlConfigurationTest.php

@@ -159,31 +159,38 @@ public function testXdmodConfiguration(array $options)
  $baseDir = dirname($this->testFiles->getFile('configuration', '.', 'input'));
  $baseFile = $this->testFiles->getFile('configuration', $options['base_file'], 'input');
 
- $localDir = $this->interpretDirOption($options['local_dir']);
- $localConfigDir = dirname(
- $this->testFiles->getfile(
- 'configuration',
- implode(
- DIRECTORY_SEPARATOR,
- array(
- '.',
- $localDir,
- '.')
- ),
- 'input'
- )
- );
-
  $expectedFilePath = $this->testFiles->getFile('configuration', $options['expected']);
 
- $config = new XdmodConfiguration(
- $baseFile,
- $baseDir,
- null,
- array(
- 'local_config_dir' => $localConfigDir
- )
- );
+ if (isset($options['local_dir'])) {
+ $localDir = $this->interpretDirOption($options['local_dir']);
+ $localConfigDir = dirname(
+ $this->testFiles->getfile(
+ 'configuration',
+ implode(
+ DIRECTORY_SEPARATOR,
+ array(
+ '.',
+ $localDir,
+ '.')
+ ),
+ 'input'
+ )
+ );
+ $config = new XdmodConfiguration(
+ $baseFile,
+ $baseDir,
+ null,
+ array(
+ 'local_config_dir' => $localConfigDir
+ )
+ );
+ } else {
+ $config = new XdmodConfiguration(
+ $baseFile,
+ $baseDir
+ );
+ }
+
  $config->initialize();
 
  $actual = sprintf("%s\n", $config->toJson());

tests/artifacts/xdmod-test-artifacts/xdmod/configuration/input/xdmod_config.json

@@ -9,7 +9,6 @@
  [
  {
  "base_file": "datawarehouse",
- "local_dir": ["datawarehouse.d"],
  "expected": "xdmod_config_datawarehouse"
  }
  ],