From c3c4a284a0fda44fd9ccae2660e52452de3f5d82 Mon Sep 17 00:00:00 2001 From: "Jonathan.Wage" Date: Fri, 5 Oct 2007 19:34:05 +0000 Subject: [PATCH] Fix unit tests. --- tests/Export/SchemaTestCase.php | 10 +- tests/Import/SchemaTestCase.php | 20 +- tests/schema.yml | 645 +------------------------------- 3 files changed, 22 insertions(+), 653 deletions(-) diff --git a/tests/Export/SchemaTestCase.php b/tests/Export/SchemaTestCase.php index e172220d3..b304da9f4 100644 --- a/tests/Export/SchemaTestCase.php +++ b/tests/Export/SchemaTestCase.php @@ -56,12 +56,6 @@ class Doctrine_Export_Schema_TestCase extends Doctrine_UnitTestCase public function testYmlExport() { $export = new Doctrine_Export_Schema(); - $export->exportSchema('schema.yml', 'yml', dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'models', $this->tables); + $export->exportSchema('schema-export.yml', 'yml', dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'models', $this->tables); } - - public function testXmlExport() - { - $export = new Doctrine_Export_Schema(); - $export->exportSchema('schema.xml', 'xml', dirname(dirname(dirname(__FILE__))) . DIRECTORY_SEPARATOR . 'models', $this->tables); - } -} +} \ No newline at end of file diff --git a/tests/Import/SchemaTestCase.php b/tests/Import/SchemaTestCase.php index 78cf8e74f..12d8058c0 100644 --- a/tests/Import/SchemaTestCase.php +++ b/tests/Import/SchemaTestCase.php @@ -49,22 +49,4 @@ class Doctrine_Import_Schema_TestCase extends Doctrine_UnitTestCase unlink('classes/Group.class.php'); } } - - public function testXmlImport() - { - $import = new Doctrine_Import_Schema(); - $import->importSchema('schema.xml', 'xml', 'classes'); - - if ( ! file_exists('classes/User.class.php')) { - $this->fail(); - } else { - unlink('classes/User.class.php'); - } - - if ( ! file_exists('classes/Group.class.php')) { - $this->fail(); - } else { - unlink('classes/Group.class.php'); - } - } -} +} \ No newline at end of file diff --git a/tests/schema.yml b/tests/schema.yml index 3bd28f62e..02a946752 100644 --- a/tests/schema.yml +++ b/tests/schema.yml @@ -1,636 +1,29 @@ --- -Account: - tableName: account - className: Account - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - entity_id: - type: integer - length: 2147483647 - name: entity_id - amount: - type: integer - length: 2147483647 - name: amount -Address: - tableName: address - className: Address - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - address: - type: string - length: 200 - name: address - relations: - User: - refClass: EntityAddress - local: address_id - foreign: user_id - type: many - EntityAddress: - local: id - foreign: address_id - type: many -Album: - tableName: album - className: Album - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - user_id: - type: integer - length: 2147483647 - name: user_id - name: - type: string - length: 20 - name: name - relations: - Song: - local: id - foreign: album_id - type: many - User: - local: user_id - foreign: id - type: one -Assignment: - tableName: assignment - className: Assignment - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - task_id: - type: integer - length: 2147483647 - name: task_id - resource_id: - type: integer - length: 2147483647 - name: resource_id -Description: - tableName: description - className: Description - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - description: - type: string - length: 3000 - name: description - file_md5: - type: string - length: 32 - name: file_md5 -Element: - tableName: element - className: Element - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - name: - type: string - length: 100 - name: name - parent_id: - type: integer - length: 2147483647 - name: parent_id - relations: - Child: - class: Element - local: id - foreign: parent_id - type: many - Parent: - class: Element - local: parent_id - foreign: id - type: one -Email: - tableName: email - className: Email - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - address: - email: true - unique: true - type: string - length: 150 - name: address -Entity: - tableName: entity - className: Entity - columns: - id: - autoincrement: true - primary: true - type: integer - length: 20 - name: id - name: - type: string - length: 50 - name: name - loginname: - unique: true - type: string - length: 20 - name: loginname - password: - type: string - length: 16 - name: password - type: - type: integer - length: 1 - name: type - created: - type: integer - length: 11 - name: created - updated: - type: integer - length: 11 - name: updated - email_id: - type: integer - length: 2147483647 - name: email_id - relations: - Email: - local: email_id - foreign: id - type: one - Phonenumber: - local: id - foreign: entity_id - type: many - Account: - local: id - foreign: entity_id - type: one - Entity: - refClass: EntityReference - local: entity1 - foreign: entity2 - type: many - EntityReference: - local: id - foreign: entity1 - type: many -EntityAddress: - tableName: entity_address - className: EntityAddress - columns: - user_id: - primary: true - type: integer - length: 2147483647 - name: user_id - address_id: - primary: true - type: integer - length: 2147483647 - name: address_id - relations: - Address: - local: address_id - foreign: id - type: one -EntityReference: - tableName: entity_reference - className: EntityReference - columns: - entity1: - primary: true - type: integer - length: 2147483647 - name: entity1 - entity2: - primary: true - type: integer - length: 2147483647 - name: entity2 - relations: - Entity: - local: entity1 - foreign: id - type: one -Error: - tableName: error - className: Error - columns: - message: - type: string - length: 200 - name: message - code: - type: integer - length: 11 - name: code - file_md5: - primary: true - type: string - length: 32 - name: file_md5 - relations: - Description: - local: file_md5 - foreign: file_md5 - type: one -Group: - tableName: entity - className: Group - columns: - id: - autoincrement: true - primary: true - type: integer - length: 20 - name: id - name: - type: string - length: 50 - name: name - loginname: - unique: true - type: string - length: 20 - name: loginname - password: - type: string - length: 16 - name: password - type: - type: integer - length: 1 - name: type - created: - type: integer - length: 11 - name: created - updated: - type: integer - length: 11 - name: updated - email_id: - type: integer - length: 2147483647 - name: email_id - relations: - Email: - local: email_id - foreign: id - type: one - Phonenumber: - local: id - foreign: entity_id - type: many - Account: - local: id - foreign: entity_id - type: one - Entity: - refClass: EntityReference - local: entity1 - foreign: entity2 - type: many - User: - refClass: Groupuser - local: group_id - foreign: user_id - type: many - EntityReference: - local: id - foreign: entity1 - type: many - Groupuser: - local: id - foreign: group_id - type: many -Groupuser: - tableName: groupuser - className: Groupuser - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - added: - type: integer - length: 2147483647 - name: added - group_id: - type: integer - length: 2147483647 - name: group_id - user_id: - type: integer - length: 2147483647 - name: user_id - relations: - Group: - local: group_id - foreign: id - type: one - User: - local: user_id - foreign: id - type: one -Phonenumber: - tableName: phonenumber - className: Phonenumber - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - phonenumber: - type: string - length: 20 - name: phonenumber - entity_id: - type: integer - length: 2147483647 - name: entity_id - relations: - Entity: - local: entity_id - foreign: id - type: one - Group: - local: entity_id - foreign: id - type: one - User: - local: entity_id - foreign: id - type: one -ResourceReference: - tableName: resource_reference - className: ResourceReference - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - type_id: - type: integer - length: 2147483647 - name: type_id - resource_id: - type: integer - length: 2147483647 - name: resource_id -Resource: - tableName: resource - className: Resource - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - name: - type: string - length: 100 - name: name - relations: - TaskAlias: - refClass: Assignment - class: Task - local: resource_id - foreign: task_id - type: many - Type: - refClass: ResourceReference - class: ResourceType - local: resource_id - foreign: type_id - type: many - Assignment: - local: id - foreign: resource_id - type: many - ResourceReference: - local: id - foreign: resource_id - type: many -ResourceType: - tableName: resource_type - className: ResourceType - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - type: - type: string - length: 100 - name: type - relations: - ResourceAlias: - refClass: ResourceReference - class: Resource - local: resourcetype_id - foreign: resource_id - type: many - ResourceReference: - local: id - foreign: resourcetype_id - type: many -Song: - tableName: song - className: Song - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - album_id: - type: integer - length: 2147483647 - name: album_id - genre: - type: string - length: 20 - name: genre - title: - type: string - length: 30 - name: title - relations: - Album: - local: album_id - foreign: id - type: one -Task: - tableName: task - className: Task - columns: - id: - type: integer - length: 20 - autoincrement: true - primary: true - name: id - name: - type: string - length: 100 - name: name - parent_id: - type: integer - length: 2147483647 - name: parent_id - relations: - ResourceAlias: - refClass: Assignment - class: Resource - local: task_id - foreign: resource_id - type: many - Subtask: - class: Task - local: id - foreign: parent_id - type: many - Assignment: - local: id - foreign: task_id - type: many User: - tableName: entity + tableName: user className: User columns: id: - autoincrement: true + notnull: true primary: true + autoincrement: true type: integer - length: 20 + length: 4 + name: id + username: + type: string + length: 255 +Group: + tableName: group + className: Group + columns: + id: + notnull: true + primary: true + autoincrement: true + type: integer + length: 4 name: id name: type: string - length: 50 - name: name - loginname: - unique: true - type: string - length: 20 - name: loginname - password: - type: string - length: 16 - name: password - type: - type: integer - length: 1 - name: type - created: - type: integer - length: 11 - name: created - updated: - type: integer - length: 11 - name: updated - email_id: - type: integer - length: 2147483647 - name: email_id - relations: - Email: - local: email_id - foreign: id - type: one - Phonenumber: - local: id - foreign: entity_id - type: many - Account: - local: id - foreign: entity_id - type: one - Entity: - refClass: EntityReference - local: entity1 - foreign: entity2 - type: many - Address: - refClass: EntityAddress - local: user_id - foreign: address_id - type: many - Addresses: - refClass: EntityAddress - class: Address - local: user_id - foreign: address_id - type: many - Album: - local: id - foreign: user_id - type: many - Book: - local: id - foreign: user_id - type: many - Group: - refClass: Groupuser - local: user_id - foreign: group_id - type: many - EntityReference: - local: id - foreign: entity1 - type: many - EntityAddress: - local: id - foreign: user_id - type: many - Groupuser: - local: id - foreign: user_id - type: many + length: 255 \ No newline at end of file