From 2fec50be2853fb9013ef6e421eb84147868d1d1d Mon Sep 17 00:00:00 2001
From: "david.grayson" <david.grayson@orasi.com>
Date: Tue, 6 Mar 2018 16:18:01 -0500
Subject: [PATCH 1/3] committing to go work on another branch

---
 .../AccountTimeByTimeSheetForm.java           | 52 +++++++++++++++++
 .../java/com/orasi/bluesource/Header.java     | 12 ++--
 .../java/com/orasi/bluesource/Report.java     | 57 +++++++++++++++++++
 .../com/orasi/bluesource/ReportsNavBar.java   | 33 +++++++++++
 .../AccountReportsTimeByTimesheet.java        | 54 ++++++++++++++++++
 src/test/resources/sandbox.xml                |  2 +-
 6 files changed, 204 insertions(+), 6 deletions(-)
 create mode 100644 src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
 create mode 100644 src/main/java/com/orasi/bluesource/Report.java
 create mode 100644 src/main/java/com/orasi/bluesource/ReportsNavBar.java
 create mode 100644 src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java

diff --git a/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java b/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
new file mode 100644
index 0000000..9727d99
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
@@ -0,0 +1,52 @@
+package com.orasi.bluesource;
+
+import com.orasi.web.OrasiDriver;
+import com.orasi.web.webelements.Element;
+import com.orasi.web.webelements.Listbox;
+import com.orasi.web.webelements.Textbox;
+import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.support.FindBy;
+
+public class AccountTimeByTimeSheetForm {
+	private OrasiDriver driver = null;
+
+	/**Page Elements**/
+	@FindBy(xpath = "//select[@id='account_select']") private Listbox lstAccountSelect;
+	@FindBy(xpath = "//input[@name='start_date']") private Textbox txtStartDate;
+	@FindBy(xpath = "//input[@name='end_date']") private Textbox txtEndDate;
+	@FindBy(xpath = "//input[@name='commit']") private Element elmGenerateReport;
+
+	/**Constructor**/
+	public AccountTimeByTimeSheetForm(OrasiDriver driver){
+		this.driver = driver;
+		ElementFactory.initElements(driver,this);
+	}
+
+	/**Page Interactions**/
+	public void selectAccount(String strAccount){
+		lstAccountSelect.syncEnabled(5);
+		lstAccountSelect.syncVisible(5);
+		lstAccountSelect.select(strAccount);
+	}
+
+	public void setStartDate(String strStartDate){
+		txtStartDate.syncEnabled(5);
+		txtStartDate.syncVisible(5);
+		txtStartDate.clear();
+		txtStartDate.sendKeys(strStartDate);
+	}
+
+	public void setEndDate(String strEndDate){
+		txtEndDate.syncEnabled(5);
+		txtEndDate.syncVisible(5);
+		txtEndDate.clear();
+		txtEndDate.sendKeys(strEndDate);
+	}
+
+	public void clickGenerateReport(){
+		elmGenerateReport.syncEnabled(5);
+		elmGenerateReport.syncVisible(5);
+		elmGenerateReport.click();
+	}
+
+}
diff --git a/src/main/java/com/orasi/bluesource/Header.java b/src/main/java/com/orasi/bluesource/Header.java
index 3522250..55da570 100644
--- a/src/main/java/com/orasi/bluesource/Header.java
+++ b/src/main/java/com/orasi/bluesource/Header.java
@@ -1,13 +1,10 @@
 package com.orasi.bluesource;
 
