Bye bye Simpletest and junittests module

Makefile

@@ -42,10 +42,8 @@ PHPUNITCLOVER=${CURRENT_PATH}/${TESTPATH}/temp/tests-phpunit.clover.xml
 PHPUNITCOVERAGE=${CURRENT_PATH}/${TESTPATH}/temp/coverage/
 
 ifdef XUNIT_OUTPUT
-SIMPLETEST_OUTPUT=--junitoutput
 BUILDTESTLOG=> ${CURRENT_PATH}/${TESTPATH}/temp/tests-output.xml
 else
-SIMPLETEST_OUTPUT=
 BUILDTESTLOG=
 endif
 
@@ -80,11 +78,8 @@ phpunit:
 	mkdir -p ${PHPUNITCOVERAGE} ${PHPUNITDOXDIR}
 	cd $(TESTPATH)/testapp/tests-jelix/ && $(PHPUNIT) --testdox --log-junit ${PHPUNITLOG} --testdox-html ${PHPUNITDOX} --coverage-clover ${PHPUNITCLOVER} --coverage-html ${PHPUNITCOVERAGE}
 
-simpletest:
-	cd $(TESTPATH)/testapp/scripts/ && $(PHP) tests.php default:index ${SIMPLETEST_OUTPUT} ${BUILDTESTLOG}
-
-runtests: phpunit simpletest
-	echo "phpunit and simpletest run"
+runtests: phpunit
+	echo "phpunit run"
 
 tests: preparetestapp runtests
 	echo "Tests complete"

UPGRADE-TO-1.7.md

@@ -62,4 +62,6 @@ WARNING: this is experimental!!
 - Classes that don't exist anymore:
    - jInstallerApplication
 
+- Simpletest and the module junittest are gone. If you are using them, convert your tests to PHPUnit
+
 - That's all for the moment.

build/buildjelix.php

