diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/pagecommands/PageCommandMinistryConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/pagecommands/PageCommandMinistryConstants.java index 4428a84670..8563fa55b8 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/pagecommands/PageCommandMinistryConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/common/menufactory/api/pagecommands/PageCommandMinistryConstants.java @@ -1,7 +1,6 @@ package com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.pagecommands; import com.hack23.cia.web.impl.ui.application.views.common.pagelinks.api.PageModeMenuCommand; -import com.hack23.cia.web.impl.ui.application.views.common.viewnames.ChartIndicators; import com.hack23.cia.web.impl.ui.application.views.common.viewnames.MinistryPageMode; import com.hack23.cia.web.impl.ui.application.views.common.viewnames.PageMode; import com.hack23.cia.web.impl.ui.application.views.common.viewnames.UserViews; @@ -11,10 +10,6 @@ */ public interface PageCommandMinistryConstants { - /** The ministry command charts all by headcount. */ - PageModeMenuCommand MINISTRY_COMMAND_CHARTS_ALL_BY_HEADCOUNT = new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, - PageMode.CHARTS, ChartIndicators.ALLMINISTRIESBYHEADCOUNT.toString()); - /** The ministry command pagevisithistory. */ PageModeMenuCommand MINISTRY_COMMAND_PAGEVISITHISTORY = new PageModeMenuCommand(UserViews.MINISTRY_VIEW_NAME, PageMode.PAGEVISITHISTORY); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java index d09eb934ab..11e36cecb1 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/committee/pagemode/CommitteeActionConstants.java @@ -11,7 +11,7 @@ public interface CommitteeActionConstants { /** The dd title header. */ // Decision Data - String DD_TITLE_HEADER = "Daily Committee Decisions "; + String DD_TITLE_HEADER = "Daily Committee Decisions"; /** The dd title. */ String DD_TITLE = "Summary of Decision Types"; @@ -31,7 +31,7 @@ public interface CommitteeActionConstants { /** The bd title header. */ // Ballot Decision - String BD_TITLE_HEADER = "Committee Ballot Decision Summary "; + String BD_TITLE_HEADER = "Committee Ballot Decision Summary"; /** The bd title. */ String BD_TITLE = "Ballot Decision Summary"; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java index 29fb350fbb..4249d7b913 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesHeadcountModContentFactoryImpl.java @@ -37,7 +37,8 @@ * The Class MinistryGovernmentBodiesHeadcountModContentFactoryImpl. */ @Component -public final class MinistryGovernmentBodiesHeadcountModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { +public final class MinistryGovernmentBodiesHeadcountModContentFactoryImpl + extends AbstractMinistryPageModContentFactoryImpl { /** The government body chart data manager. */ @Autowired @@ -61,7 +62,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters); getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, "Ministry Government Bodies Headcount " + viewRiksdagenMinistry.getNameId(), "Government Bodies Headcount", "Provides detailed headcount data for government bodies under ministries."); + CardInfoRowUtil.createPageHeader(panel, panelContent, + MinistryViewConstants.HEADCOUNT_TITLE + viewRiksdagenMinistry.getNameId(), + MinistryViewConstants.HEADCOUNT_SUBTITLE, MinistryViewConstants.HEADCOUNT_DESC); governmentBodyChartDataManager.createMinistryGovernmentBodyHeadcountSummaryChart(panelContent, viewRiksdagenMinistry.getNameId()); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java index 30fe1e5a29..196a348b46 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryGovernmentBodiesIncomeModContentFactoryImpl.java @@ -61,7 +61,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters); getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, "Government Bodies Income " + viewRiksdagenMinistry.getNameId(), "Government Bodies Income", "Provides detailed income data for government bodies under ministries."); + CardInfoRowUtil.createPageHeader(panel, panelContent, MinistryViewConstants.INCOME_TITLE + viewRiksdagenMinistry.getNameId(), MinistryViewConstants.INCOME_SUBTITLE, MinistryViewConstants.INCOME_DESC); governmentBodyChartDataManager.createMinistryGovernmentBodyIncomeSummaryChart(panelContent, viewRiksdagenMinistry.getNameId()); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageVisitHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageVisitHistoryPageModContentFactoryImpl.java index 2297ca51aa..44b11c665e 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageVisitHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryPageVisitHistoryPageModContentFactoryImpl.java @@ -38,8 +38,7 @@ public final class MinistryPageVisitHistoryPageModContentFactoryImpl extends AbstractMinistryPageModContentFactoryImpl { /** - * Instantiates a new ministry page visit history page mod content factory - * impl. + * Instantiates a new ministry page visit history page mod content factory impl. */ public MinistryPageVisitHistoryPageModContentFactoryImpl() { super(); @@ -55,7 +54,9 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenMinistry viewRiksdagenMinistry = getItem(parameters); getMinistryMenuItemFactory().createMinistryMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, "Ministry Page Visit History " + viewRiksdagenMinistry.getNameId(), "Page Visit History", "Tracks and visualizes the history of page visits for ministries."); + CardInfoRowUtil.createPageHeader(panel, panelContent, + MinistryViewConstants.PAGEVISIT_TITLE + viewRiksdagenMinistry.getNameId(), + MinistryViewConstants.PAGEVISIT_SUBTITLE, MinistryViewConstants.PAGEVISIT_DESC); createPageVisitHistory(NAME, pageId, panelContent); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java index d7e568ffad..d5dde67993 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/goverment/pagemode/MinistryViewConstants.java @@ -29,7 +29,7 @@ public interface MinistryViewConstants extends String EXPENDITURE_TITLE = "Expenditure Analysis"; /** The ministry service stats title. */ - String MINISTRY_SERVICE_STATS_TITLE = "Ministry Service Statistics"; + String MINISTRY_SERVICE_STATS_TITLE = "Government Bodies Income "; /** The ministry document stats title. */ String MINISTRY_DOCUMENT_STATS_TITLE = "Document Statistics"; @@ -128,4 +128,8 @@ public interface MinistryViewConstants extends /** The ministry government bills label. */ String MINISTRY_GOVERNMENT_BILLS_LABEL = "Government Bills:"; + + String INCOME_TITLE = "Government Bodies Income "; + + String HEADCOUNT_TITLE = "Ministry Government Bodies Headcount "; } diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentActivityPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentActivityPageModContentFactoryImpl.java index 203f424c85..39a8842f23 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentActivityPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentActivityPageModContentFactoryImpl.java @@ -55,11 +55,11 @@ public PartyDocumentActivityPageModContentFactoryImpl() { public Layout createContent(final String parameters, final MenuBar menuBar, final Panel panel) { final VerticalLayout panelContent = createPanelContent(); final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters); - + getPartyMenuItemFactory().createPartyMenuBar(menuBar, getPageId(parameters)); CardInfoRowUtil.createPageHeader(panel, panelContent, - PartyViewConstants.DOCUMENT_ACTIVITY_HEADER + " " + viewRiksdagenParty.getPartyName(), + PartyViewConstants.DOCUMENT_ACTIVITY_HEADER + viewRiksdagenParty.getPartyName(), PartyViewConstants.DOCUMENT_ACTIVITY_SUBTITLE, PartyViewConstants.DOCUMENT_ACTIVITY_DESC); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java index 79351b840e..dd9fb81feb 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyDocumentHistoryPageModContentFactoryImpl.java @@ -71,7 +71,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final VerticalLayout panelContent = createPanelContent(); final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters); final String pageId = getPageId(parameters); - + getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId); CardInfoRowUtil.createPageHeader(panel, panelContent, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java index 3c3491b2d4..8f084d9b08 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyLeaderHistoryPageModContentFactoryImpl.java @@ -72,7 +72,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters); getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, "Leader History " + viewRiksdagenParty.getPartyName(), "Party Leaders", "Explore the history of party leaders and their roles."); + CardInfoRowUtil.createPageHeader(panel, panelContent, PartyViewConstants.LEADER_HISTORY_HEADER + viewRiksdagenParty.getPartyName(), PartyViewConstants.LEADER_HISTORY_TITLE , PartyViewConstants.LEADER_HISTORY_DESC); final DataContainer partyRoleMemberDataContainer = getApplicationManager() .getDataContainer(ViewRiksdagenPartyRoleMember.class); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyMemberHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyMemberHistoryPageModContentFactoryImpl.java index d4d91cc96b..79264bf881 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyMemberHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyMemberHistoryPageModContentFactoryImpl.java @@ -59,8 +59,6 @@ public final class PartyMemberHistoryPageModContentFactoryImpl extends AbstractP /** The Constant POLITICIANS. */ private static final String POLITICIANS = "Politicians"; - private static final String MEMBER_HISTORY = PartyViewConstants.GRID_LABEL_MEMBER_HISTORY; - /** * Instantiates a new party member history page mod content factory impl. */ diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyPageVisitHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyPageVisitHistoryPageModContentFactoryImpl.java index 63c83d6043..6c95291454 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyPageVisitHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyPageVisitHistoryPageModContentFactoryImpl.java @@ -50,7 +50,7 @@ public PartyPageVisitHistoryPageModContentFactoryImpl() { public Layout createContent(final String parameters, final MenuBar menuBar, final Panel panel) { final VerticalLayout panelContent = createPanelContent(); final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters); - + getPartyMenuItemFactory().createPartyMenuBar(menuBar, getPageId(parameters)); CardInfoRowUtil.createPageHeader(panel, panelContent, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java index 6fa14fe7d7..6bed88e617 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyRoleGhantPageModContentFactoryImpl.java @@ -69,7 +69,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId); CardInfoRowUtil.createPageHeader(panel, panelContent, - PartyViewConstants.ROLE_GHANT_HEADER + " " + viewRiksdagenParty.getPartyName(), + PartyViewConstants.ROLE_GHANT_HEADER + viewRiksdagenParty.getPartyName(), PartyViewConstants.ROLE_GHANT_TITLE, PartyViewConstants.ROLE_GHANT_DESC); CardInfoRowUtil.createPageHeader(panel, panelContent, viewRiksdagenParty.getPartyName(), viewRiksdagenParty.getPartyId(), ROLE_GHANT); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartySupportAnnualSummaryChartPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartySupportAnnualSummaryChartPageModContentFactoryImpl.java index 649bb4b3c9..c5a854b8ff 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartySupportAnnualSummaryChartPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartySupportAnnualSummaryChartPageModContentFactoryImpl.java @@ -22,7 +22,6 @@ import org.springframework.security.access.annotation.Secured; import org.springframework.stereotype.Component; -import com.hack23.cia.model.internal.application.data.party.impl.ViewRiksdagenParty; import com.hack23.cia.model.internal.application.system.impl.ApplicationEventGroup; import com.hack23.cia.web.impl.ui.application.action.ViewAction; import com.hack23.cia.web.impl.ui.application.views.common.chartfactory.api.PartySupportsChartDataManager; @@ -58,11 +57,10 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina final String pageId = getPageId(parameters); - final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters); getPartyMenuItemFactory().createPartyMenuBar(menuBar, pageId); CardInfoRowUtil.createPageHeader(panel, panelContent, PartyViewConstants.SUPPORT_SUMMARY_HEADER, - PartyViewConstants.SUPPORT_SUMMARY_TITLE, + PartyViewConstants.SUPPORT_SUMMARY_TITLE, PartyViewConstants.SUPPORT_SUMMARY_DESC); chartDataManager.createPartyChart(panelContent,pageId); diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyViewConstants.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyViewConstants.java index ea8bb27bab..04ba305dd1 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyViewConstants.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyViewConstants.java @@ -92,7 +92,7 @@ public interface PartyViewConstants { // Grid Labels String GRID_LABEL_CURRENT_LEADERS = "Current Leaders"; - String GRID_LABEL_COMMITTEE_BALLOT_SUMMARY = "Committee Ballot Decision Party Summary"; + String GRID_LABEL_COMMITTEE_BALLOT_SUMMARY = "Committee Ballot Decision Party Summary"; String GRID_LABEL_ROLE_CHART = "Role chart"; String GRID_LABEL_DOCUMENT_HISTORY = "Member Document history"; String GRID_LABEL_CURRENT_POLITICIANS = "Politicians"; @@ -117,7 +117,7 @@ public interface PartyViewConstants { String DOCUMENT_HISTORY_SUBTITLE = "Historical Documents"; String ROLES_SUBTITLE = "Committee and Government Role Details"; - // View Subtitles + // View Subtitles String VOTE_HISTORY_SUBTITLE = "Historical Voting Records"; String CURRENT_MEMBER_SUBTITLE = "Active Party Members"; String LEADER_HISTORY_SUBTITLE = "Historical Leadership"; @@ -127,7 +127,7 @@ public interface PartyViewConstants { String VISIT_HISTORY_SUBTITLE = "Page Visit Analysis"; String GENERAL_SUBTITLE = "Party Information"; String ACTIVITY_SUBTITLE = "Activity Summary"; - + // Chart Labels String CHART_SUPPORT_LABEL = "Party Support Trends"; String CHART_VOTES_LABEL = "Voting Patterns"; diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyWonDailySummaryChartPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyWonDailySummaryChartPageModContentFactoryImpl.java index c4b3a170a7..9ef9184756 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyWonDailySummaryChartPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/party/pagemode/PartyWonDailySummaryChartPageModContentFactoryImpl.java @@ -56,7 +56,7 @@ public PartyWonDailySummaryChartPageModContentFactoryImpl() { public Layout createContent(final String parameters, final MenuBar menuBar, final Panel panel) { final VerticalLayout panelContent = createPanelContent(); final ViewRiksdagenParty viewRiksdagenParty = getItem(parameters); - + getPartyMenuItemFactory().createPartyMenuBar(menuBar, getPageId(parameters)); CardInfoRowUtil.createPageHeader(panel, panelContent, diff --git a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java index 5cbd67f12f..ef6be46831 100644 --- a/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java +++ b/citizen-intelligence-agency/src/main/java/com/hack23/cia/web/impl/ui/application/views/user/politician/pagemode/PoliticianVisitHistoryPageModContentFactoryImpl.java @@ -36,7 +36,7 @@ public Layout createContent(final String parameters, final MenuBar menuBar, fina getPoliticianMenuItemFactory().createPoliticianMenuBar(menuBar, pageId); - CardInfoRowUtil.createPageHeader(panel, panelContent, + CardInfoRowUtil.createPageHeader(panel, panelContent,PoliticianPageTitleConstants.PAGEVISIT_TITLE + PoliticianTitleFormatter.formatTitle(viewRiksdagenPolitician), PoliticianDescriptionConstants.VISIT_TRENDS_TITLE, PoliticianDescriptionConstants.VISIT_HISTORY_DESC); diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/committee/UserCommitteeTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/committee/UserCommitteeTest.java index c31a2c0186..54c30ad1f2 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/committee/UserCommitteeTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/committee/UserCommitteeTest.java @@ -7,6 +7,7 @@ import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.pagecommands.PageCommandCommitteeConstants; import com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode.CommitteePageTitleConstants; +import com.hack23.cia.web.impl.ui.application.views.user.committee.pagemode.CommitteeViewConstants; /** * The Class UserBallotTest. @@ -14,121 +15,121 @@ @Category(IntegrationTest.class) public final class UserCommitteeTest extends AbstractUITest { - /** The committee id. */ - private static final String COMMITTEE_ID = "JuU"; - - /** - * Verify committee overview page. - * - * @throws Exception the exception - */ - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeOverviewPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_OVERVIEW.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.OV_TITLE_HEADER, - CommitteePageTitleConstants.OV_TITLE); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_OVERVIEW.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeDocumentHistoryPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_HISTORY.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.DH_TITLE_HEADER, - CommitteePageTitleConstants.DH_TITLE, - CommitteePageTitleConstants.DH_DESCRIPTION); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_HISTORY.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeDocumentActivityPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_ACTIVITY.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.DA_TITLE_HEADER, - CommitteePageTitleConstants.DA_TITLE, - CommitteePageTitleConstants.DA_DESCRIPTION); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_ACTIVITY.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeCurrentMembersPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_CURRENT_MEMBERS.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.CM_TITLE_HEADER, - CommitteePageTitleConstants.CM_TITLE, - CommitteePageTitleConstants.CM_DESCRIPTION); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_CURRENT_MEMBERS.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeMemberHistoryPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_MEMBER_HISTORY.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.MH_TITLE_HEADER, - CommitteePageTitleConstants.MH_TITLE, - CommitteePageTitleConstants.MH_DESCRIPTION); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_MEMBER_HISTORY.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeRoleGhantPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_ROLE_GHANT.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.RG_TITLE_HEADER, - CommitteePageTitleConstants.RG_TITLE, - CommitteePageTitleConstants.RG_DESCRIPTION); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_ROLE_GHANT.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeBallotDecisionSummaryPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_BALLOT_DECISION_SUMMARY.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - "Ballot Decision Summary", - "Committee Ballot Decisions", - "Summary of committee ballot decisions"); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_BALLOT_DECISION_SUMMARY.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeDecisionSummaryPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_SUMMARY.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - "Decision Summary", - "Committee Decisions", - "Overview of committee decisions"); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_SUMMARY.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeDecisionTypeDailySummaryPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_TYPE_DAILY_SUMMARY.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - "Daily Decision Summary", - "Daily Committee Decisions", - "Daily summary of committee decision types"); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_TYPE_DAILY_SUMMARY.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteePageVisitHistoryPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_PAGEVISIT_HISTORY.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.PV_TITLE_HEADER, - CommitteePageTitleConstants.PV_TITLE, - CommitteePageTitleConstants.PV_DESCRIPTION); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_PAGEVISIT_HISTORY.createItemPageCommand(COMMITTEE_ID)); - } - - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyCommitteeDecisionFlowChartPage() throws Exception { - pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_CHARTS_DECISION_FLOW.createItemPageCommand(COMMITTEE_ID)); - pageVisit.verifyViewContent( - CommitteePageTitleConstants.DF_TITLE_HEADER, - CommitteePageTitleConstants.DF_TITLE, - CommitteePageTitleConstants.DF_DESCRIPTION); - pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_CHARTS_DECISION_FLOW.createItemPageCommand(COMMITTEE_ID)); - } + /** The committee id. */ + private static final String COMMITTEE_ID = "JuU"; + + /** + * Verify committee overview page. + * + * @throws Exception the exception + */ + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeOverviewPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_OVERVIEW.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.OV_TITLE_HEADER, CommitteePageTitleConstants.OV_TITLE); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_OVERVIEW.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeDocumentHistoryPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_HISTORY.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.DH_TITLE_HEADER, CommitteePageTitleConstants.DH_TITLE, + CommitteePageTitleConstants.DH_DESCRIPTION); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_HISTORY.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeDocumentActivityPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_ACTIVITY.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.DA_TITLE_HEADER, CommitteePageTitleConstants.DA_TITLE, + CommitteePageTitleConstants.DA_DESCRIPTION); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_DOCUMENT_ACTIVITY.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeCurrentMembersPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_CURRENT_MEMBERS.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.CM_TITLE_HEADER, CommitteePageTitleConstants.CM_TITLE, + CommitteePageTitleConstants.CM_DESCRIPTION); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_CURRENT_MEMBERS.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeMemberHistoryPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_MEMBER_HISTORY.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.MH_TITLE_HEADER, CommitteePageTitleConstants.MH_TITLE, + CommitteePageTitleConstants.MH_DESCRIPTION); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_MEMBER_HISTORY.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeRoleGhantPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_ROLE_GHANT.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.RG_TITLE_HEADER, CommitteePageTitleConstants.RG_TITLE, + CommitteePageTitleConstants.RG_DESCRIPTION); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_ROLE_GHANT.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeBallotDecisionSummaryPage() throws Exception { + pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_BALLOT_DECISION_SUMMARY + .createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteeViewConstants.BD_TITLE_HEADER, CommitteeViewConstants.BD_TITLE, + CommitteeViewConstants.BD_DESCRIPTION); + pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_BALLOT_DECISION_SUMMARY + .createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeDecisionSummaryPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_SUMMARY.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent("Committee Decision Summary", "Decision Summary", + "Overview of decisions made by the committee."); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_SUMMARY.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeDecisionTypeDailySummaryPage() throws Exception { + pageVisit.visitDirectPage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_TYPE_DAILY_SUMMARY + .createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteeViewConstants.DD_TITLE_HEADER, + CommitteeViewConstants.DD_TITLE, + CommitteeViewConstants.DD_DESCRIPTION); + pageVisit.validatePage(PageCommandCommitteeConstants.COMMAND_COMMITTEE_DECISION_TYPE_DAILY_SUMMARY + .createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteePageVisitHistoryPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_PAGEVISIT_HISTORY.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.PV_TITLE_HEADER, CommitteePageTitleConstants.PV_TITLE, + CommitteePageTitleConstants.PV_DESCRIPTION); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_COMMITTEE_PAGEVISIT_HISTORY.createItemPageCommand(COMMITTEE_ID)); + } + + @Test(timeout = DEFAULT_TIMEOUT) + public void verifyCommitteeDecisionFlowChartPage() throws Exception { + pageVisit.visitDirectPage( + PageCommandCommitteeConstants.COMMAND_CHARTS_DECISION_FLOW.createItemPageCommand(COMMITTEE_ID)); + pageVisit.verifyViewContent(CommitteePageTitleConstants.DF_TITLE_HEADER, CommitteePageTitleConstants.DF_TITLE, + CommitteePageTitleConstants.DF_DESCRIPTION); + pageVisit.validatePage( + PageCommandCommitteeConstants.COMMAND_CHARTS_DECISION_FLOW.createItemPageCommand(COMMITTEE_ID)); + } } - diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/ministry/UserMinistryTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/ministry/UserMinistryTest.java index 0f34959d80..799f91909d 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/ministry/UserMinistryTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/ministry/UserMinistryTest.java @@ -43,7 +43,7 @@ public void verifyMinistryMemberHistoryPage() throws Exception { pageVisit.validatePage(PageCommandMinistryConstants.COMMAND_MINISTRY_MEMBER_HISTORY.createItemPageCommand(MINISTRY_ID)); } - @Test(timeout = DEFAULT_TIMEOUT) + @Test(timeout = DEFAULT_TIMEOUT) public void verifyMinistryRoleGhantPage() throws Exception { pageVisit.visitDirectPage(PageCommandMinistryConstants.COMMAND_MINISTRY_ROLE_GHANT.createItemPageCommand(MINISTRY_ID)); pageVisit.verifyViewContent( @@ -87,7 +87,7 @@ public void verifyMinistryPageVisitHistoryPage() throws Exception { public void verifyMinistryGovernmentBodiesHeadcountPage() throws Exception { pageVisit.visitDirectPage(PageCommandMinistryConstants.COMMAND_MINISTRY_GOVERNMENT_BODIES_HEADCOUNT.createItemPageCommand(MINISTRY_ID)); pageVisit.verifyViewContent( - MinistryViewConstants.MINISTRY_SERVICE_STATS_TITLE, + MinistryViewConstants.HEADCOUNT_TITLE, MinistryViewConstants.HEADCOUNT_SUBTITLE, MinistryViewConstants.HEADCOUNT_DESC); pageVisit.validatePage(PageCommandMinistryConstants.COMMAND_MINISTRY_GOVERNMENT_BODIES_HEADCOUNT.createItemPageCommand(MINISTRY_ID)); @@ -97,7 +97,7 @@ public void verifyMinistryGovernmentBodiesHeadcountPage() throws Exception { public void verifyMinistryGovernmentBodiesIncomePage() throws Exception { pageVisit.visitDirectPage(PageCommandMinistryConstants.COMMAND_MINISTRY_GOVERNMENT_BODIES_INCOME.createItemPageCommand(MINISTRY_ID)); pageVisit.verifyViewContent( - MinistryViewConstants.MINISTRY_SERVICE_STATS_TITLE, + MinistryViewConstants.INCOME_TITLE, MinistryViewConstants.INCOME_SUBTITLE, MinistryViewConstants.INCOME_DESC); pageVisit.validatePage(PageCommandMinistryConstants.COMMAND_MINISTRY_GOVERNMENT_BODIES_INCOME.createItemPageCommand(MINISTRY_ID)); @@ -113,13 +113,5 @@ public void verifyMinistryGovernmentBodiesExpenditurePage() throws Exception { pageVisit.validatePage(PageCommandMinistryConstants.COMMAND_MINISTRY_GOVERNMENT_BODIES_EXPENDITURE.createItemPageCommand(MINISTRY_ID)); } - @Test(timeout = DEFAULT_TIMEOUT) - public void verifyMinistryChartsAllByHeadcountPage() throws Exception { - pageVisit.visitDirectPage(PageCommandMinistryConstants.MINISTRY_COMMAND_CHARTS_ALL_BY_HEADCOUNT.createItemPageCommand(null)); - pageVisit.verifyViewContent( - MinistryViewConstants.ALL_MINISTRIES_HEADCOUNT_TITLE, - MinistryViewConstants.ALL_MINISTRIES_HEADCOUNT_SUBTITLE, - MinistryViewConstants.ALL_MINISTRIES_HEADCOUNT_DESC); - pageVisit.validatePage(PageCommandMinistryConstants.MINISTRY_COMMAND_CHARTS_ALL_BY_HEADCOUNT.createItemPageCommand(null)); - } + } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/party/UserPartyTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/party/UserPartyTest.java index ab53294a34..da39569129 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/party/UserPartyTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/party/UserPartyTest.java @@ -26,9 +26,9 @@ public final class UserPartyTest extends AbstractUITest { public void verifyPartyOverviewPage() throws Exception { pageVisit.visitDirectPage(PageCommandPartyConstants.COMMAND_PARTY_OVERVIEW.createItemPageCommand(PARTY_ID)); pageVisit.verifyViewContent( - PartyViewConstants.OVERVIEW_HEADER, - PartyViewConstants.OVERVIEW_TITLE, - PartyViewConstants.OVERVIEW_DESC); + PartyViewConstants.OVERVIEW_HEADER, + PartyViewConstants.GENERAL_SUBTITLE, + PartyViewConstants.OVERVIEW_DESC); pageVisit.validatePage(PageCommandPartyConstants.COMMAND_PARTY_OVERVIEW.createItemPageCommand(PARTY_ID)); } @@ -36,9 +36,9 @@ public void verifyPartyOverviewPage() throws Exception { public void verifyPartyRoleGhantPage() throws Exception { pageVisit.visitDirectPage(PageCommandPartyConstants.COMMAND_PARTY_ROLE_GHANT.createItemPageCommand(PARTY_ID)); pageVisit.verifyViewContent( - PartyViewConstants.ROLE_GHANT_HEADER, - PartyViewConstants.ROLE_GHANT_TITLE, - PartyViewConstants.ROLE_GHANT_DESC); + PartyViewConstants.ROLE_GHANT_HEADER, + PartyViewConstants.ROLE_GHANT_TITLE, + PartyViewConstants.ROLE_GHANT_DESC); pageVisit.validatePage(PageCommandPartyConstants.COMMAND_PARTY_ROLE_GHANT.createItemPageCommand(PARTY_ID)); } @@ -117,7 +117,7 @@ public void verifyPartyDocumentActivityPage() throws Exception { pageVisit.visitDirectPage(PageCommandPartyConstants.COMMAND_PARTY_DOCUMENT_ACTIVITY.createItemPageCommand(PARTY_ID)); pageVisit.verifyViewContent( PartyViewConstants.DOCUMENT_ACTIVITY_HEADER, - PartyViewConstants.DOCUMENT_ACTIVITY_TITLE, + PartyViewConstants.DOCUMENT_ACTIVITY_SUBTITLE, PartyViewConstants.DOCUMENT_ACTIVITY_DESC); pageVisit.validatePage(PageCommandPartyConstants.COMMAND_PARTY_DOCUMENT_ACTIVITY.createItemPageCommand(PARTY_ID)); } @@ -126,9 +126,9 @@ public void verifyPartyDocumentActivityPage() throws Exception { public void verifyPartyCommitteeRolesPage() throws Exception { pageVisit.visitDirectPage(PageCommandPartyConstants.COMMAND_PARTY_COMMITTEE_ROLES.createItemPageCommand(PARTY_ID)); pageVisit.verifyViewContent( - PartyViewConstants.COMMITTEE_ROLES_HEADER, - PartyViewConstants.COMMITTEE_ROLES_TITLE, - PartyViewConstants.COMMITTEE_ROLES_DESC); + PartyViewConstants.COMMITTEE_ROLES_HEADER, + PartyViewConstants.ROLES_SUBTITLE, + PartyViewConstants.COMMITTEE_ROLES_DESC); pageVisit.validatePage(PageCommandPartyConstants.COMMAND_PARTY_COMMITTEE_ROLES.createItemPageCommand(PARTY_ID)); } diff --git a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/politician/UserPoliticianTest.java b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/politician/UserPoliticianTest.java index 59744cc218..85682e6015 100644 --- a/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/politician/UserPoliticianTest.java +++ b/citizen-intelligence-agency/src/test/java/com/hack23/cia/systemintegrationtest/user/politician/UserPoliticianTest.java @@ -6,6 +6,7 @@ import com.hack23.cia.systemintegrationtest.AbstractUITest; import com.hack23.cia.systemintegrationtest.categories.IntegrationTest; import com.hack23.cia.web.impl.ui.application.views.common.menufactory.api.pagecommands.PageCommandPoliticianConstants; +import com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode.PoliticianDescriptionConstants; import com.hack23.cia.web.impl.ui.application.views.user.politician.pagemode.PoliticianPageTitleConstants; /** @@ -13,7 +14,7 @@ */ @Category(IntegrationTest.class) public final class UserPoliticianTest extends AbstractUITest { - + /** The pol id. */ private static final String POL_ID = "0222691314314"; @@ -102,8 +103,8 @@ public void verifyPoliticianPageVisitHistoryPage() throws Exception { pageVisit.visitDirectPage(PageCommandPoliticianConstants.COMMAND_POLITICIAN_PAGEVISIT.createItemPageCommand(POL_ID)); pageVisit.verifyViewContent( PoliticianPageTitleConstants.PAGEVISIT_TITLE, - PoliticianPageTitleConstants.PAGEVISIT_SUBTITLE, - PoliticianPageTitleConstants.PAGEVISIT_DESC); + PoliticianDescriptionConstants.VISIT_TRENDS_TITLE, + PoliticianDescriptionConstants.VISIT_HISTORY_DESC); pageVisit.validatePage(PageCommandPoliticianConstants.COMMAND_POLITICIAN_PAGEVISIT.createItemPageCommand(POL_ID)); }