Merge pull request #116 from sugarcrm/unit-tests

Update the way we run our unit tests
sugarcrm-developers · Oct 18, 2018 · bd70fbc · bd70fbc
2 parents 0538bbb + ac4c3f1
commit bd70fbc
Show file tree

Hide file tree

Showing 10 changed files with 6 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -662,7 +662,7 @@ Currently, we have PHPUnit tests and Postman tests.
 
 #### PHPUnit tests for the Professor M Module Loadable Package
 [PHPUnit](https://phpunit.de/) is a testing framework for PHP.  The PHPUnit test files are located in 
-[package/src/custom/tests/School/unit-php](package/src/custom/tests/School/unit-php).  
+[package/src/custom/tests/unit-php/School](package/src/custom/tests/unit-php/School).  
 
 ##### Manual execution
 
@@ -698,7 +698,7 @@ for instructions on setting up a development environment.
 You will also need to get a copy of the Sugar provided unit tests and put them in your Sugar source code directory. See
 the [SugarCRM unit tests GitHub repo](https://github.com/sugarcrm/unit-tests) for more information.  
 
-Prepare to run the Sugar provided PHPUnit tests by executing the following commands:
+Prepare to run the Sugar provided PHPUnit tests and the Professor M PHPUnit tests by executing the following commands:
 ```
 $ cd /path/to/sugar_source_dir
 $ composer install
@@ -717,17 +717,10 @@ Install the **standard** version of the Professor M Module Loadable Package usin
 if you have not already done so.  The code for 
 Professor M and the associated tests will be installed in to the Sugar source directory.
 
-Prepare to run the Professor M PHPUnit tests by executing the following commands:
-```
-$ cd /path/to/sugar_source_dir
-$ cd custom/tests/School/unit-php
-$ chmod +x ../../../../vendor/bin/phpunit
-```
-
-Run the Professor M PHPUnit tests by executing the following command from the `/custom/tests/School/unit-php` directory:
+Run the Professor M PHPUnit tests by executing the following command from the `tests/unit-php` directory:
 
 ```
-$ ../../../../vendor/bin/phpunit
+$ ../../vendor/bin/phpunit --testsuite custom
 ```
 
 ##### Automatic execution in Travis CI

diff --git a/package/src/custom/tests/School/unit-php/phpunit.xml.dist b/package/src/custom/tests/School/unit-php/phpunit.xml.dist
diff --git a/...cheduledTasks/StudentGradebookJobTest.php → ...cheduledTasks/StudentGradebookJobTest.php b/...cheduledTasks/StudentGradebookJobTest.php → ...cheduledTasks/StudentGradebookJobTest.php
diff --git a/...-php/gradebook_fake/RecordManagerTest.php → ...hool/gradebook_fake/RecordManagerTest.php b/...-php/gradebook_fake/RecordManagerTest.php → ...hool/gradebook_fake/RecordManagerTest.php
diff --git a/...ts/base/api/OnlineApplicationsAPITest.php → ...ts/base/api/OnlineApplicationsAPITest.php b/...ts/base/api/OnlineApplicationsAPITest.php → ...ts/base/api/OnlineApplicationsAPITest.php
diff --git a/...odules/Contacts/Student_GradebookTest.php → ...odules/Contacts/Student_GradebookTest.php b/...odules/Contacts/Student_GradebookTest.php → ...odules/Contacts/Student_GradebookTest.php
diff --git a/...emplates/Fields/Forms/RatingFieldTest.php → ...emplates/Fields/Forms/RatingFieldTest.php b/...emplates/Fields/Forms/RatingFieldTest.php → ...emplates/Fields/Forms/RatingFieldTest.php
diff --git a/...plates/Fields/TemplateRatingFieldTest.php → ...plates/Fields/TemplateRatingFieldTest.php b/...plates/Fields/TemplateRatingFieldTest.php → ...plates/Fields/TemplateRatingFieldTest.php
diff --git a/...s/Leads/ApplicantProgrammingScoreTest.php → ...s/Leads/ApplicantProgrammingScoreTest.php b/...s/Leads/ApplicantProgrammingScoreTest.php → ...s/Leads/ApplicantProgrammingScoreTest.php
diff --git a/scripts/RunProfMPHPUnitTests.sh b/scripts/RunProfMPHPUnitTests.sh
@@ -9,11 +9,11 @@
 ######################################################################
 
 # Change to the directory where the Sugar PHPUnit tests are stored and update permissions
-docker exec sugar-web1 bash -c "cd custom/tests/School/unit-php && chmod +x ../../../../vendor/bin/phpunit"
+docker exec sugar-web1 bash -c "cd tests/unit-php/ && chmod +x ../../vendor/bin/phpunit"
 
 ######################################################################
 # Run the Professor M PHPUnit tests
 ######################################################################
 
 echo "Running the PHPUnit tests for the Professor M Module Loadable Package..."
-docker exec sugar-web1 bash -c "cd custom/tests/School/unit-php && ../../../../vendor/bin/phpunit"
+docker exec sugar-web1 bash -c "cd tests/unit-php && ../../vendor/bin/phpunit --testsuite custom"