SOS-1388
SOS-1388
Test Fixes - portlet/announcements

Conflicts:

	portal-web/test/com/liferay/portalweb/portlet/myaccount/timezone/selecttimezonepacificstandardtime/SelectTimeZonePacificStandardTimeTest.html
	portal-web/test/com/liferay/portalweb/portlet/myaccount/timezone/selecttimezonepacificstandardtime/SelectTimeZonePacificStandardTimeTest.java
	portal-web/test/com/liferay/portalweb/portlet/myaccount/timezone/selecttimezonepacificstandardtime/TearDownTimeZoneTest.html
	portal-web/test/com/liferay/portalweb/portlet/myaccount/timezone/selecttimezonepacificstandardtime/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrycontentnull/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrycontentnull/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrycontentnull/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrycontentnull/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrycontentnull/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrycontentnull/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrygeneral/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrygeneral/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrypriorityimportant/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrypriorityimportant/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrypriorityimportant/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrypriorityimportant/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrypriorityimportant/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentrypriorityimportant/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentryprioritynormal/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentryprioritynormal/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentryprioritynormal/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentryprioritynormal/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentryprioritynormal/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/addannouncementsentryprioritynormal/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/deleteannouncementsentrygeneral/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/editannouncementsentrygeneral/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/MarkAsReadAnnouncementsEntryGeneralTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/MarkAsReadAnnouncementsEntryGeneralTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/hideannouncementsentrygeneral/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/markasreadannouncementsentrygeneral/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/AddAnnouncementsEntryGeneralTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/MarkAsReadAnnouncementsEntryGeneralTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/MarkAsReadAnnouncementsEntryGeneralTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/showannouncementsentrygeneral/TearDownTimeZoneTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/AddAnnouncementsEntryPriorityImportantTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/AddAnnouncementsEntryPriorityImportantTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/AddAnnouncementsEntryPriorityNormalTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/AddAnnouncementsEntryPriorityNormalTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/SelectTimeZonePacificStandardTimeCPMATest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/SelectTimeZonePacificStandardTimeCPMATest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/TearDownAnnouncementsEntryTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/TearDownAnnouncementsEntryTest.java
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/TearDownTimeZoneTest.html
	portal-web/test/functional/com/liferay/portalweb/portlet/announcements/announcementsentry/viewpriorityorder/TearDownTimeZoneTest.java
Test Fixes - portlet/announcements
Test Fixes - portlet/announcements