Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/class init #285

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix/class init #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02abf66
Use ontology trait to retrieve class
jbout Jun 17, 2019
f9f8d9f
Bump v11.2.1
jbout Jun 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manifest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
'label' => 'Test core extension',
'description' => 'TAO Tests extension contains the abstraction of the test-runners, but requires an implementation in order to be able to run tests',
'license' => 'GPL-2.0',
'version' => '11.2.0',
'version' => '11.2.1',
'author' => 'Open Assessment Technologies, CRP Henri Tudor',
'requires' => array(
'generis' => '>=7.1.0',
Expand Down
26 changes: 1 addition & 25 deletions models/classes/class.TestsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,33 +51,9 @@ class taoTests_models_classes_TestsService
const TEST_TESTCONTENT_PROP = 'http://www.tao.lu/Ontologies/TAOTest.rdf#TestContent';

const PROPERTY_TEST_CONTENT = 'http://www.tao.lu/Ontologies/TAOTest.rdf#TestContent';
// --- ASSOCIATIONS ---


// --- ATTRIBUTES ---

/**
* The RDFS top level test class
*
* @access protected
* @var core_kernel_classes_Class
*/
protected $testClass = null;

// --- OPERATIONS ---

/**
* Short description of method __construct
*
* @access public
* @author Joel Bout, <[email protected]>
*/
protected function __construct()
{
parent::__construct();
$this->testClass = new core_kernel_classes_Class(TaoOntology::CLASS_URI_TEST );
}

/**
* delete a test instance
*
Expand Down Expand Up @@ -118,7 +94,7 @@ public function deleteResource(core_kernel_classes_Resource $resource)
*/
public function getRootclass()
{
return $this->testClass;
return $this->getClass(TaoOntology::CLASS_URI_TEST);
}

/**
Expand Down
3 changes: 1 addition & 2 deletions scripts/update/Updater.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
use oat\tao\scripts\update\OntologyUpdater;
use oat\taoTests\models\runner\providers\TestProviderService;
use oat\taoTests\scripts\install\RegisterTestPluginService;
use oat\taoTests\scripts\install\RegisterTestRunnerFeatureService;
use oat\tao\model\accessControl\func\AclProxy;
use oat\tao\model\accessControl\func\AccessRule;
use oat\tao\model\user\TaoRoles;
Expand Down Expand Up @@ -135,6 +134,6 @@ public function update($initialVersion)
$this->setVersion('7.8.0');
}

$this->skip('7.8.0', '11.2.0');
$this->skip('7.8.0', '11.2.1');
}
}