@@ -37,7 +37,7 @@
     'dev',
     ),
 'ENABLE_DEVELOPER'=>array(
-    "include all developers tools in the distribution (simpletest &cie)",
+    "include all developers tools in the distribution",
     true,
     ),
 'ENABLE_OPTIMIZED_SOURCE'=>array(

build/manifests/jelix-deprecated-dev.mn

@@ -45,15 +45,4 @@ cd lib/jelix-scripts/templates/var/config/
 cd lib/jelix-scripts/templates/www/
   rdf.php.tpl
 
-cd lib/jelix-modules/junittests/install
-  application-cli.init.php
-
-cd lib/simpletest/
-  parser.php
-cd lib/simpletest/test
-  parser_test.php
-  real_sites_test.php
-  test_groups.php
-  reflection_php4_test.php
-cd lib/simpletest/extensions
-  junit
+rmd lib/simpletest/

build/manifests/jelix-deprecated.mn

@@ -222,8 +222,7 @@ cd lib/jelix-modules/jauthdb/install
 rmd lib/jelix-modules/jWSDL
 rmd lib/wshelper
 
-cd lib/jelix-modules/junittests/install/www/tests/
-  design.css
+rmd lib/jelix-modules/junittests
 
 cd lib/json
   JSON.php

build/manifests/jelix-modules.mn

@@ -187,34 +187,6 @@ cd lib/jelix-modules/jauth/templates
 cd lib/jelix-modules/jauth/zones
 ! loginform.zone.php
 
-#if ENABLE_DEVELOPER
-cd lib/jelix-modules/junittests/
-* module.xml
-cd lib/jelix-modules/junittests/classes
-  jhtmlrespreporter.class.php
-  jtextrespreporter.class.php
-  jjunitrespreporter.class.php
-  junittestcase.class.php
-  junittestcasedb.class.php
-  jrunnerpreparer.class.php
-cd lib/jelix-modules/junittests/controllers
-  default.classic.php
-  default.cmdline.php
-cd lib/jelix-modules/junittests/templates
-  main.tpl
-cd lib/jelix-modules/junittests/install
-  install.php
-cd lib/jelix-modules/junittests/install/scripts
-  tests.php
-cd lib/jelix-modules/junittests/install/var/log-cli
-cd lib/jelix-modules/junittests/install/var/config/cmdline
-  configtests.ini.php
-cd lib/jelix-modules/junittests/tests
-  jrunnerpreparer.html_cli.unit.php
-cd lib/jelix-modules/junittests/www
-  design.css
-#endif
-
 cd lib/jelix-modules/jsoap
 * module.xml
 cd lib/jelix-modules/jsoap/classes

build/manifests/jelix-vendors.mn

@@ -74,122 +74,6 @@ cd lib/php5redis/
   Redis.php
   README.md
 
-#if ENABLE_DEVELOPER
-cd lib/simpletest
-  arguments.php
-  authentication.php
-  autorun.php
-  browser.php
-  collector.php
-  compatibility.php
-  cookies.php
-  default_reporter.php
-  detached.php
-  dumper.php
-  eclipse.php
-  encoding.php
-  errors.php
-  exceptions.php
-  expectation.php
-  form.php
-  frames.php
-  HELP_MY_TESTS_DONT_WORK_ANYMORE
-  http.php
-  invoker.php
-  LICENSE
-  mock_objects.php
-  page.php
-  php_parser.php
-  README
-  recorder.php
-  reflection_php4.php
-  reflection_php5.php
-  remote.php
-  reporter.php
-  scorer.php
-  selector.php
-  shell_tester.php
-  simpletest.php
-  socket.php
-  tag.php
-  test_case.php
-  tidy_parser.php
-  unit_tester.php
-  url.php
-  user_agent.php
-  VERSION
-  web_tester.php
-  xml.php
-cd lib/simpletest/extensions
-  pear_test_case.php
-  testdox.php
-cd lib/simpletest/extensions/testdox
-  test.php
-cd lib/simpletest/test
-  acceptance_test.php
-  adapter_test.php
-  all_tests.php
-  arguments_test.php
-  authentication_test.php
-  autorun_test.php
-  bad_test_suite.php
-  browser_test.php
-  collector_test.php
-  command_line_test.php
-  compatibility_test.php
-  cookies_test.php
-  detached_test.php
-  dumper_test.php
-  eclipse_test.php
-  encoding_test.php
-  errors_test.php
-  exceptions_test.php
-  expectation_test.php
-  form_test.php
-  frames_test.php
-  http_test.php
-  interfaces_test.php
-  interfaces_test_php5_1.php
-  live_test.php
-  mock_objects_test.php
-  page_test.php
-  parse_error_test.php
-  parsing_test.php
-  php_parser_test.php
-  recorder_test.php
-  reflection_php5_test.php
-  remote_test.php
-  shell_test.php
-  shell_tester_test.php
-  simpletest_test.php
-  socket_test.php
-  tag_test.php
-  test_with_parse_error.php
-  unit_tester_test.php
-  unit_tests.php
-  url_test.php
-  user_agent_test.php
-  visual_test.php
-  web_tester_test.php
-  xml_test.php
-cd lib/simpletest/test/site
-  file.html
-cd lib/simpletest/test/support
-  empty_test_file.php
-  failing_test.php
-  latin1_sample
-  passing_test.php
-  recorder_sample.php
-  spl_examples.php
-  supplementary_upload_sample.txt
-  test1.php
-  upload_sample.txt
-cd lib/simpletest/test/support/collector
-  collectable.1
-  collectable.2
-#endif
-
-
 cd lib/wikirenderer
   CHANGELOG
   CREDITS

build/manifests/testapp.mn

@@ -57,7 +57,6 @@ cd testapp/install/wizard
 
 cd testapp/scripts
     cmdline.php
-    tests.php
 
 cd testapp/modules/testapp
 *  module.xml
@@ -466,16 +465,13 @@ cd testapp/var/config/jsonrpc
   config.ini.php
 cd testapp/var/config/cmdline
   config.ini.php
-  configtests.ini.php
 cd testapp/var/config/soap
   config.ini.php
 cd testapp/var/locales/fr_FR/jelix_tests/locales/
   newoverload.UTF-8.properties
   overload.UTF-8.properties
 cd testapp/var/themes/default/testapp
   hello2.tpl
-cd testapp/var/themes/default/junittests
-  main.tpl
 cd testapp/var/overloads/testapp/daos
 cd testapp/var/overloads/testapp/locales
 cd testapp/var/overloads/jelix_tests/locales/fr_FR/

lib/jelix-modules/CREDITS

@@ -11,9 +11,6 @@ Contributors
 ------------
 By alphabetic order on the name
 
-* Rahal Aboulfeth
-   bug fix in the controller of junittest (#284)
-
 * Chris
     bug fix in jauth.listener.php ( ticket #221)