-import javax.wsdl.Message;
-
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.support.FindBy;
-
 import com.orasi.web.OrasiDriver;
 import com.orasi.web.webelements.Link;
 import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.support.FindBy;
 
 public class Header {
 	private OrasiDriver driver = null;
@@ -18,6 +15,7 @@ public class Header {
 	@FindBy(xpath = "//li[contains(.,'Employees')]/a") private Link lnkEmployees;
 	@FindBy(xpath = "//a[contains(text(),'Project')]") private Link lnkProjemployees;
 	@FindBy(xpath = "//a[contains(text(),'Project')]//..//..//..//following-sibling::a") private Link lnkEmployeeSelector;
+
 	
 	/**Constructor**/
 	public Header(OrasiDriver driver){
@@ -27,6 +25,10 @@ public Header(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+	public void navigateReporting(){
+		driver.get("http://10.238.243.127:8080/reporting/login");
+	}
+
 	/**
 	 * This method navigates to Accounts page
 	 * @author Paul
diff --git a/src/main/java/com/orasi/bluesource/Report.java b/src/main/java/com/orasi/bluesource/Report.java
new file mode 100644
index 0000000..3a5ed01
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/Report.java
@@ -0,0 +1,57 @@
+package com.orasi.bluesource;
+
+import com.orasi.web.OrasiDriver;
+import com.orasi.web.webelements.Element;
+import com.orasi.web.webelements.Webtable;
+import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.support.FindBy;
+
+public class Report {
+	private OrasiDriver driver = null;
+
+	/**Page Elements**/
+	@FindBy(xpath = "//h3[@class='report-title']") private Element elmReportTitle;
+	@FindBy(xpath = "//table") private Webtable tblReport;
+
+	/**Constructor**/
+	public Report(OrasiDriver driver){
+		this.driver = driver;
+		ElementFactory.initElements(driver,this);
+	}
+
+	/**Page Interactions**/
+
+	public boolean checkTotals(){
+		int runningTotal = 0;
+		int sectionTotal = 0;
+		int rowBeginSection = 1;
+		int rowOfSectionTotal = 1;
+
+		do {
+			for (int i=rowBeginSection; i<tblReport.getRowCount(); i++){
+				if (tblReport.getCell(i,2).getText().equals("Total:")){
+					rowOfSectionTotal = i;
+					break;
+				}
+			}
+
+			for (int i=rowBeginSection; i<rowOfSectionTotal; i++){
+				sectionTotal += Integer.parseInt(tblReport.getCell(i,4).getText());
+			}
+
+			if (tblReport.getCell(rowOfSectionTotal,4).getText().equals(String.valueOf(sectionTotal))){
+				rowBeginSection = ++rowOfSectionTotal;
+				runningTotal += sectionTotal;
+				sectionTotal = 0;
+			}else {
+				return false;
+			}
+
+		} while(rowBeginSection < tblReport.getRowCount());
+
+		if (tblReport.getCell(tblReport.getRowCount()-1,4).getText().equals(String.valueOf(runningTotal)))
+			return true;
+		else
+			return false;
+	}
+}
diff --git a/src/main/java/com/orasi/bluesource/ReportsNavBar.java b/src/main/java/com/orasi/bluesource/ReportsNavBar.java
new file mode 100644
index 0000000..8b6bad7
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/ReportsNavBar.java
@@ -0,0 +1,33 @@
+package com.orasi.bluesource;
+
+import com.orasi.web.OrasiDriver;
+import com.orasi.web.webelements.Link;
+import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.support.FindBy;
+
+public class ReportsNavBar {
+	private OrasiDriver driver = null;
+
+	/**Page Elements**/
+	@FindBy(xpath = "//span[contains(text(),'Account Reports')]/..") private Link lnkAccountReportsDropdown;
+	@FindBy(xpath = "//span[contains(text(),'Account Reports')]/../..//a[contains(text(),'Time by Time Sheet')]") private Link lnkAccountTimeByTimeSheet;
+
+	/**Constructor**/
+	public ReportsNavBar(OrasiDriver driver){
+		this.driver = driver;
+		ElementFactory.initElements(driver,this);
+	}
+
+	/**Page Interactions**/
+	public void clickAccountTimeByTimeSheet(){
+		lnkAccountTimeByTimeSheet.syncEnabled(5);
+		lnkAccountTimeByTimeSheet.syncVisible(5);
+		lnkAccountTimeByTimeSheet.click();
+	}
+
+	public void clickAccountReportsDropdown(){
+		lnkAccountReportsDropdown.syncEnabled(5);
+		lnkAccountReportsDropdown.syncVisible(5);
+		lnkAccountReportsDropdown.click();
+	}
+}
diff --git a/src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java b/src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java
new file mode 100644
index 0000000..1bdf59a
--- /dev/null
+++ b/src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java
@@ -0,0 +1,54 @@
+package com.bluesource.reports;
+
+import com.orasi.bluesource.AccountTimeByTimeSheetForm;
+import com.orasi.bluesource.Header;
+import com.orasi.bluesource.LoginPage;
+import com.orasi.bluesource.ReportsNavBar;
+import com.orasi.web.WebBaseTest;
+import org.testng.ITestContext;
+import org.testng.annotations.*;
+
+public class AccountReportsTimeByTimesheet extends WebBaseTest {
+	@BeforeMethod
+	@Parameters({"runLocation", "browserUnderTest", "browserVersion",
+			"operatingSystem", "environment"})
+	public void setup(@Optional String runLocation, String browserUnderTest,
+					  String browserVersion, String operatingSystem, String environment) {
+		setApplicationUnderTest("BLUESOURCE");
+		setBrowserUnderTest(browserUnderTest);
+		setBrowserVersion(browserVersion);
+		setOperatingSystem(operatingSystem);
+		setRunLocation(runLocation);
+		setEnvironment(environment);
+		setThreadDriver(true);
+		testStart("");
+	}
+
+	@AfterMethod
+	public void close(ITestContext testResults) {
+		endTest("TestAlert", testResults);
+	}
+
+	@Test
+	public void accountReportsTimeByTimesheet() {
+		//Test Variables
+		String strAccount = "";
+		String strProject = "";
+
+		//Page Models
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		ReportsNavBar reportsNavBar = new ReportsNavBar(getDriver());
+		AccountTimeByTimeSheetForm accountTimeByTimeSheetForm = new AccountTimeByTimeSheetForm(getDriver());
+
+		header.navigateReporting();
+
+		loginPage.AdminLogin();
+
+		reportsNavBar.clickAccountReportsDropdown();
+
+		reportsNavBar.clickAccountTimeByTimeSheet();
+
+
+	}
+}
\ No newline at end of file
diff --git a/src/test/resources/sandbox.xml b/src/test/resources/sandbox.xml
index 37bb0d4..fee98b0 100644
--- a/src/test/resources/sandbox.xml
+++ b/src/test/resources/sandbox.xml
@@ -13,7 +13,7 @@
 	
 	<test name="In Progress test" parallel="methods" thread-count="20">
 		<classes>
-			<class name="com.bluesource.accounts.CreateAccount" />
+			<class name="com.bluesource.reports.AccountReportsTimeByTimesheet" />
 		</classes>
 	</test>
 

From 0e5cb84ea00e1d671bdf979fcc0738f92c15de48 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Wed, 7 Mar 2018 15:20:01 -0500
Subject: [PATCH 2/3] Test passes

---
 .../AccountTimeByTimeSheetForm.java           | 56 +++++++++----
 .../java/com/orasi/bluesource/Header.java     |  4 +
 .../java/com/orasi/bluesource/LoginPage.java  | 20 ++---
 .../java/com/orasi/bluesource/Report.java     | 22 +++--
 ...eportsNavBar.java => ReportingNavBar.java} | 20 +++--
 .../AccountReportsTimeByTimeSheet.java        | 80 +++++++++++++++++++
 .../AccountReportsTimeByTimesheet.java        | 54 -------------
 7 files changed, 161 insertions(+), 95 deletions(-)
 rename src/main/java/com/orasi/bluesource/{ReportsNavBar.java => ReportingNavBar.java} (57%)
 create mode 100644 src/test/java/com/bluesource/reports/AccountReportsTimeByTimeSheet.java
 delete mode 100644 src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java

diff --git a/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java b/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
index 9727d99..7a7d765 100644
--- a/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
+++ b/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
@@ -1,10 +1,12 @@
 package com.orasi.bluesource;
 
 import com.orasi.web.OrasiDriver;
+import com.orasi.web.PageLoaded;
 import com.orasi.web.webelements.Element;
 import com.orasi.web.webelements.Listbox;
 import com.orasi.web.webelements.Textbox;
 import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.By;
 import org.openqa.selenium.support.FindBy;
 
 public class AccountTimeByTimeSheetForm {
@@ -15,6 +17,7 @@ public class AccountTimeByTimeSheetForm {
 	@FindBy(xpath = "//input[@name='start_date']") private Textbox txtStartDate;
 	@FindBy(xpath = "//input[@name='end_date']") private Textbox txtEndDate;
 	@FindBy(xpath = "//input[@name='commit']") private Element elmGenerateReport;
+	@FindBy(xpath = "//h4[@id='report-title']") private Element elmFormTitle;
 
 	/**Constructor**/
 	public AccountTimeByTimeSheetForm(OrasiDriver driver){
@@ -23,30 +26,53 @@ public AccountTimeByTimeSheetForm(OrasiDriver driver){
 	}
 
 	/**Page Interactions**/
+
+	public boolean verifyAccountTimeByTimeSheetFormLoaded(){
+		return PageLoaded.isElementLoaded(this.getClass(),driver,lstAccountSelect,5) &&
+				PageLoaded.isElementLoaded(this.getClass(),driver,txtStartDate,5) &&
+				PageLoaded.isElementLoaded(this.getClass(),driver,txtEndDate,5) &&
+				PageLoaded.isElementLoaded(this.getClass(),driver,elmGenerateReport);
+	}
+
 	public void selectAccount(String strAccount){
-		lstAccountSelect.syncEnabled(5);
-		lstAccountSelect.syncVisible(5);
-		lstAccountSelect.select(strAccount);
+		if (lstAccountSelect.syncEnabled(5) && lstAccountSelect.syncVisible(5)) {
+			lstAccountSelect.select(strAccount);
+		}
 	}
 
+	/**
+	 * @author David Grayson
+	 * @param strStartDate {@link String} mm/dd/yyyy format
+	 */
 	public void setStartDate(String strStartDate){
-		txtStartDate.syncEnabled(5);
-		txtStartDate.syncVisible(5);
-		txtStartDate.clear();
-		txtStartDate.sendKeys(strStartDate);
+		if (txtStartDate.syncEnabled(5) && txtStartDate.syncVisible(5)){
+			txtStartDate.clear();
+			txtStartDate.sendKeys(strStartDate);
+			elmFormTitle.click(); //to get rid of the calendar popup
+		}
 	}
 
+	/**
+	 * @author David Grayson
+	 * @param strEndDate {@link String} mm/dd/yyyy format
+	 */
 	public void setEndDate(String strEndDate){
-		txtEndDate.syncEnabled(5);
-		txtEndDate.syncVisible(5);
-		txtEndDate.clear();
-		txtEndDate.sendKeys(strEndDate);
+		if (txtEndDate.syncEnabled(5) && 	txtEndDate.syncVisible(5)){
+			txtEndDate.clear();
+			txtEndDate.sendKeys(strEndDate);
+			elmFormTitle.click(); //to get rid of the calendar popup
+		}
 	}
 
+	/**
+	 * @author David Grayson
+	 */
 	public void clickGenerateReport(){
-		elmGenerateReport.syncEnabled(5);
-		elmGenerateReport.syncVisible(5);
-		elmGenerateReport.click();
+		elmFormTitle.click();
+		if (driver.findElement(By.xpath("//th[@scope='col']")).syncHidden(5) &&
+				elmGenerateReport.syncEnabled(5) &&
+				elmGenerateReport.syncVisible(5)){
+			elmGenerateReport.click();
+		}
 	}
-
 }
diff --git a/src/main/java/com/orasi/bluesource/Header.java b/src/main/java/com/orasi/bluesource/Header.java
index 55da570..de8d5c9 100644
--- a/src/main/java/com/orasi/bluesource/Header.java
+++ b/src/main/java/com/orasi/bluesource/Header.java
@@ -25,6 +25,10 @@ public Header(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+	/**
+	 * This method navigates to the Reporting login page
+	 * @author David Grayson
+	 */
 	public void navigateReporting(){
 		driver.get("http://10.238.243.127:8080/reporting/login");
 	}
diff --git a/src/main/java/com/orasi/bluesource/LoginPage.java b/src/main/java/com/orasi/bluesource/LoginPage.java
index 3d71ad5..e868a50 100644
--- a/src/main/java/com/orasi/bluesource/LoginPage.java
+++ b/src/main/java/com/orasi/bluesource/LoginPage.java
@@ -1,19 +1,14 @@
 package com.orasi.bluesource;
 
-import java.util.ResourceBundle;
-
-import org.openqa.selenium.support.FindBy;
-
 import com.orasi.utils.Constants;
 import com.orasi.utils.TestReporter;
 import com.orasi.web.OrasiDriver;
 import com.orasi.web.PageLoaded;
-import com.orasi.web.webelements.Button;
-import com.orasi.web.webelements.Element;
-import com.orasi.web.webelements.Label;
-import com.orasi.web.webelements.Textbox;
-import com.orasi.web.webelements.Webtable;
+import com.orasi.web.webelements.*;
 import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.support.FindBy;
+
+import java.util.ResourceBundle;
 
 
 public class LoginPage {
@@ -46,8 +41,7 @@ public boolean verifyPageIsLoaded(){
 	/**
 	 * This method logins to the application with provided credentials
 	 * @author
-	 * @param username
-	 * @param password
+	 * @param role {@link String} 
 	 */
 	public boolean Login(String role){
 		txtUsername.set(userCredentialRepo.getString(role));
@@ -75,7 +69,7 @@ public void LoginWithCredentials(String username, String password) {
 		btnLogin.jsClick();
 	}
 	
-	/*
+	/**
 	 * Method checks that the label welcome is present on the screen
 	 * @author: Daniel Smith
 	 */
@@ -92,7 +86,7 @@ public void check_login(String username)
 		}
 	}
 	
-	/*
+	/**
 	 * Method checks that invalid login name and password is handled
 	 * @author: Daniel Smith
 	 */
diff --git a/src/main/java/com/orasi/bluesource/Report.java b/src/main/java/com/orasi/bluesource/Report.java
index 3a5ed01..207ab70 100644
--- a/src/main/java/com/orasi/bluesource/Report.java
+++ b/src/main/java/com/orasi/bluesource/Report.java
@@ -1,6 +1,8 @@
 package com.orasi.bluesource;
 
+import com.orasi.utils.TestReporter;
 import com.orasi.web.OrasiDriver;
+import com.orasi.web.PageLoaded;
 import com.orasi.web.webelements.Element;
 import com.orasi.web.webelements.Webtable;
 import com.orasi.web.webelements.impl.internal.ElementFactory;
@@ -21,6 +23,15 @@ public Report(OrasiDriver driver){
 
 	/**Page Interactions**/
 
+	public boolean verifyReportIsLoaded(){
+		return PageLoaded.isElementLoaded(this.getClass(),driver,elmReportTitle,5) &&
+				PageLoaded.isElementLoaded(this.getClass(),driver,tblReport,5);
+	}
+
+	public String getTitle(){
+		return elmReportTitle.getText();
+	}
+
 	public boolean checkTotals(){
 		int runningTotal = 0;
 		int sectionTotal = 0;
@@ -36,22 +47,23 @@ public boolean checkTotals(){
 			}
 
 			for (int i=rowBeginSection; i<rowOfSectionTotal; i++){
+				if (tblReport.getCell(i,4).getText().isEmpty())
+					TestReporter.log(String.valueOf(i));
 				sectionTotal += Integer.parseInt(tblReport.getCell(i,4).getText());
 			}
 
 			if (tblReport.getCell(rowOfSectionTotal,4).getText().equals(String.valueOf(sectionTotal))){
-				rowBeginSection = ++rowOfSectionTotal;
+				rowBeginSection = rowOfSectionTotal += 2;
 				runningTotal += sectionTotal;
 				sectionTotal = 0;
 			}else {
+				TestReporter.log("rowBeginSection = " + rowBeginSection);
+				TestReporter.log("rowOfSectionTotal = " + rowOfSectionTotal);
 				return false;
 			}
 
 		} while(rowBeginSection < tblReport.getRowCount());
 
-		if (tblReport.getCell(tblReport.getRowCount()-1,4).getText().equals(String.valueOf(runningTotal)))
-			return true;
-		else
-			return false;
+		return tblReport.getCell(tblReport.getRowCount(), 4).getText().equals(String.valueOf(runningTotal));
 	}
 }
diff --git a/src/main/java/com/orasi/bluesource/ReportsNavBar.java b/src/main/java/com/orasi/bluesource/ReportingNavBar.java
similarity index 57%
rename from src/main/java/com/orasi/bluesource/ReportsNavBar.java
rename to src/main/java/com/orasi/bluesource/ReportingNavBar.java
index 8b6bad7..6963919 100644
--- a/src/main/java/com/orasi/bluesource/ReportsNavBar.java
+++ b/src/main/java/com/orasi/bluesource/ReportingNavBar.java
@@ -1,33 +1,37 @@
 package com.orasi.bluesource;
 
 import com.orasi.web.OrasiDriver;
+import com.orasi.web.webelements.Element;
 import com.orasi.web.webelements.Link;
 import com.orasi.web.webelements.impl.internal.ElementFactory;
 import org.openqa.selenium.support.FindBy;
 
-public class ReportsNavBar {
+public class ReportingNavBar {
 	private OrasiDriver driver = null;
 
 	/**Page Elements**/
 	@FindBy(xpath = "//span[contains(text(),'Account Reports')]/..") private Link lnkAccountReportsDropdown;
 	@FindBy(xpath = "//span[contains(text(),'Account Reports')]/../..//a[contains(text(),'Time by Time Sheet')]") private Link lnkAccountTimeByTimeSheet;
+	@FindBy(xpath = "//h1[text()='Welcome']") private Element elmWelcome;
 
 	/**Constructor**/
-	public ReportsNavBar(OrasiDriver driver){
+	public ReportingNavBar(OrasiDriver driver){
 		this.driver = driver;
 		ElementFactory.initElements(driver,this);
 	}
 
 	/**Page Interactions**/
 	public void clickAccountTimeByTimeSheet(){
-		lnkAccountTimeByTimeSheet.syncEnabled(5);
-		lnkAccountTimeByTimeSheet.syncVisible(5);
-		lnkAccountTimeByTimeSheet.click();
+		if (lnkAccountTimeByTimeSheet.syncEnabled(5) && lnkAccountTimeByTimeSheet.syncVisible(5))
+			lnkAccountTimeByTimeSheet.click();
 	}
 
 	public void clickAccountReportsDropdown(){
-		lnkAccountReportsDropdown.syncEnabled(5);
-		lnkAccountReportsDropdown.syncVisible(5);
-		lnkAccountReportsDropdown.click();
+		if (lnkAccountReportsDropdown.syncEnabled(5) && lnkAccountReportsDropdown.syncVisible(5))
+			lnkAccountReportsDropdown.click();
+	}
+
+	public boolean verifyHomePageIsDisplayed(){
+		return elmWelcome.syncVisible(5,false);
 	}
 }
diff --git a/src/test/java/com/bluesource/reports/AccountReportsTimeByTimeSheet.java b/src/test/java/com/bluesource/reports/AccountReportsTimeByTimeSheet.java
new file mode 100644
index 0000000..cf374b9
--- /dev/null
+++ b/src/test/java/com/bluesource/reports/AccountReportsTimeByTimeSheet.java
@@ -0,0 +1,80 @@
+package com.bluesource.reports;
+
+import com.orasi.bluesource.*;
+import com.orasi.utils.TestReporter;
+import com.orasi.web.WebBaseTest;
+import org.testng.ITestContext;
+import org.testng.annotations.*;
+
+public class AccountReportsTimeByTimeSheet extends WebBaseTest {
+	@BeforeMethod
+	@Parameters({"runLocation", "browserUnderTest", "browserVersion",
+			"operatingSystem", "environment"})
+	public void setup(@Optional String runLocation, String browserUnderTest,
+					  String browserVersion, String operatingSystem, String environment) {
+		setApplicationUnderTest("BLUESOURCE");
+		setBrowserUnderTest(browserUnderTest);
+		setBrowserVersion(browserVersion);
+		setOperatingSystem(operatingSystem);
+		setRunLocation(runLocation);
+		setEnvironment(environment);
+		setThreadDriver(true);
+		testStart("");
+	}
+
+	@AfterMethod
+	public void close(ITestContext testResults) {
+		endTest("TestAlert", testResults);
+	}
+
+	@Test
+	public void accountReportsTimeByTimeSheet() {
+		//Test Variables
+		String strAccount = "Account1";
+		String strStartDate = "12/01/2017";
+		String strEndDate = "03/07/2018";
+
+		//Page Models
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		ReportingNavBar reportingNavBar = new ReportingNavBar(getDriver());
+		AccountTimeByTimeSheetForm accountTimeByTimeSheetForm = new AccountTimeByTimeSheetForm(getDriver());
+		Report report = new Report(getDriver());
+
+		TestReporter.logStep("Navigating to reports login page");
+		header.navigateReporting();
+
+		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying reporting login page is displayed");
+
+		TestReporter.logStep("Logging in as Admin");
+		loginPage.AdminLogin();
+
+		TestReporter.assertTrue(reportingNavBar.verifyHomePageIsDisplayed(),"Verifying Reporting Home page is Displayed");
+
+		TestReporter.logStep("Expanding Account Reports");
+		reportingNavBar.clickAccountReportsDropdown();
+
+		TestReporter.logStep("Clicking Time by Time Sheet");
+		reportingNavBar.clickAccountTimeByTimeSheet();
+
+		TestReporter.assertTrue(accountTimeByTimeSheetForm.verifyAccountTimeByTimeSheetFormLoaded(),"Verifying Time by Time Sheet form loaded");
+
+		TestReporter.logStep("Selecting Account [" + strAccount + "]");
+		accountTimeByTimeSheetForm.selectAccount(strAccount);
+
+		TestReporter.logStep("Setting Start Date");
+		accountTimeByTimeSheetForm.setStartDate(strStartDate);
+
+		TestReporter.logStep("Setting End Date");
+		accountTimeByTimeSheetForm.setEndDate(strEndDate);
+
+		TestReporter.logStep("Clicking Generate Report");
+		accountTimeByTimeSheetForm.clickGenerateReport();
+
+		TestReporter.assertTrue(report.verifyReportIsLoaded(),"Verifying Report page is loaded");
+
+		TestReporter.assertTrue(report.checkTotals(),"Verifying Report totals are correct");
+
+		TestReporter.assertEquals(report.getTitle(),"Time by Time Sheet: "+strStartDate+"-"+strEndDate,"Verifying Report Title");
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java b/src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java
deleted file mode 100644
index 1bdf59a..0000000
--- a/src/test/java/com/bluesource/reports/AccountReportsTimeByTimesheet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.bluesource.reports;
-
-import com.orasi.bluesource.AccountTimeByTimeSheetForm;
-import com.orasi.bluesource.Header;
-import com.orasi.bluesource.LoginPage;
-import com.orasi.bluesource.ReportsNavBar;
-import com.orasi.web.WebBaseTest;
-import org.testng.ITestContext;
-import org.testng.annotations.*;
-
-public class AccountReportsTimeByTimesheet extends WebBaseTest {
-	@BeforeMethod
-	@Parameters({"runLocation", "browserUnderTest", "browserVersion",
-			"operatingSystem", "environment"})
-	public void setup(@Optional String runLocation, String browserUnderTest,
-					  String browserVersion, String operatingSystem, String environment) {
-		setApplicationUnderTest("BLUESOURCE");
-		setBrowserUnderTest(browserUnderTest);
-		setBrowserVersion(browserVersion);
-		setOperatingSystem(operatingSystem);
-		setRunLocation(runLocation);
-		setEnvironment(environment);
-		setThreadDriver(true);
-		testStart("");
-	}
-
-	@AfterMethod
-	public void close(ITestContext testResults) {
-		endTest("TestAlert", testResults);
-	}
-
-	@Test
-	public void accountReportsTimeByTimesheet() {
-		//Test Variables
-		String strAccount = "";
-		String strProject = "";
-
-		//Page Models
-		LoginPage loginPage = new LoginPage(getDriver());
-		Header header = new Header(getDriver());
-		ReportsNavBar reportsNavBar = new ReportsNavBar(getDriver());
-		AccountTimeByTimeSheetForm accountTimeByTimeSheetForm = new AccountTimeByTimeSheetForm(getDriver());
-
-		header.navigateReporting();
-
-		loginPage.AdminLogin();
-
-		reportsNavBar.clickAccountReportsDropdown();
-
-		reportsNavBar.clickAccountTimeByTimeSheet();
-
-
-	}
-}
\ No newline at end of file

From e9705c11891c9d5bdfb1a508f4ff1433b08b236a Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Wed, 7 Mar 2018 15:53:26 -0500
Subject: [PATCH 3/3] added comments/documentation

---
 .../bluesource/AccountTimeByTimeSheetForm.java      | 13 +++++++++++++
 src/main/java/com/orasi/bluesource/Header.java      |  2 ++
 src/main/java/com/orasi/bluesource/LoginPage.java   |  2 +-
 .../java/com/orasi/bluesource/ReportingNavBar.java  | 13 +++++++++++++
 src/test/resources/sandbox.xml                      |  2 +-
 5 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java b/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
index 7a7d765..94e7452 100644
--- a/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
+++ b/src/main/java/com/orasi/bluesource/AccountTimeByTimeSheetForm.java
@@ -27,6 +27,11 @@ public AccountTimeByTimeSheetForm(OrasiDriver driver){
 
 	/**Page Interactions**/
 
+	/**
+	 * This method checks that the Time by Time Sheet form is loaded
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns <code>true</code> if the Form is loaded, <code>false</code> otherwise
+	 */
 	public boolean verifyAccountTimeByTimeSheetFormLoaded(){
 		return PageLoaded.isElementLoaded(this.getClass(),driver,lstAccountSelect,5) &&
 				PageLoaded.isElementLoaded(this.getClass(),driver,txtStartDate,5) &&
@@ -34,6 +39,11 @@ public boolean verifyAccountTimeByTimeSheetFormLoaded(){
 				PageLoaded.isElementLoaded(this.getClass(),driver,elmGenerateReport);
 	}
 
+	/**
+	 * This method selects an account by the name passed to it
+	 * @author David Grayson
+	 * @param strAccount {@link String} name of the account
+	 */
 	public void selectAccount(String strAccount){
 		if (lstAccountSelect.syncEnabled(5) && lstAccountSelect.syncVisible(5)) {
 			lstAccountSelect.select(strAccount);
@@ -41,6 +51,7 @@ public void selectAccount(String strAccount){
 	}
 
 	/**
+	 * This method sets the Start Date field
 	 * @author David Grayson
 	 * @param strStartDate {@link String} mm/dd/yyyy format
 	 */
@@ -53,6 +64,7 @@ public void setStartDate(String strStartDate){
 	}
 
 	/**
+	 * This method sets the End Date field
 	 * @author David Grayson
 	 * @param strEndDate {@link String} mm/dd/yyyy format
 	 */
@@ -65,6 +77,7 @@ public void setEndDate(String strEndDate){
 	}
 
 	/**
+	 * This method clicks the Generate Report element
 	 * @author David Grayson
 	 */
 	public void clickGenerateReport(){
diff --git a/src/main/java/com/orasi/bluesource/Header.java b/src/main/java/com/orasi/bluesource/Header.java
index de8d5c9..fed993b 100644
--- a/src/main/java/com/orasi/bluesource/Header.java
+++ b/src/main/java/com/orasi/bluesource/Header.java
@@ -30,6 +30,8 @@ public Header(OrasiDriver driver){
 	 * @author David Grayson
 	 */
 	public void navigateReporting(){
+		MessageCenter messageCenter = new MessageCenter(driver);
+		messageCenter.closeMessageCenter();
 		driver.get("http://10.238.243.127:8080/reporting/login");
 	}
 
diff --git a/src/main/java/com/orasi/bluesource/LoginPage.java b/src/main/java/com/orasi/bluesource/LoginPage.java
index e868a50..5ad057b 100644
--- a/src/main/java/com/orasi/bluesource/LoginPage.java
+++ b/src/main/java/com/orasi/bluesource/LoginPage.java
@@ -41,7 +41,7 @@ public boolean verifyPageIsLoaded(){
 	/**
 	 * This method logins to the application with provided credentials
 	 * @author
-	 * @param role {@link String} 
+	 * @param role {@link String}
 	 */
 	public boolean Login(String role){
 		txtUsername.set(userCredentialRepo.getString(role));
diff --git a/src/main/java/com/orasi/bluesource/ReportingNavBar.java b/src/main/java/com/orasi/bluesource/ReportingNavBar.java
index 6963919..439ea3c 100644
--- a/src/main/java/com/orasi/bluesource/ReportingNavBar.java
+++ b/src/main/java/com/orasi/bluesource/ReportingNavBar.java
@@ -21,16 +21,29 @@ public ReportingNavBar(OrasiDriver driver){
 	}
 
 	/**Page Interactions**/
+
+	/**
+	 * This method clicks the Time by Time Sheet link in the Account Reports dropdown menu
+	 * @author David Grayson
+	 */
 	public void clickAccountTimeByTimeSheet(){
 		if (lnkAccountTimeByTimeSheet.syncEnabled(5) && lnkAccountTimeByTimeSheet.syncVisible(5))
 			lnkAccountTimeByTimeSheet.click();
 	}
 
+	/**
+	 * This method clicks the Account Reports Drop down
+	 * @author David Grayson
+	 */
 	public void clickAccountReportsDropdown(){
 		if (lnkAccountReportsDropdown.syncEnabled(5) && lnkAccountReportsDropdown.syncVisible(5))
 			lnkAccountReportsDropdown.click();
 	}
 
+	/**
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns <code>true</code> if on the Reporting Home page.
+	 */
 	public boolean verifyHomePageIsDisplayed(){
 		return elmWelcome.syncVisible(5,false);
 	}
diff --git a/src/test/resources/sandbox.xml b/src/test/resources/sandbox.xml
index fee98b0..671d0eb 100644
--- a/src/test/resources/sandbox.xml
+++ b/src/test/resources/sandbox.xml
@@ -13,7 +13,7 @@
 	
 	<test name="In Progress test" parallel="methods" thread-count="20">
 		<classes>
-			<class name="com.bluesource.reports.AccountReportsTimeByTimesheet" />
+			<class name="com.bluesource.reports.AccountReportsTimeByTimeSheet" />
 		</classes>
 	</test>