From 91df73d6d48f3f17897734d69e4f81060212770b Mon Sep 17 00:00:00 2001
From: Lars Toomre <ltoomre@23809.no-reply.drupal.org>
Date: Tue, 16 Oct 2012 11:51:28 -0400
Subject: [PATCH] Issue 1814402 by Lars Toomre: Convert
 'node_access_test_private' variable to state() system.

---
 .../file/lib/Drupal/file/Tests/FilePrivateTest.php |    8 ++++++--
 .../lib/Drupal/forum/Tests/ForumNodeAccessTest.php |    6 +++++-
 .../Drupal/node/Tests/NodeAccessBaseTableTest.php  |    6 +++++-
 .../node_access_test/node_access_test.module       |    4 ++--
 .../Drupal/tracker/Tests/TrackerNodeAccessTest.php |    5 ++++-
 5 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php b/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
index 2febd5f..58ba5c1 100644
--- a/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
+++ b/core/modules/file/lib/Drupal/file/Tests/FilePrivateTest.php
@@ -27,10 +27,14 @@ public static function getInfo() {
     );
   }
 
-  function setUp() {
+  public function setUp() {
     parent::setUp();
     node_access_rebuild();
-    variable_set('node_access_test_private', TRUE);
+    state()->set('node_access_test.private', TRUE);
+  }
+
+  public function tearDown() {
+    state()->delete('node_access_test.private');
   }
 
   /**
diff --git a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php b/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php
index 5ad396a..100c302 100644
--- a/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php
+++ b/core/modules/forum/lib/Drupal/forum/Tests/ForumNodeAccessTest.php
@@ -36,7 +36,11 @@ public static function getInfo() {
   function setUp() {
     parent::setUp();
     node_access_rebuild();
-    variable_set('node_access_test_private', TRUE);
+    state()->set('node_access_test.private', TRUE);
+  }
+
+  public function tearDown() {
+    state()->delete('node_access_test.private');
   }
 
   /**
diff --git a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php b/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
index a8e36b2..2f31908 100644
--- a/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
+++ b/core/modules/node/lib/Drupal/node/Tests/NodeAccessBaseTableTest.php
@@ -37,7 +37,11 @@ public function setUp() {
     parent::setUp();
 
     node_access_rebuild();
-    variable_set('node_access_test_private', TRUE);
+    state()->set('node_access_test.private', TRUE);
+  }
+
+  public function tearDown() {
+    state()->delete('node_access_test.private');
   }
 
   /**
diff --git a/core/modules/node/tests/modules/node_access_test/node_access_test.module b/core/modules/node/tests/modules/node_access_test/node_access_test.module
index a503217..be18567 100644
--- a/core/modules/node/tests/modules/node_access_test/node_access_test.module
+++ b/core/modules/node/tests/modules/node_access_test/node_access_test.module
@@ -33,7 +33,7 @@ function node_access_test_node_grants($account, $op) {
 function node_access_test_node_access_records(Node $node) {
   $grants = array();
   // For NodeAccessBaseTableTestCase, only set records for private nodes.
-  if (!variable_get('node_access_test_private') || $node->private) {
+  if (!state()->get('node_access_test.private') || $node->private) {
     $grants[] = array(
       'realm' => 'node_access_test',
       'gid' => 8888,
@@ -179,7 +179,7 @@ function node_access_entity_test_page() {
  */
 function node_access_test_form_node_form_alter(&$form, $form_state) {
   // Only show this checkbox for NodeAccessBaseTableTestCase.
-  if (variable_get('node_access_test_private')) {
+  if (state()->get('node_access_test.private')) {
     $node = $form_state['controller']->getEntity($form_state);
     $form['private'] = array(
       '#type' => 'checkbox',
diff --git a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
index 3a5efda..8c488d9 100644
--- a/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
+++ b/core/modules/tracker/lib/Drupal/tracker/Tests/TrackerNodeAccessTest.php
@@ -35,9 +35,12 @@ public static function getInfo() {
   public function setUp() {
     parent::setUp();
     node_access_rebuild();
-    variable_set('node_access_test_private', TRUE);
+    state()->set('node_access_test.private', TRUE);
   }
 
+  public function tearDown() {
+    state()->delete('node_access_test.private');
+  }
 
   /**
    * Ensure private node on /tracker is only visible to users with permission.
-- 
1.7.6.msysgit.0