Changeset 342 for trunk

Timestamp:

04/06/10 12:25:44 (11 years ago)

Author:

sander

Message:

Add shell to add missing validators to test suite

File:

• trunk/server/www/app/vendors/shells/validators.php (modified) (4 diffs)

trunk/server/www/app/vendors/shells/validators.php

@@ -54 +54 @@
 
         /**
+         * Add missing validators to the test suites
+         */
+        public function missing()
+        {
+                $suite_id = $this->_getSuite();
+                $validator = $this->_getValidator();
+
+                if ($validator == 'all') {
+                        $validators = Configure::read('Validator');
+                } else {
+                        $validators = array();
+                        $validators[$validator] = Configure::read('Validator.' . $validator);
+                }
+
+                var_dump($validators);
+                $count = 0;
+
+                // Find all requests
+                $requests = $this->Testsuite->getRequests($suite_id, array(
+                        'Validator' => array('fields' => 'name'),
+                        'Job',
+                        'Job.Result',
+                        'Job.Result.Validator' => array('fields' => 'name'),
+                ));
+
+                // Loop through the requests and add missing validators
+                foreach ($requests as $request) {
+                        foreach ($validators as $validator_name => $validator_config) {
+                                if (!$validator_config) {
+                                        continue;
+                                }
+
+                                $existing = Set::extract('/Validator/name', $request);
+                                if (!in_array($validator_name, $existing)) {
+                                        $this->Validator->create();
+                                        $this->Validator->save(array('Validator' => array(
+                                                'name' => $validator_name,
+                                                'parent_id' => $request['Request']['id'],
+                                        )));
+                                        $this->Validator->defer('run');
+                                        $count++;
+                                }
+                        }
+                }
+
+                // Find all the results
+                $results = Set::extract('/Job/Result', $requests);
+                foreach ($results as $result) {
+                        if (empty($result['Result'])) {
+                                continue;
+                        }
+
+                        foreach ($validators as $validator_name => $validator_config) {
+                                if (!$validator_config) {
+                                        continue;
+                                }
+
+                                $existing = Set::extract('/Result/Validator/name', $result);
+                                if (!in_array($validator_name, $existing)) {
+                                        $this->Validator->create();
+                                        $this->Validator->save(array('Validator' => array(
+                                                'name' => $validator_name,
+                                                'parent_id' => $result['Result']['id'],
+                                        )));
+                                        $this->Validator->defer('run');
+                                        $count++;
+                                }
+                        }
+                }
+
+                $this->out(sprintf('Created and scheduled %d validators to run in the background.', $count));
+        }
+
+        /**
          * Ask for a test suite
          */
@@ -68 +142 @@
                 }
 
-                $this->out('For which test suite do you want to regenerate the validator results?');
+                $this->out('Please coose a test suite.');
                 $this->hr();
                 foreach ($options as $index => $option) {
@@ -106 +180 @@
         {
                 $options = array(1 => 'All validators');
-                $validators = $this->Validator->find('all', array(
-                        'fields' => array('DISTINCT Validator.name'),
-                        'order' => 'Validator.name ASC',
-                        'recursive' => -1,
-                ));
-
-                foreach ($validators as $validator) {
-                        $options[] = $validator['Validator']['name'];
-                }
-
-                $this->out('For which validator do you want to re-run the results?');
+
+                $validators = Configure::read('Validator');
+                foreach ($validators as $validator_name => $validator_config) {
+                        $options[] = $validator_name;
+                }
+
+                $this->out('Please choose a validator.');
                 $this->hr();
                 foreach ($options as $index => $option) {
@@ -176 +246 @@
          * Get all validators based on test suite, validator name and state
          */
-        private function _getValidators($suite, $name, $state)
-        {
-                
-                $conditions = array('Validator.state' => $state);
+        private function _getValidators($suite, $name, $state = array())
+        {
+                $conditions = array();
+
+                if ($state) {
+                        $conditions['Validator.state'] = $state;
+                }
+
                 if ($name != 'all') {
                         $conditions['Validator.name'] = $name;