Fixed Project Generation

deedy · epriestley · commit 0ca15f1f3b9c · 2013-05-03T08:13:58.000-07:00
Summary: Ref T2903 Test Plan: Projects still generating with @epriestley's recommendations Reviewers: epriestley, AnhNhan Reviewed By: AnhNhan CC: aran, Korvin, AnhNhan Maniphest Tasks: T2903 Differential Revision: https://secure.phabricator.com/D5800
diff --git a/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php b/src/applications/lipsum/generator/PhabricatorTestDataGenerator.php
@@ -16,4 +16,13 @@ public function loadOneRandom($classname) {
     }
   }
 
+
+  public function loadPhabrictorUserPHID() {
+    return $this->loadOneRandom("PhabricatorUser")->getPHID();
+  }
+
+  public function loadPhabrictorUser() {
+    return $this->loadOneRandom("PhabricatorUser");
+  }
+
 }
diff --git a/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php b/src/applications/maniphest/lipsum/PhabricatorManiphestTaskTestDataGenerator.php
@@ -4,7 +4,7 @@ final class PhabricatorManiphestTaskTestDataGenerator
   extends PhabricatorTestDataGenerator {
 
   public function generate() {
-    $authorPHID = $this->loadAuthorPHID();
+    $authorPHID = $this->loadPhabrictorUserPHID();
     $author = id(new PhabricatorUser())
           ->loadOneWhere('phid = %s', $authorPHID);
     $task = id(new ManiphestTask())
@@ -77,14 +77,6 @@ public function getProjectPHIDs() {
     return $projects;
   }
 
-  private function loadPhabrictorUserPHID() {
-    return $this->loadOneRandom("PhabricatorUser")->getPHID();
-  }
-
-  public function loadAuthorPHID() {
-    return $this->loadPhabrictorUserPHID();
-  }
-
   public function loadOwnerPHID() {
     if (rand(0, 3) == 0) {
       return null;
diff --git a/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php b/src/applications/paste/lipsum/PhabricatorPasteTestDataGenerator.php
@@ -9,7 +9,7 @@ final class PhabricatorPasteTestDataGenerator
     "PHP" => "php");
 
   public function generate() {
-    $authorphid = $this->loadAuthorPHID();
+    $authorphid = $this->loadPhabrictorUserPHID();
     $language = $this->generateLanguage();
     $content = $this->generateContent($language);
     $title = $this->generateTitle($language);
@@ -45,14 +45,6 @@ private function loadPhabrictorPastePHID() {
     return null;
   }
 
-  private function loadPhabrictorUserPHID() {
-    return id($this->loadOneRandom("PhabricatorUser"))->getPHID();
-  }
-
-  public function loadAuthorPHID() {
-    return $this->loadPhabrictorUserPHID();
-  }
-
   public function generateTitle($language = null) {
     $taskgen = new PhutilLipsumContextFreeGrammar();
     // Remove Punctuation
diff --git a/src/applications/project/lipsum/PhabricatorProjectTestDataGenerator.php b/src/applications/project/lipsum/PhabricatorProjectTestDataGenerator.php
@@ -7,17 +7,18 @@ final class PhabricatorProjectTestDataGenerator
 
   public function generate() {
     $title = $this->generateTitle();
-    $author = $this->loadAuthorPHID();
+    $author = $this->loadPhabrictorUser();
+    $authorPHID = $author->getPHID();
     $project = id(new PhabricatorProject())
       ->setName($title)
-      ->setAuthorPHID($author);
+      ->setAuthorPHID($authorPHID);
 
     $this->addTransaction(
       PhabricatorProjectTransactionType::TYPE_NAME,
       $title);
     $this->addTransaction(
       PhabricatorProjectTransactionType::TYPE_MEMBERS,
-      $this->loadMembersWithAuthor($author));
+      $this->loadMembersWithAuthor($authorPHID));
     $this->addTransaction(
       PhabricatorProjectTransactionType::TYPE_STATUS,
       $this->generateProjectStatus());
@@ -32,8 +33,7 @@ public function generate() {
       PhabricatorPolicies::POLICY_PUBLIC);
 
     $editor = id(new PhabricatorProjectEditor($project))
-      ->setActor(id(new PhabricatorUser())
-          ->loadOneWhere('phid = %s', $author))
+      ->setActor($author)
       ->applyTransactions($this->xactions);
 
     $profile = id(new PhabricatorProjectProfile())
@@ -50,13 +50,6 @@ private function addTransaction($type, $value) {
       ->setNewValue($value);
   }
 
-  private function loadPhabrictorUserPHID() {
-    return $this->loadOneRandom("PhabricatorUser")->getPHID();
-  }
-
-  public function loadAuthorPHID() {
-    return $this->loadPhabrictorUserPHID();
-  }
 
   public function loadMembersWithAuthor($author) {
     $members = array($author);

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,13 @@ public function loadOneRandom($classname) {`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
	`19`	`+`
	`20`	`+ public function loadPhabrictorUserPHID() {`
	`21`	`+ return $this->loadOneRandom("PhabricatorUser")->getPHID();`
	`22`	`+ }`
	`23`	`+`
	`24`	`+ public function loadPhabrictorUser() {`
	`25`	`+ return $this->loadOneRandom("PhabricatorUser");`
	`26`	`+ }`
	`27`	`+`
`19`	`28`	`}`