Peter M. Groen / knowledgetree

Commit 12360146091af599a3df66ce0f075c99735c40d6

Authored by Michael Joseph
1 parent af547f7b

updated tests 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@883 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 20 additions and 83 deletions
tests/subscriptions/subscriptionManager.php
  View file @1236014
... ... @@ -8,11 +8,11 @@ if (checkSession()) {
8 8 $iFolderID = 1;
9 9 $iUserID = 1;
10 10 echo "<ul><li>Testing folder subscription creation with folderID=$iFolderID, userID=$iUserID :";
11   - if ($oSubscriptionManager->createFolderSubscription($iFolderID, $iUserID)) {
  11 + if ($oSubscriptionManager->createSubscription($iUserID, $iFolderID, SubscriptionConstants::subscriptionType("FolderSubscription"))) {
12 12 echo "Passed creating folder subscription</li>";
13 13  
14 14 echo "<li>Testing folder subscription removal with folderID=$iFolderID, userID=$iUserID :";
15   - if ($oSubscriptionManager->removeFolderSubscription($iFolderID, $iUserID)) {
  15 + if ($oSubscriptionManager->removeSubscription($iUserID, $iFolderID, SubscriptionConstants::subscriptionType("FolderSubscription"))) {
16 16 echo "Passed removing folder subscription</li>";
17 17 } else {
18 18 echo "Failed removing folder subscription(" . $_SESSION["errorMessage"] . ")</li>";
... ... @@ -22,14 +22,14 @@ if (checkSession()) {
22 22 }
23 23  
24 24 echo "</ul><b>Testing document subscriptions</b><br>";
25   - $iDocumentID = 2;
  25 + $iDocumentID = 6;
26 26 $iUserID = 1;
27 27 echo "<ul><li>Testing document subscription creation with documentID=$iDocumentID, userID=$iUserID :";
28   - if ($oSubscriptionManager->createDocumentSubscription($iDocumentID, $iUserID)) {
  28 + if ($oSubscriptionManager->createSubscription($iUserID, $iDocumentID, SubscriptionConstants::subscriptionType("DocumentSubscription"))) {
29 29 echo "Passed creating document subscription</li>";
30 30  
31 31 echo "<li>Testing document subscription removal with documentID=$iDocumentID, userID=$iUserID :";
32   - if ($oSubscriptionManager->removeDocumentSubscription($iDocumentID, $iUserID)) {
  32 + if ($oSubscriptionManager->removeSubscription($iUserID, $iDocumentID, SubscriptionConstants::subscriptionType("DocumentSubscription"))) {
33 33 echo "Passed removing document subscription</li>";
34 34 } else {
35 35 echo "Failed removing document subscription(" . $_SESSION["errorMessage"] . ")</li>";
... ... @@ -42,110 +42,47 @@ if (checkSession()) {
42 42 // first create some subscriptions
43 43 $iUserID = 10;
44 44 echo "<ul><li>Creating folder subscriptions<ul>";
45   - for ($i = 1; $i<=5; $i++) {
  45 + for ($tmpFolderID = 1; $tmpFolderID<=5; $tmpFolderID++) {
46 46  
47   - if ($oSubscriptionManager->createFolderSubscription($i, $iUserID)) {
48   - echo "<li>created folder subscription folderID=$i for userID=$iUserID</li>";
  47 + if ($oSubscriptionManager->createSubscription($iUserID, $tmpFolderID, SubscriptionConstants::subscriptionType("FolderSubscription"))) {
  48 + echo "<li>created folder subscription folderID=$tmpFolderID for userID=$iUserID</li>";
49 49 } else {
50   - echo "<li>folder subscription creation failed(" . $_SESSION["errorMessage"] . "): folderID=$i for userID=$iUserID</li>";
  50 + echo "<li>folder subscription creation failed(" . $_SESSION["errorMessage"] . "): folderID=$tmpFolderID for userID=$iUserID</li>";
51 51 }
52 52 }
53 53 echo "</li></ul>";
54 54 echo "<li>Creating document subscriptions<ul>";
55   - for ($i = 5; $i>0; $i--) {
56   - if ($oSubscriptionManager->createDocumentSubscription($i, $iUserID)) {
57   - echo "<li>created document subscription documentID=$i for userID=$iUserID</li>";
  55 + for ($tmpDocumentID = 5; $tmpDocumentID>0; $tmpDocumentID--) {
  56 + if ($oSubscriptionManager->createSubscription($iUserID, $tmpDocumentID, SubscriptionConstants::subscriptionType("DocumentSubscription"))) {
  57 + echo "<li>created document subscription documentID=$tmpDocumentID for userID=$iUserID</li>";
58 58 } else {
59   - echo "<li>document subscription creation failed(" . $_SESSION["errorMessage"] . "): documentID=$i for userID=$iUserID</li>";
  59 + echo "<li>document subscription creation failed(" . $_SESSION["errorMessage"] . "): documentID=$tmpDocumentID for userID=$iUserID</li>";
60 60 }
61 61 }
62 62 echo "</li></ul>";
63 63  
64 64 // now try to retrieve them
65 65 echo "<li>folder subscriptions for userID=$iUserID:";
66   - $aFolders = $oSubscriptionManager->retrieveFolderSubscriptions($iUserID);
  66 + $aFolders = $oSubscriptionManager->retrieveSubscriptions($iUserID, SubscriptionConstants::subscriptionType("FolderSubscription"));
67 67 echo "<pre>" . arrayToString($aFolders) . "</pre></li>";
68 68  
69 69 echo "<li>document subscriptions for userID=$iUserID:";
70   - $aDocuments = $oSubscriptionManager->retrieveDocumentSubscriptions($iUserID);
  70 + $aDocuments = $oSubscriptionManager->retrieveSubscriptions($iUserID, SubscriptionConstants::subscriptionType("DocumentSubscription"));
71 71 echo "<pre>" . arrayToString($aDocuments) . "</pre></li>";
72 72  
73 73 // now try retrieving both
74 74 echo "<li>all subscriptions for userID=$iUserID:";
75   - $oResults = $oSubscriptionManager->retrieveSubscriptions($iUserID);
  75 + $oResults = $oSubscriptionManager->listSubscriptions($iUserID);
76 76 echo "<pre>" . arrayToString($oResults) . "</pre></li>";
77 77 echo "</ul>";
78 78  
79   - // test subscribers retrieval methods
80   - echo "<b>Testing subscriber retrieval</b><br>";
81   - // add some subscriptions
82   - $iDocumentID = 4;
83   - $iFolderID = 20;
84   - for ($i = 5; $i>0; $i--) {
85   - if ($oSubscriptionManager->createFolderSubscription($iFolderID, $i)) {
86   - echo "<li>created folder subscription folderID=$iFolderID for userID=$i</li>";
87   - } else {
88   - echo "<li>folder creation failed(" . $_SESSION["errorMessage"] . "): folderID=$iFolderID for userID=$i</li>";
89   - }
90   - if ($oSubscriptionManager->createDocumentSubscription($iDocumentID, $i)) {
91   - echo "<li>created document subscription documentID=$iDocumentID for userID=$i</li>";
92   - } else {
93   - echo "<li>document creation failed(" . $_SESSION["errorMessage"] . "): documentID=$iDocumentID for userID=$i</li>";
94   - }
95   - }
96   -
97   - $aFolderSubscribers = $oSubscriptionManager->retrieveFolderSubscribers($iFolderID);
98   - $aDocumentSubscribers = $oSubscriptionManager->retrieveDocumentSubscribers($iDocumentID);
99   - echo "Subscribers for folderID=$iFolderID:";
100   - echo "<pre>" . arrayToString($aFolderSubscribers) . "</pre>";
101   - echo "Subscribers for documentID=$iDocumentID:";
102   - echo "<pre>" . arrayToString($aDocumentSubscribers) . "</pre>";
103   -
104   - echo "<pre>";
105   -
106   - echo "<b>Testing subscription firing</b>";
107   - // test subscription firing
108   - require_once("../../phpSniff/phpTimer.class.php");
109   - $timer = new phpTimer();
110   - $timer->start('subscriptionFiring');
111   -
112   - $timer->start('onAddFolder');
113   - $oSubscriptionManager->onAddFolder($iFolderID, "newFolder-onAddFolder");
114   - $timer->stop('onAddFolder');
115   - echo "<ul><li>onAddFolder: " . $timer->get_current('onAddFolder') . "</li>";
116   -
117   - $timer->start('onRemoveFolder');
118   - $oSubscriptionManager->onRemoveFolder($iFolderID, "removeFolder");
119   - $timer->stop('onRemoveFolder');
120   - echo "<li>onRemoveFolder: " . $timer->get_current('onRemoveFolder') . "</li>";
121   -
122   - $timer->start('onAddDocument');
123   - $oSubscriptionManager->onAddDocument($iFolderID, "addDocumentName");
124   - $timer->stop('onAddDocument');
125   - echo "<li>onAddDocument: " . $timer->get_current('onAddDocument') . "</li>";
126   -
127   - $timer->start('onRemoveDocument');
128   - $oSubscriptionManager->onRemoveDocument($iFolderID, "removeDocumentName");
129   - $timer->stop('onRemoveDocument');
130   - echo "<li>onRemoveDocument: " . $timer->get_current('onRemoveDocument') . "</li>";
131   -
132   - $timer->start('onModifyDocument');
133   - $oSubscriptionManager->onModifyDocument($iDocumentID);
134   - $timer->stop('onModifyDocument');
135   - echo "<li>onModifyDocument: " . $timer->get_current('onModifyDocument') . "</li>";
136   -
137   - $timer->stop('subscriptionFiring');
138   -
139   - echo "</ul>all subscription firing: " . $timer->get_current('subscriptionFiring');
140   - echo "</pre>";
141   -
142 79 // cleanup silently
143 80 for ($i = 1; $i<=5; $i++) {
144   - $oSubscriptionManager->removeFolderSubscription($i, $iUserID);
145   - $oSubscriptionManager->removeDocumentSubscription($i, $iUserID);
  81 + $oSubscriptionManager->removeSubscription($iUserID, $i, SubscriptionConstants::subscriptionType("FolderSubscription"));
  82 + $oSubscriptionManager->removeSubscription($iUserID, $i, SubscriptionConstants::subscriptionType("DocumentSubscription"));
146 83  
147   - $oSubscriptionManager->removeFolderSubscription($iFolderID, $i);
148   - $oSubscriptionManager->removeDocumentSubscription($iDocumentID, $i);
  84 + $oSubscriptionManager->removeSubscription($i, $iFolderID,SubscriptionConstants::subscriptionType("FolderSubscription") );
  85 + $oSubscriptionManager->removeSubscription($i, $iDocumentID, SubscriptionConstants::subscriptionType("DocumentSubscription"));
149 86 }
150 87 }
151 88 ?>
... ...