removed unused test schema

FXdSP · May 29, 2021 · c4089b8 · c4089b8
1 parent f63d3fe
commit c4089b8
Show file tree

Hide file tree

Showing 11 changed files with 5 additions and 245 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,9 +18,6 @@ tests/Fixtures/schemas/build/
 tests/Fixtures/bookstore/build/
 tests/Fixtures/bookstore/propel.yaml
 
-tests/Fixtures/bookstore-packaged/build/
-tests/Fixtures/bookstore-packaged/propel.yaml
-
 tests/Fixtures/namespaced/propel.yaml
 
 tests/Fixtures/schemas/propel.yaml

diff --git a/src/Propel/Generator/Command/TestPrepareCommand.php b/src/Propel/Generator/Command/TestPrepareCommand.php
@@ -49,7 +49,6 @@ class TestPrepareCommand extends AbstractCommand
     protected $fixtures = [
         //directory - array of connections
         'bookstore' => ['bookstore', 'bookstore-cms', 'bookstore-behavior'],
-        'bookstore-packaged' => ['bookstore-packaged', 'bookstore-log'],
         'namespaced' => ['bookstore_namespaced'],
         'reverse/mysql' => ['reverse-bookstore'],
         'reverse/pgsql' => ['reverse-bookstore'],

diff --git a/tests/Fixtures/bookstore-packaged/book_club_list.schema.xml b/tests/Fixtures/bookstore-packaged/book_club_list.schema.xml
diff --git a/tests/Fixtures/bookstore-packaged/log.schema.xml b/tests/Fixtures/bookstore-packaged/log.schema.xml
diff --git a/tests/Fixtures/bookstore-packaged/media.schema.xml b/tests/Fixtures/bookstore-packaged/media.schema.xml
diff --git a/tests/Fixtures/bookstore-packaged/propel.yaml.dist b/tests/Fixtures/bookstore-packaged/propel.yaml.dist
diff --git a/tests/Fixtures/bookstore-packaged/publisher.schema.xml b/tests/Fixtures/bookstore-packaged/publisher.schema.xml
diff --git a/tests/Fixtures/bookstore-packaged/review.schema.xml b/tests/Fixtures/bookstore-packaged/review.schema.xml
diff --git a/tests/Propel/Tests/Generator/Manager/AbstractManagerTest.php b/tests/Propel/Tests/Generator/Manager/AbstractManagerTest.php
@@ -13,9 +13,7 @@
 use Propel\Generator\Manager\AbstractManager;
 use Propel\Tests\TestCase;
 
-/**
- * @group database
- */
+
 class AbstractManagerTest extends TestCase
 {
     private $manager;
@@ -37,8 +35,8 @@ public function testIncludeExternalSchemaWithRelativePathTo()
         // include book.schema.xml, which includes external author schema
         $schemaXml = <<< EOT
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<database package="core.book" name="bookstore" defaultIdMethod="native" namespace="Propel\Tests\BookstorePackaged">
-  <external-schema filename="../../../../Fixtures/bookstore-packaged/book.schema.xml" referenceOnly="true"/>
+<database package="core.book" name="bookstore" defaultIdMethod="native" namespace="Propel\Tests\Bookstore">
+  <external-schema filename="../../Resources/external-schemas/book.schema.xml" referenceOnly="true"/>
 </database>
 
 EOT;
@@ -68,7 +66,7 @@ public function testIncludeExternalSchemaThrowsExceptionForMissingFiles()
         // include book.schema.xml, which includes external author schema
         $schemaXml = <<< EOT
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<database package="core.book" name="bookstore" defaultIdMethod="native" namespace="Propel\Tests\BookstorePackaged">
+<database package="core.book" name="bookstore" defaultIdMethod="native" namespace="Propel\Tests\Bookstore">
   <external-schema filename="../ThisFileNameDoesNotExistBababuiBababui/book.schema.xml" referenceOnly="true"/>
 </database>
 

diff --git a/...xtures/bookstore-packaged/book.schema.xml → ...esources/external-schemas/book.schema.xml b/...xtures/bookstore-packaged/book.schema.xml → ...esources/external-schemas/book.schema.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "../dtd/database.dtd">
 
-<database package="core.book" name="bookstore" defaultIdMethod="native" namespace="Propel\Tests\BookstorePackaged">
+<database package="core.book" name="bookstore" defaultIdMethod="native" namespace="Propel\Tests\Bookstore">
   <external-schema filename="external/author.schema.xml"/>
   <table name="book" description="Book Table">
       <column name="id" required="true" primaryKey="true" autoIncrement="true" type="INTEGER" description="Book Id"/>

diff --git a/...store-packaged/external/author.schema.xml → ...ternal-schemas/external/author.schema.xml b/...store-packaged/external/author.schema.xml → ...ternal-schemas/external/author.schema.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
-<!DOCTYPE database SYSTEM "../dtd/database.dtd">
 
 <database package="core.author" name="bookstore" defaultIdMethod="native">