<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][7665] trunk/tests: In test suite, break constant definitions into separate file</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/7665">7665</a></dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2013-12-12 20:48:46 +0000 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>In test suite, break constant definitions into separate file
BP's test installation routine is generally run from bootstrap.php. But in
certain cases, as when the suite is being invoked from a BP-dependent plugin's
tests, loader.php can be called directly, skipping bootstrap.php. For this
reason, it makes sense to define constants in a separate file and then include
that file as needed when the tests are first loaded, via either path.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunktestsbootstrapphp">trunk/tests/bootstrap.php</a></li>
<li><a href="#trunktestsincludesloaderphp">trunk/tests/includes/loader.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunktestsincludesdefineconstantsphp">trunk/tests/includes/define-constants.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunktestsbootstrapphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/bootstrap.php (7664 => 7665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/bootstrap.php 2013-12-12 20:43:28 UTC (rev 7664)
+++ trunk/tests/bootstrap.php 2013-12-12 20:48:46 UTC (rev 7665)
</span><span class="lines">@@ -1,43 +1,7 @@
</span><span class="cx"> <?php
</span><span class="cx">
</span><del>-define( 'BP_PLUGIN_DIR', dirname( dirname( __FILE__ ) ) . '/' );
</del><ins>+require( dirname( __FILE__ ) . '/includes/define-constants.php' );
</ins><span class="cx">
</span><del>-if ( ! defined( 'BP_TESTS_DIR' ) ) {
- define( 'BP_TESTS_DIR', dirname( __FILE__ ) . '/' );
-}
-
-/**
- * In the pre-develop.svn WP development environment, an environmental bash
- * variable would be set to run PHP Unit tests. However, this has been done
- * away with in a post-develop.svn world. We'll still check if this variable
- * is set for backwards compat.
- */
-if ( getenv( 'WP_TESTS_DIR' ) ) {
- define( 'WP_TESTS_DIR', getenv( 'WP_TESTS_DIR' ) );
- define( 'WP_ROOT_DIR', WP_TESTS_DIR );
-} else {
- define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) );
- define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
-}
-
-// Based on the tests directory, look for a config file
-if ( file_exists( WP_ROOT_DIR . '/wp-tests-config.php' ) ) {
- // Standard develop.svn.wordpress.org setup
- define( 'WP_TESTS_CONFIG_PATH', WP_ROOT_DIR . '/wp-tests-config.php' );
-
-} else if ( file_exists( WP_TESTS_DIR . '/wp-tests-config.php' ) ) {
- // Legacy unit-test.svn.wordpress.org setup
- define( 'WP_TESTS_CONFIG_PATH', WP_TESTS_DIR . '/wp-tests-config.php' );
-
-} else if ( file_exists( dirname( dirname( WP_TESTS_DIR ) ) . '/wp-tests-config.php' ) ) {
- // Environment variable exists and points to tests/phpunit of
- // develop.svn.wordpress.org setup
- define( 'WP_TESTS_CONFIG_PATH', dirname( dirname( WP_TESTS_DIR ) ) . '/wp-tests-config.php' );
-
-} else {
- die( "wp-tests-config.php could not be found.\n" );
-}
-
</del><span class="cx"> if ( ! file_exists( WP_TESTS_DIR . '/includes/functions.php' ) ) {
</span><span class="cx"> die( "The WordPress PHPUnit test suite could not be found.\n" );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunktestsincludesdefineconstantsphp"></a>
<div class="addfile"><h4>Added: trunk/tests/includes/define-constants.php (0 => 7665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/includes/define-constants.php (rev 0)
+++ trunk/tests/includes/define-constants.php 2013-12-12 20:48:46 UTC (rev 7665)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<?php
+
+/**
+ * Define constants needed by test suite.
+ */
+
+define( 'BP_PLUGIN_DIR', dirname( dirname( dirname( __FILE__ ) ) ) . '/' );
+
+if ( ! defined( 'BP_TESTS_DIR' ) ) {
+ define( 'BP_TESTS_DIR', dirname( dirname( __FILE__ ) ) . '/' );
+}
+
+/**
+ * In the pre-develop.svn WP development environment, an environmental bash
+ * variable would be set to run PHP Unit tests. However, this has been done
+ * away with in a post-develop.svn world. We'll still check if this variable
+ * is set for backwards compat.
+ */
+if ( getenv( 'WP_TESTS_DIR' ) ) {
+ define( 'WP_TESTS_DIR', getenv( 'WP_TESTS_DIR' ) );
+ define( 'WP_ROOT_DIR', WP_TESTS_DIR );
+} else {
+ define( 'WP_ROOT_DIR', dirname( dirname( dirname( dirname( dirname( dirname( __DIR__ ) ) ) ) ) ) );
+ define( 'WP_TESTS_DIR', WP_ROOT_DIR . '/tests/phpunit' );
+}
+
+// Based on the tests directory, look for a config file
+if ( file_exists( WP_ROOT_DIR . '/wp-tests-config.php' ) ) {
+ // Standard develop.svn.wordpress.org setup
+ define( 'WP_TESTS_CONFIG_PATH', WP_ROOT_DIR . '/wp-tests-config.php' );
+
+} else if ( file_exists( WP_TESTS_DIR . '/wp-tests-config.php' ) ) {
+ // Legacy unit-test.svn.wordpress.org setup
+ define( 'WP_TESTS_CONFIG_PATH', WP_TESTS_DIR . '/wp-tests-config.php' );
+
+} else if ( file_exists( dirname( dirname( WP_TESTS_DIR ) ) . '/wp-tests-config.php' ) ) {
+ // Environment variable exists and points to tests/phpunit of
+ // develop.svn.wordpress.org setup
+ define( 'WP_TESTS_CONFIG_PATH', dirname( dirname( WP_TESTS_DIR ) ) . '/wp-tests-config.php' );
+
+} else {
+ die( "wp-tests-config.php could not be found.\n" );
+}
</ins></span></pre></div>
<a id="trunktestsincludesloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/tests/includes/loader.php (7664 => 7665)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/tests/includes/loader.php 2013-12-12 20:43:28 UTC (rev 7664)
+++ trunk/tests/includes/loader.php 2013-12-12 20:48:46 UTC (rev 7665)
</span><span class="lines">@@ -1,4 +1,7 @@
</span><span class="cx"> <?php
</span><ins>+
+require_once( dirname( __FILE__ ) . '/define-constants.php' );
+
</ins><span class="cx"> $multisite = (int) ( defined( 'WP_TESTS_MULTISITE') && WP_TESTS_MULTISITE );
</span><span class="cx"> system( WP_PHP_BINARY . ' ' . escapeshellarg( dirname( __FILE__ ) . '/install.php' ) . ' ' . escapeshellarg( WP_TESTS_CONFIG_PATH ) . ' ' . escapeshellarg( WP_TESTS_DIR ) . ' ' . $multisite );
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>