From d8fda53e44feda23ce123feedcdd9c60de214fb0 Mon Sep 17 00:00:00 2001
From: hlm7 <hlm7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 2 Dec 2011 19:00:58 +0000
Subject: [PATCH] More test changes by Holly...

---
 .../AddNonPersonThings/CheckIndexView.html    | 10 -----
 .../AddNonPersonThings/CreateActivity.html    | 41 +++++++++++++++----
 .../AddNonPersonThings/CreateCourse.html      |  2 +-
 .../AddNonPersonThings/CreateEvent.html       | 15 -------
 .../VerifyAllThingsSearchable.html            |  5 ---
 5 files changed, 34 insertions(+), 39 deletions(-)

diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
index 391833f5..ee0c3bc0 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CheckIndexView.html
@@ -204,11 +204,6 @@
 	<td>Proceedings (1)</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyTextPresent</td>
-	<td>Subject Area (4)</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Webpage (1)</td>
@@ -339,11 +334,6 @@
 	<td>link=Proceedings</td>
 	<td></td>
 </tr>
-<tr>
-	<td>verifyElementPresent</td>
-	<td>link=Subject Area</td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyElementPresent</td>
 	<td>link=Webpage</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
index 735c58a1..017077a9 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateActivity.html
@@ -591,12 +591,27 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Select an existing Subject Area for Primate Elderly Care</td>
+	<td>Manage Concepts</td>
+	<td></td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=showAddFormButton</td>
+	<td></td>
+</tr>
+<tr>
+	<td>type</td>
+	<td>id=searchTerm</td>
+	<td>Elderly Care</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=searchButton</td>
 	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>//input[@id='submit' and @value='Add a new item of this type']</td>
+	<td>link=exact:Can't find the concept you want? Create your own.</td>
 	<td></td>
 </tr>
 <tr>
@@ -605,18 +620,28 @@
 	<td></td>
 </tr>
 <tr>
-	<td>verifyTextPresent</td>
-	<td>Edit &quot;subject area&quot; entry for Primate Elderly Care</td>
+	<td>type</td>
+	<td>id=relatedIndLabel</td>
+	<td>Elder</td>
+</tr>
+<tr>
+	<td>click</td>
+	<td>id=ui-active-menuitem</td>
 	<td></td>
 </tr>
 <tr>
-	<td>type</td>
-	<td>name</td>
-	<td>Elderly Care</td>
+	<td>clickAndWait</td>
+	<td>id=submit</td>
+	<td></td>
+</tr>
+<tr>
+	<td>assertTitle</td>
+	<td>Edit</td>
+	<td></td>
 </tr>
 <tr>
 	<td>clickAndWait</td>
-	<td>submit</td>
+	<td>link=Return to Profile Page</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
index 8061690b..e54cbac5 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateCourse.html
@@ -406,7 +406,7 @@
 </tr>
 <tr>
 	<td>verifyTextPresent</td>
-	<td>Create date time interval for Introduction to Primate Health</td>
+	<td>Create date time value for Introduction to Primate Health</td>
 	<td></td>
 </tr>
 <tr>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
index 3b3b5cb6..7cc5cf72 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/CreateEvent.html
@@ -514,21 +514,6 @@
 	<td>Primate Health Conference</td>
 	<td></td>
 </tr>
-<tr>
-	<td>clickAndWait</td>
-	<td>css=a.delete-hasSubjectArea &gt; img.delete-individual</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>VIVO</td>
-	<td></td>
-</tr>
-<tr>
-	<td>assertTitle</td>
-	<td>Primate Health Conference</td>
-	<td></td>
-</tr>
 <tr>
 	<td>clickAndWait</td>
 	<td>css=a.add-hasSubjectArea &gt; img.add-individual</td>
diff --git a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
index 3252272d..3cc957e8 100644
--- a/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
+++ b/utilities/acceptance-tests/suites/AddNonPersonThings/VerifyAllThingsSearchable.html
@@ -274,11 +274,6 @@
 	<td>Kenya Country</td>
 	<td></td>
 </tr>
-<tr>
-	<td></td>
-	<td></td>
-	<td></td>
-</tr>
 <tr>
 	<td>verifyTextPresent</td>
 	<td>Primate Elderly Care Grant</td>