Skip to content

Commit 9eb3645

Browse files
prwaterprwater
committed
Reorganized test files.
1 parent b5f2feb commit 9eb3645

File tree

5 files changed

+333
-334
lines changed

5 files changed

+333
-334
lines changed

‎test/ErdConceptMySQLTest.php‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,44 +5,43 @@
55
//----------------------------------------------------------------------------------------------------------------------
66
class ErdConceptMySQLTest extends PHPUnit_Framework_TestCase
77
{
8-
private $mySource;
9-
10-
public function setUp()
11-
{
12-
$this->mySource = file_get_contents(realpath( __DIR__ ).'/php-erd-concepts_create.ddl');
13-
}
14-
158
//--------------------------------------------------------------------------------------------------------------------
169
/**
10+
* Test column comments with quoted identifiers.
1711
*/
18-
public function testColumns()
12+
public function testColumns1()
1913
{
20-
$template = file_get_contents(realpath( __DIR__ ).'/templates/column_template.ddl');
14+
$source = file_get_contents(realpath(__DIR__).'/source/quoted/php-erd-concepts-create.ddl');
15+
$expected = file_get_contents(realpath(__DIR__).'/template/quoted/column.ddl');
2116

22-
$result = MySqlFix::fixColumnComments($this->mySource);
23-
$this->assertEquals($template, $result);
17+
$result = MySqlFix::fixColumnComments($source);
18+
$this->assertEquals($expected, $result);
2419
}
2520

2621
//--------------------------------------------------------------------------------------------------------------------
2722
/**
23+
* Test index comments with quoted identifiers.
2824
*/
29-
public function testTables()
25+
public function testIndex1()
3026
{
31-
$template = file_get_contents(realpath( __DIR__ ).'/templates/table_template.ddl');
27+
$source = file_get_contents(realpath(__DIR__).'/source/quoted/php-erd-concepts-create.ddl');
28+
$expected = file_get_contents(realpath(__DIR__).'/template/quoted/index.ddl');
3229

33-
$result = MySqlFix::fixTableComments($this->mySource);
34-
$this->assertEquals($template, $result);
30+
$result = MySqlFix::fixIndexComments($source);
31+
$this->assertEquals($expected, $result);
3532
}
3633

3734
//--------------------------------------------------------------------------------------------------------------------
3835
/**
36+
* Test table comments with quoted identifiers.
3937
*/
40-
public function testIndex()
38+
public function testTables1()
4139
{
42-
$template = file_get_contents(realpath( __DIR__ ).'/templates/index_template.ddl');
40+
$source = file_get_contents(realpath(__DIR__).'/source/quoted/php-erd-concepts-create.ddl');
41+
$expected = file_get_contents(realpath(__DIR__).'/template/quoted/table.ddl');
4342

44-
$result = MySqlFix::fixIndexComments($this->mySource);
45-
$this->assertEquals($template, $result);
43+
$result = MySqlFix::fixTableComments($source);
44+
$this->assertEquals($expected, $result);
4645
}
4746

4847
//--------------------------------------------------------------------------------------------------------------------

‎test/php-erd-concepts_create.ddl‎ renamed to ‎test/source/quoted/php-erd-concepts-create.ddl‎

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
/*================================================================================*/
2-
/* DDL SCRIPT */
3-
/*================================================================================*/
4-
/* Title : */
5-
/* FileName : php-erd-concepts.ecm */
6-
/* Platform : MySQL 5 */
7-
/* Version : Concept */
8-
/* Date : vrijdag 27 februari 2015 */
9-
/*================================================================================*/
10-
/*================================================================================*/
11-
/* CREATE TABLES */
12-
/*================================================================================*/
13-
14-
CREATE TABLE `BAR1` (
15-
`c1` VARCHAR(40) NOT NULL,
16-
`c2` VARCHAR(40),
17-
`c3` VARCHAR(40),
18-
`c4` VARCHAR(40),
19-
`c5` VARCHAR(40),
20-
CONSTRAINT `PK_BAR1` PRIMARY KEY (`c1`)
21-
);
22-
23-
/*
24-
COMMENT ON TABLE `BAR1`
25-
This table is table BAR1.
26-
*/
27-
28-
/*
29-
COMMENT ON COLUMN `BAR1`.`c1`
30-
This column 1. Same name as in table FOO1.
31-
*/
32-
33-
/*
34-
COMMENT ON COLUMN `BAR1`.`c2`
35-
This column 2. Same name as in table FOO1.
36-
*/
37-
38-
CREATE TABLE `FOO1` (
39-
`c1` VARCHAR(40) NOT NULL,
40-
`c2` VARCHAR(40),
41-
`c3` VARCHAR(40),
42-
CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
43-
);
44-
45-
/*
46-
COMMENT ON TABLE `FOO1`
47-
This is table FOO1.
48-
*/
49-
50-
/*
51-
COMMENT ON COLUMN `FOO1`.`c1`
52-
Column 1.
53-
*/
54-
55-
/*
56-
COMMENT ON COLUMN `FOO1`.`c2`
57-
Column 2.
58-
*/
59-
60-
/*
61-
COMMENT ON COLUMN `FOO1`.`c3`
62-
Column 3.
63-
*/
64-
65-
/*================================================================================*/
66-
/* CREATE INDEXES */
67-
/*================================================================================*/
68-
69-
CREATE INDEX `IX_BAR11` ON `BAR1` (`c2`);
70-
71-
/*
72-
COMMENT ON INDEX `IX_BAR11`
73-
Indexes can have comments to.
74-
*/
75-
76-
CREATE INDEX `IX_BAR12` ON `BAR1` (`c3`, `c4`, `c5`);
77-
78-
/*
79-
COMMENT ON INDEX `IX_BAR12`
80-
This is a multi column index.
81-
*/
1+
/*================================================================================*/
2+
/* DDL SCRIPT */
3+
/*================================================================================*/
4+
/* Title : */
5+
/* FileName : php-erd-concepts.ecm */
6+
/* Platform : MySQL 5 */
7+
/* Version : Concept */
8+
/* Date : vrijdag 27 februari 2015 */
9+
/*================================================================================*/
10+
/*================================================================================*/
11+
/* CREATE TABLES */
12+
/*================================================================================*/
13+
14+
CREATE TABLE `BAR1` (
15+
`c1` VARCHAR(40) NOT NULL,
16+
`c2` VARCHAR(40),
17+
`c3` VARCHAR(40),
18+
`c4` VARCHAR(40),
19+
`c5` VARCHAR(40),
20+
CONSTRAINT `PK_BAR1` PRIMARY KEY (`c1`)
21+
);
22+
23+
/*
24+
COMMENT ON TABLE `BAR1`
25+
This table is table BAR1.
26+
*/
27+
28+
/*
29+
COMMENT ON COLUMN `BAR1`.`c1`
30+
This column 1. Same name as in table FOO1.
31+
*/
32+
33+
/*
34+
COMMENT ON COLUMN `BAR1`.`c2`
35+
This column 2. Same name as in table FOO1.
36+
*/
37+
38+
CREATE TABLE `FOO1` (
39+
`c1` VARCHAR(40) NOT NULL,
40+
`c2` VARCHAR(40),
41+
`c3` VARCHAR(40),
42+
CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
43+
);
44+
45+
/*
46+
COMMENT ON TABLE `FOO1`
47+
This is table FOO1.
48+
*/
49+
50+
/*
51+
COMMENT ON COLUMN `FOO1`.`c1`
52+
Column 1.
53+
*/
54+
55+
/*
56+
COMMENT ON COLUMN `FOO1`.`c2`
57+
Column 2.
58+
*/
59+
60+
/*
61+
COMMENT ON COLUMN `FOO1`.`c3`
62+
Column 3.
63+
*/
64+
65+
/*================================================================================*/
66+
/* CREATE INDEXES */
67+
/*================================================================================*/
68+
69+
CREATE INDEX `IX_BAR11` ON `BAR1` (`c2`);
70+
71+
/*
72+
COMMENT ON INDEX `IX_BAR11`
73+
Indexes can have comments to.
74+
*/
75+
76+
CREATE INDEX `IX_BAR12` ON `BAR1` (`c3`, `c4`, `c5`);
77+
78+
/*
79+
COMMENT ON INDEX `IX_BAR12`
80+
This is a multi column index.
81+
*/

‎test/templates/column_template.ddl‎ renamed to ‎test/template/quoted/column.ddl‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,81 +1,81 @@
1-
/*================================================================================*/
2-
/* DDL SCRIPT */
3-
/*================================================================================*/
4-
/* Title : */
5-
/* FileName : php-erd-concepts.ecm */
6-
/* Platform : MySQL 5 */
7-
/* Version : Concept */
8-
/* Date : vrijdag 27 februari 2015 */
9-
/*================================================================================*/
10-
/*================================================================================*/
11-
/* CREATE TABLES */
12-
/*================================================================================*/
13-
14-
CREATE TABLE `BAR1` (
1+
/*================================================================================*/
2+
/* DDL SCRIPT */
3+
/*================================================================================*/
4+
/* Title : */
5+
/* FileName : php-erd-concepts.ecm */
6+
/* Platform : MySQL 5 */
7+
/* Version : Concept */
8+
/* Date : vrijdag 27 februari 2015 */
9+
/*================================================================================*/
10+
/*================================================================================*/
11+
/* CREATE TABLES */
12+
/*================================================================================*/
13+
14+
CREATE TABLE `BAR1` (
1515
`c1` VARCHAR(40) NOT NULL COMMENT 'This column 1. Same name as in table FOO1.',
1616
`c2` VARCHAR(40) COMMENT 'This column 2. Same name as in table FOO1.',
17-
`c3` VARCHAR(40),
18-
`c4` VARCHAR(40),
19-
`c5` VARCHAR(40),
20-
CONSTRAINT `PK_BAR1` PRIMARY KEY (`c1`)
21-
);
22-
23-
/*
24-
COMMENT ON TABLE `BAR1`
25-
This table is table BAR1.
26-
*/
27-
28-
/*
29-
COMMENT ON COLUMN `BAR1`.`c1`
30-
This column 1. Same name as in table FOO1.
31-
*/
32-
33-
/*
34-
COMMENT ON COLUMN `BAR1`.`c2`
35-
This column 2. Same name as in table FOO1.
36-
*/
37-
38-
CREATE TABLE `FOO1` (
17+
`c3` VARCHAR(40),
18+
`c4` VARCHAR(40),
19+
`c5` VARCHAR(40),
20+
CONSTRAINT `PK_BAR1` PRIMARY KEY (`c1`)
21+
);
22+
23+
/*
24+
COMMENT ON TABLE `BAR1`
25+
This table is table BAR1.
26+
*/
27+
28+
/*
29+
COMMENT ON COLUMN `BAR1`.`c1`
30+
This column 1. Same name as in table FOO1.
31+
*/
32+
33+
/*
34+
COMMENT ON COLUMN `BAR1`.`c2`
35+
This column 2. Same name as in table FOO1.
36+
*/
37+
38+
CREATE TABLE `FOO1` (
3939
`c1` VARCHAR(40) NOT NULL COMMENT 'Column 1.',
4040
`c2` VARCHAR(40) COMMENT 'Column 2.',
4141
`c3` VARCHAR(40) COMMENT 'Column 3.',
42-
CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
43-
);
44-
45-
/*
46-
COMMENT ON TABLE `FOO1`
47-
This is table FOO1.
48-
*/
49-
50-
/*
51-
COMMENT ON COLUMN `FOO1`.`c1`
52-
Column 1.
53-
*/
54-
55-
/*
56-
COMMENT ON COLUMN `FOO1`.`c2`
57-
Column 2.
58-
*/
59-
60-
/*
61-
COMMENT ON COLUMN `FOO1`.`c3`
62-
Column 3.
63-
*/
64-
65-
/*================================================================================*/
66-
/* CREATE INDEXES */
67-
/*================================================================================*/
68-
69-
CREATE INDEX `IX_BAR11` ON `BAR1` (`c2`);
70-
71-
/*
72-
COMMENT ON INDEX `IX_BAR11`
73-
Indexes can have comments to.
74-
*/
75-
76-
CREATE INDEX `IX_BAR12` ON `BAR1` (`c3`, `c4`, `c5`);
77-
78-
/*
79-
COMMENT ON INDEX `IX_BAR12`
80-
This is a multi column index.
81-
*/
42+
CONSTRAINT `PK_FOO1` PRIMARY KEY (`c1`)
43+
);
44+
45+
/*
46+
COMMENT ON TABLE `FOO1`
47+
This is table FOO1.
48+
*/
49+
50+
/*
51+
COMMENT ON COLUMN `FOO1`.`c1`
52+
Column 1.
53+
*/
54+
55+
/*
56+
COMMENT ON COLUMN `FOO1`.`c2`
57+
Column 2.
58+
*/
59+
60+
/*
61+
COMMENT ON COLUMN `FOO1`.`c3`
62+
Column 3.
63+
*/
64+
65+
/*================================================================================*/
66+
/* CREATE INDEXES */
67+
/*================================================================================*/
68+
69+
CREATE INDEX `IX_BAR11` ON `BAR1` (`c2`);
70+
71+
/*
72+
COMMENT ON INDEX `IX_BAR11`
73+
Indexes can have comments to.
74+
*/
75+
76+
CREATE INDEX `IX_BAR12` ON `BAR1` (`c3`, `c4`, `c5`);
77+
78+
/*
79+
COMMENT ON INDEX `IX_BAR12`
80+
This is a multi column index.
81+
*/

0 commit comments

Comments
 (0)