From 26669c436909cbd545f823718c33e7cce7299435 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Fri, 9 Mar 2018 09:47:25 -0500
Subject: [PATCH 1/2] Test Passes

---
 .../AccountBurndownDataReportForm.java        |  46 +++++
 .../java/com/orasi/bluesource/Accounts.java   |  84 ++++++++-
 .../java/com/orasi/bluesource/Header.java     |  11 ++
 .../java/com/orasi/bluesource/Report.java     | 101 ++++++++++
 .../com/orasi/bluesource/ReportingNavBar.java |  57 ++++++
 .../CreateNewBurndownReportFormat.java        | 174 ++++++++++++++++++
 6 files changed, 471 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/orasi/bluesource/AccountBurndownDataReportForm.java
 create mode 100644 src/main/java/com/orasi/bluesource/Report.java
 create mode 100644 src/main/java/com/orasi/bluesource/ReportingNavBar.java
 create mode 100644 src/test/java/com/bluesource/reports/CreateNewBurndownReportFormat.java

diff --git a/src/main/java/com/orasi/bluesource/AccountBurndownDataReportForm.java b/src/main/java/com/orasi/bluesource/AccountBurndownDataReportForm.java
new file mode 100644
index 0000000..50e9f72
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/AccountBurndownDataReportForm.java
@@ -0,0 +1,46 @@
+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.impl.internal.ElementFactory;
+import org.openqa.selenium.support.FindBy;
+
+public class AccountBurndownDataReportForm {
+	private OrasiDriver driver = null;
+
+	/**Page Elements**/
+	@FindBy(xpath = "//input[@name='commit']") private Element elmGenerateReport;
+	@FindBy(xpath = "//select[@id='account_select']") private Listbox lstAccountSelect;
+
+	/**
+	 * Constructor
+	 **/
+	public AccountBurndownDataReportForm(OrasiDriver driver) {
+		this.driver = driver;
+		ElementFactory.initElements(driver, this);
+	}
+
+	/**Page Interactions**/
+
+	public boolean verifyFormLoaded(){
+		return PageLoaded.isElementLoaded(this.getClass(),driver,elmGenerateReport,5) &&
+				PageLoaded.isElementLoaded(this.getClass(),driver,lstAccountSelect,5);
+	}
+
+	public void clickGenerateReport(){
+		if (canInteract(elmGenerateReport))
+			elmGenerateReport.click();
+	}
+
+	public void selectAccount(String strAccount){
+		if (canInteract(lstAccountSelect)){
+			lstAccountSelect.select(strAccount);
+		}
+	}
+
+	private boolean canInteract(Element elm){
+		return elm.syncEnabled(5) && elm.syncVisible(5);
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index e24471f..8ea9c14 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -1,10 +1,12 @@
 package com.orasi.bluesource;
 
 import java.lang.reflect.UndeclaredThrowableException;
+import java.util.ArrayList;
 import java.util.List;
 
 import javax.lang.model.util.Elements;
 
+import org.bouncycastle.jce.provider.symmetric.TEA;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.NoSuchElementException;
@@ -28,8 +30,7 @@
 
 public class Accounts {
 	private OrasiDriver driver = null;
-	
-	
+
 	/**Page Elements**/
 	@FindBy(xpath = "//*[@id='resource-content']/div[2]/p") private Element elmNumberPages;
 	@FindBy(xpath = "//*[@id=\"resource-content\"]/div[1]/table/tbody") private Webtable tblAccounts;
@@ -46,6 +47,10 @@ public class Accounts {
 	@FindBy(css = "div.btn.btn-secondary.btn-xs.quick-nav") private Button btnQuickNav;
 	@FindBy(xpath = "//a[contains(@ng-bind, 'n + 1')]") private List<Button> btnPages;
 	@FindBy(xpath = "//*[@id=\"project-list\"]/div/div[1]/div") private Button btnCloseQuickNav;
+	@FindBy(xpath = "//h3[contains(text(),'Hours')]/../table") private Webtable tblProjectHours;
+	@FindBy(xpath = "//h3[contains(text(),'Budget')]/../table") private Webtable tblProjectBudget;
+	@FindBy(xpath = "//th[contains(text(),'Project')]/../../..") private Webtable tblSubProjects;
+	@FindBy(xpath = "//span[@class='sow_info']") private Element elmSOW;
 
 	/**Constructor**/
 	public Accounts(OrasiDriver driver){
@@ -55,6 +60,81 @@ public Accounts(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+
+
+	public boolean hasSOW(){
+		return driver.findElements(By.xpath("//span[@class='sow_info']")).size() == 1;
+	}
+
+	public List<String> getAllSubProjects(){
+		ArrayList<String> subProjects = new ArrayList<>(tblSubProjects.getRowCount());
+		for (int i=1;i<=tblSubProjects.getRowCount();i++){
+			subProjects.add(tblSubProjects.getCell(i,1).getText());
+		}
+		return subProjects;
+	}
+
+	public String getSubmittedBudget(){
+		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Budget')]/../table")).getRowWithCellText("Submitted");
+
+		if(row > 0)
+			return driver.findElement(By.xpath("//h3[contains(text(),'Budget')]/../table/tbody/tr["+row+"]/td[1]")).getText();
+		else
+			return "$0.00";
+	}
+
+	public String getAllocatedBudget(){
+		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Budget')]/../table")).getRowWithCellText("Allocated");
+
+		if (row > 0)
+			return driver.findElement(By.xpath("//h3[contains(text(),'Budget')]/../table/tbody/tr["+row+"]/td[1]")).getText();
+		else
+			return "$0.00";
+	}
+
+	public String getSubmittedHours(){
+		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Hours')]/../table")).getRowWithCellText("Submitted");
+
+		if (row > 0)
+			return driver.findElement(By.xpath("//h3[contains(text(),'Hours')]/../table/tbody/tr["+row+"]/td[1]")).getText().replace(".00","").trim();
+		else
+			return "";
+	}
+
+	public String getAllocatedHours(){
+		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Hours')]/../table")).getRowWithCellText("Allocated");
+
+		if (row > 0)
+			return driver.findElement(By.xpath("//h3[contains(text(),'Hours')]/../table/tbody/tr["+row+"]/td[1]")).getText().replace(".00","").trim();
+		else
+			return "";
+	}
+
+	public String getSOW(){
+		if (hasSOW())
+			return elmSOW.getText().replace(" - ","");
+		else
+			return "";
+	}
+
+	public List<String> getAllProject(){
+		ArrayList<String> projects = new ArrayList<>(tblProjects.getRowCount());
+		for (int i = 1; i <= tblProjects.getRowCount(); i++) {
+			if (!tblProjects.getCell(i,1).getText().isEmpty())
+				projects.add(tblProjects.getCell(i,1).getText());
+		}
+		TestReporter.log(projects.toString());
+		return projects;
+	}
+
+	/**
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns <code>true</code> if the Accounts table is loaded, <code>false</code> otherwise.
+	 */
+	public boolean verifyAccountsPageIsLoaded(){
+		return PageLoaded.isElementLoaded(this.getClass(),driver,tblAccounts,5);
+	}
+
 	/*
 	 * Click on accounts tab 
 	 * Make sure that the correct page loads
diff --git a/src/main/java/com/orasi/bluesource/Header.java b/src/main/java/com/orasi/bluesource/Header.java
index 3522250..9e4a221 100644
--- a/src/main/java/com/orasi/bluesource/Header.java
+++ b/src/main/java/com/orasi/bluesource/Header.java
@@ -27,6 +27,17 @@ public Header(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+
+	/**
+	 * This method navigates to the Reporting login page
+	 * @author David Grayson
+	 */
+	public void navigateReporting(){
+		MessageCenter messageCenter = new MessageCenter(driver);
+		messageCenter.closeMessageCenter();
+		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..5125980
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/Report.java
@@ -0,0 +1,101 @@
+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;
+import org.openqa.selenium.By;
+import org.openqa.selenium.support.FindBy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+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**/
+
+	/**
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns <code>true</code> if the report is loaded, <code>false</code> otherwise.
+	 */
+	public boolean verifyReportIsLoaded(){
+		return PageLoaded.isElementLoaded(this.getClass(),driver,elmReportTitle,5) &&
+				PageLoaded.isElementLoaded(this.getClass(),driver,tblReport,5);
+	}
+
+	/**
+	 * @author David Grayson
+	 * @return {@link String} Returns the title of the report
+	 */
+	public String getTitle(){
+		return elmReportTitle.getText();
+	}
+
+	public int getProjectCount(String strAccount){
+		int count = 0;
+		for (int i = 1; i<=tblReport.getRowCount(); i++){
+			if (!tblReport.getCell(i,2).getText().contains("/") && tblReport.getCell(i,1).getText().equals(strAccount))
+				count++;
+		}
+		return count;
+	}
+
+	public List<String> getProjects(String strAccount){
+		ArrayList<String> projects = new ArrayList<>();
+		for (int i = 1; i <= tblReport.getRowCount(); i++) {
+			if (tblReport.getCell(i,1).getText().equals(strAccount) && !tblReport.getCell(i,2).getText().contains("/"))
+				projects.add(tblReport.getCell(i,2).getText());
+		}
+		return projects;
+	}
+
+	public List<String> getSubProjects(String strProject){
+		ArrayList<String> subProjects = new ArrayList<>();
+		for (int i = 1; i <= tblReport.getRowCount(); i++){
+			String temp = tblReport.getCell(i,2).getText();
+			//TestReporter.log("temp: "+temp);
+			if (temp.contains(strProject+" /")){
+				subProjects.add(temp);
+			}
+		}
+		return subProjects;
+	}
+
+	public String[] getProjectData(String strProject){
+		int row = tblReport.getRowWithCellText(strProject);
+		return new String[]{
+				tblReport.getCell(row,3).getText().trim(), //SOW ID
+				tblReport.getCell(row,4).getText().trim(), //Budget Hrs
+				tblReport.getCell(row,5).getText().trim(), //Reported Hrs
+				tblReport.getCell(row,6).getText().trim(), //Budget $
+				tblReport.getCell(row,7).getText().trim() //Reported $
+		};
+	}
+
+	public String[] getSubProjectData(String strSubProject){
+		int row = tblReport.getRowWithCellText(strSubProject);
+		//TestReporter.log(strProject + " / " + strSubProject);
+		return new String[]{
+				tblReport.getCell(row,3).getText().trim(), // 0 - SOW ID
+				tblReport.getCell(row,4).getText().trim(), // 1 - Budget Hrs
+				tblReport.getCell(row,5).getText().trim(), // 2 - Reported Hrs
+				tblReport.getCell(row,6).getText().trim(), // 3 - Budget $
+				tblReport.getCell(row,7).getText().trim() // 4 - Reported $
+		};
+	}
+}
\ No newline at end of file
diff --git a/src/main/java/com/orasi/bluesource/ReportingNavBar.java b/src/main/java/com/orasi/bluesource/ReportingNavBar.java
new file mode 100644
index 0000000..21b4281
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/ReportingNavBar.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.Link;
+import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.support.FindBy;
+
+public class ReportingNavBar {
+	private OrasiDriver driver = null;
+
+	/**Page Elements**/
+	@FindBy(xpath = "//span[contains(text(),'Account Reports')]/..") private Link lnkAccountReportsDropdown;
+	@FindBy(xpath = "//h1[text()='Welcome']") private Element elmWelcome;
+	@FindBy(xpath = "//span[contains(text(),'Account Reports')]/../..//a[contains(text(),'Burn Down Data')]") private Link lnkAccountReportsBurnDownData;
+
+
+	/**Constructor**/
+	public ReportingNavBar(OrasiDriver driver) {
+		this.driver = driver;
+		ElementFactory.initElements(driver, this);
+	}
+
+	/**Page Interactions**/
+
+	/**
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns <code>true</code> if on the Reporting Home page.
+	 */
+	public boolean verifyHomePageIsDisplayed(){
+		return elmWelcome.syncVisible(5,false);
+	}
+
+	public void clickBurnDownData(){
+		if (canInteract(lnkAccountReportsBurnDownData))
+			lnkAccountReportsBurnDownData.click();
+	}
+
+	/**
+	 * This method expands the Projects Reports drop down
+	 * @author David Grayson
+	 */
+	public void clickAccountReports(){
+		if (canInteract(lnkAccountReportsDropdown))
+			lnkAccountReportsDropdown.click();
+	}
+
+	/**
+	 * This method provides standard checks that an element can be interacted with
+	 * @author David Grayson
+	 * @param elm {@link Element} Element to check
+	 * @return {@link Boolean} Returns <code>true</code> if the element is enabled and visible, <code>false</code> otherwise
+	 */
+	private boolean canInteract(Element elm){
+		return elm.syncEnabled(5) && elm.syncVisible(5);
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/bluesource/reports/CreateNewBurndownReportFormat.java b/src/test/java/com/bluesource/reports/CreateNewBurndownReportFormat.java
new file mode 100644
index 0000000..71b31ee
--- /dev/null
+++ b/src/test/java/com/bluesource/reports/CreateNewBurndownReportFormat.java
@@ -0,0 +1,174 @@
+package com.bluesource.reports;
+
+import com.orasi.bluesource.*;
+import com.orasi.utils.TestReporter;
+import com.orasi.web.PageLoaded;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
+import org.testng.annotations.Test;
+import org.testng.ITestContext;
+
+import com.orasi.web.WebBaseTest;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+
+public class CreateNewBurndownReportFormat 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 createNewBurndownReportFormat() {
+		//Test Variables
+		String bluesourceURL = "http://10.238.243.127/login";
+		String strAccount = "Account1";
+		SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
+		String strCurrentDate = sdf.format(new Date());
+		HashMap<String,String[]> projectDataHashMap = null;
+
+
+		//Page Models
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		Accounts accounts = new Accounts(getDriver());
+		ReportingNavBar reportingNavBar = new ReportingNavBar(getDriver());
+		AccountBurndownDataReportForm form = new AccountBurndownDataReportForm(getDriver());
+		Report report = new Report(getDriver());
+
+		header.navigateReporting();
+
+		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying BlueSource Reporting login page is loaded");
+
+		loginPage.AdminLogin();
+
+		TestReporter.assertTrue(reportingNavBar.verifyHomePageIsDisplayed(),"Verifying Reporting home page is displayed");
+
+		reportingNavBar.clickAccountReports();
+
+		reportingNavBar.clickBurnDownData();
+
+		TestReporter.assertTrue(form.verifyFormLoaded(), "Verifying Account Burndown Data Report form loaded");
+
+		form.selectAccount(strAccount);
+
+		form.clickGenerateReport();
+
+		TestReporter.assertTrue(report.verifyReportIsLoaded(),"Verifying report page loaded");
+
+		TestReporter.assertEquals("Account Burndown Data Report: " + strCurrentDate,report.getTitle(),"Verifying report title");
+
+		projectDataHashMap = getReportData(report,strAccount);
+
+		getDriver().get(bluesourceURL);
+
+		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying BlueSource login page loaded");
+
+		loginPage.AdminLogin();
+
+		header.navigateAccounts();
+
+		TestReporter.assertTrue(accounts.verifyAccountsPageIsLoaded(),"Verifying Accounts page loaded");
+
+		accounts.clickAccountLink(strAccount);
+
+		for (String project:accounts.getAllProject()){
+			TestReporter.assertTrue(projectDataHashMap.containsKey(project),"Verifying project [" + project + "] was in report");
+
+			String[] projectData = projectDataHashMap.get(project);
+
+			accounts.clickProjectLink(project);
+			PageLoaded.isDomComplete(getDriver());
+
+			TestReporter.log("["+projectData[0]+"]");
+			TestReporter.log("["+accounts.getSOW()+"]");
+
+			TestReporter.assertEquals(projectData[0],accounts.getSOW(),"Verifying Project [" + project + "] SOW");
+
+			TestReporter.log("["+projectData[1]+"]");
+			TestReporter.log("["+accounts.getAllocatedHours()+"]");
+
+			TestReporter.assertEquals(projectData[1],accounts.getAllocatedHours(),"Verifying Budget Hours");
+
+			TestReporter.log("["+projectData[2]+"]");
+			TestReporter.log("["+accounts.getSubmittedHours()+"]");
+
+			TestReporter.assertEquals(projectData[2],accounts.getSubmittedHours(),"Verifying Reported Hours");
+
+			TestReporter.log("["+projectData[3]+"]");
+			TestReporter.log("["+accounts.getAllocatedBudget()+"]");
+
+			TestReporter.assertEquals(projectData[3],accounts.getAllocatedBudget(),"Verifying Budget $");
+
+			TestReporter.log("["+projectData[4]+"]");
+			TestReporter.log("["+accounts.getSubmittedBudget()+"]");
+
+			TestReporter.assertEquals(projectData[4],accounts.getSubmittedBudget(),"Verifying Reported $");
+
+			for (String subProject:accounts.getAllSubProjects()){
+				TestReporter.assertTrue(projectDataHashMap.containsKey(project+" / "+subProject),"Verifying sub project [" + subProject + "] was in report");
+
+				accounts.clickSubprojectLink(subProject);
+				PageLoaded.isDomComplete(getDriver());
+
+				String[] subProjectData = projectDataHashMap.get(project + " / " + subProject);
+
+				TestReporter.assertEquals(subProjectData[0],accounts.getSOW(),"Verifying sub project [" + subProject + "] SOW");
+
+				TestReporter.log("["+subProjectData[1]+"]");
+				TestReporter.log("["+accounts.getAllocatedHours()+"]");
+
+				TestReporter.assertEquals(subProjectData[1],accounts.getAllocatedHours(),"Verifying sub project Budget Hours");
+
+				TestReporter.log("["+subProjectData[2]+"]");
+				TestReporter.log("["+accounts.getSubmittedHours()+"]");
+
+				TestReporter.assertEquals(subProjectData[2],accounts.getSubmittedHours(),"Verifying sub project Reported Hours");
+
+				TestReporter.log("["+subProjectData[3]+"]");
+				TestReporter.log("["+accounts.getAllocatedBudget()+"]");
+
+				TestReporter.assertEquals(subProjectData[3],accounts.getAllocatedBudget(),"Verifying sub project Budget $");
+
+				TestReporter.log("["+subProjectData[4]+"]");
+				TestReporter.log("["+accounts.getSubmittedBudget()+"]");
+
+				TestReporter.assertEquals(subProjectData[4],accounts.getSubmittedBudget(),"Verifying sub project Reported $");
+
+				getDriver().navigate().back();
+			}
+			getDriver().navigate().back();
+		}
+
+	}
+
+	private HashMap<String,String[]> getReportData(Report report, String strAccount) {
+		HashMap<String,String[]> projectHashMap = new HashMap<>();
+		for (String project: report.getProjects(strAccount)){
+			projectHashMap.put(project,report.getProjectData(project));
+			for (String subProject:report.getSubProjects(project)){
+				projectHashMap.put(subProject,report.getSubProjectData(subProject));
+			}
+		}
+		return projectHashMap;
+	}
+}
\ No newline at end of file

From 9a25f07e50caf123716234d072e687e95643976e Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Fri, 9 Mar 2018 10:50:24 -0500
Subject: [PATCH 2/2] added comments/documentation and removed some redundant
 methods

---
 ...ava => AccountBurnDownDataReportForm.java} |  4 +-
 .../java/com/orasi/bluesource/Accounts.java   | 49 +++++++++++--
 .../java/com/orasi/bluesource/Report.java     | 50 ++++---------
 ...ava => CreateNewBurnDownReportFormat.java} | 72 ++++++++-----------
 4 files changed, 89 insertions(+), 86 deletions(-)
 rename src/main/java/com/orasi/bluesource/{AccountBurndownDataReportForm.java => AccountBurnDownDataReportForm.java} (91%)
 rename src/test/java/com/bluesource/reports/{CreateNewBurndownReportFormat.java => CreateNewBurnDownReportFormat.java} (70%)

diff --git a/src/main/java/com/orasi/bluesource/AccountBurndownDataReportForm.java b/src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java
similarity index 91%
rename from src/main/java/com/orasi/bluesource/AccountBurndownDataReportForm.java
rename to src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java
index 50e9f72..fc2ed45 100644
--- a/src/main/java/com/orasi/bluesource/AccountBurndownDataReportForm.java
+++ b/src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java
@@ -7,7 +7,7 @@
 import com.orasi.web.webelements.impl.internal.ElementFactory;
 import org.openqa.selenium.support.FindBy;
 
-public class AccountBurndownDataReportForm {
+public class AccountBurnDownDataReportForm {
 	private OrasiDriver driver = null;
 
 	/**Page Elements**/
@@ -17,7 +17,7 @@ public class AccountBurndownDataReportForm {
 	/**
 	 * Constructor
 	 **/
-	public AccountBurndownDataReportForm(OrasiDriver driver) {
+	public AccountBurnDownDataReportForm(OrasiDriver driver) {
 		this.driver = driver;
 		ElementFactory.initElements(driver, this);
 	}
diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index 8ea9c14..908e017 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -60,12 +60,18 @@ public Accounts(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
-
-
+	/**
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns <code>true</code> if the page has a SOW, <code>false</code> otherwise
+	 */
 	public boolean hasSOW(){
 		return driver.findElements(By.xpath("//span[@class='sow_info']")).size() == 1;
 	}
 
+	/**
+	 * @author David Grayson
+	 * @return {@link List<String>} Returns a List of a Projects Sub Projects
+	 */
 	public List<String> getAllSubProjects(){
 		ArrayList<String> subProjects = new ArrayList<>(tblSubProjects.getRowCount());
 		for (int i=1;i<=tblSubProjects.getRowCount();i++){
@@ -74,8 +80,13 @@ public List<String> getAllSubProjects(){
 		return subProjects;
 	}
 
+	/**
+	 * This method should only be called when on a Project or Sub Project page
+	 * @author David Grayson
+	 * @return {@link String} Returns the Budget submitted by a Project or Sub Project
+	 */
 	public String getSubmittedBudget(){
-		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Budget')]/../table")).getRowWithCellText("Submitted");
+		int row = tblProjectBudget.getRowWithCellText("Submitted");
 
 		if(row > 0)
 			return driver.findElement(By.xpath("//h3[contains(text(),'Budget')]/../table/tbody/tr["+row+"]/td[1]")).getText();
@@ -83,8 +94,13 @@ public String getSubmittedBudget(){
 			return "$0.00";
 	}
 
+	/**
+	 * This method should only be called when on a Project or Sub Project page
+	 * @author David Grayson
+	 * @return {@link String} Returns the Budget allocated to a project or sub project as a whole number string
+	 */
 	public String getAllocatedBudget(){
-		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Budget')]/../table")).getRowWithCellText("Allocated");
+		int row = tblProjectBudget.getRowWithCellText("Allocated");
 
 		if (row > 0)
 			return driver.findElement(By.xpath("//h3[contains(text(),'Budget')]/../table/tbody/tr["+row+"]/td[1]")).getText();
@@ -92,8 +108,13 @@ public String getAllocatedBudget(){
 			return "$0.00";
 	}
 
+	/**
+	 * This method should only be called when on a Project or Sub Project page
+	 * @author David Grayson
+	 * @return {@link String} Returns the Hours submitted by a project or sub project as a whole number string
+	 */
 	public String getSubmittedHours(){
-		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Hours')]/../table")).getRowWithCellText("Submitted");
+		int row = tblProjectHours.getRowWithCellText("Submitted");
 
 		if (row > 0)
 			return driver.findElement(By.xpath("//h3[contains(text(),'Hours')]/../table/tbody/tr["+row+"]/td[1]")).getText().replace(".00","").trim();
@@ -101,8 +122,13 @@ public String getSubmittedHours(){
 			return "";
 	}
 
+	/**
+	 * This method should only be called when on a Project or Sub Project page
+	 * @author David Grayson
+	 * @return {@link String} Returns the Hours allocated to a project or sub project as a whole number string
+	 */
 	public String getAllocatedHours(){
-		int row = driver.findWebtable(By.xpath("//h3[contains(text(),'Hours')]/../table")).getRowWithCellText("Allocated");
+		int row = tblProjectHours.getRowWithCellText("Allocated");
 
 		if (row > 0)
 			return driver.findElement(By.xpath("//h3[contains(text(),'Hours')]/../table/tbody/tr["+row+"]/td[1]")).getText().replace(".00","").trim();
@@ -110,6 +136,11 @@ public String getAllocatedHours(){
 			return "";
 	}
 
+	/**
+	 * This method should be called when on the Project page, not the account page
+	 * @author David Grayson
+	 * @return {@link String} Returns the SOW if the project has one, an empty String if it doesn't
+	 */
 	public String getSOW(){
 		if (hasSOW())
 			return elmSOW.getText().replace(" - ","");
@@ -117,13 +148,17 @@ public String getSOW(){
 			return "";
 	}
 
+	/**
+	 * This method should only be called from an accounts page
+	 * @author David Grayson
+	 * @return {@link List<String>} Returns a List of all of an accounts projects
+	 */
 	public List<String> getAllProject(){
 		ArrayList<String> projects = new ArrayList<>(tblProjects.getRowCount());
 		for (int i = 1; i <= tblProjects.getRowCount(); i++) {
 			if (!tblProjects.getCell(i,1).getText().isEmpty())
 				projects.add(tblProjects.getCell(i,1).getText());
 		}
-		TestReporter.log(projects.toString());
 		return projects;
 	}
 
diff --git a/src/main/java/com/orasi/bluesource/Report.java b/src/main/java/com/orasi/bluesource/Report.java
index 5125980..b5f387f 100644
--- a/src/main/java/com/orasi/bluesource/Report.java
+++ b/src/main/java/com/orasi/bluesource/Report.java
@@ -46,38 +46,28 @@ public String getTitle(){
 		return elmReportTitle.getText();
 	}
 
-	public int getProjectCount(String strAccount){
-		int count = 0;
-		for (int i = 1; i<=tblReport.getRowCount(); i++){
-			if (!tblReport.getCell(i,2).getText().contains("/") && tblReport.getCell(i,1).getText().equals(strAccount))
-				count++;
-		}
-		return count;
-	}
-
-	public List<String> getProjects(String strAccount){
+	/**
+	 * @author David Grayson
+	 * @param strAccount {@link String} The name of the Account to get the projects for
+	 * @return {@link List<String>} Returns a String List of Projects and their Sub Projects associated with the Account passed
+	 */
+	public List<String> getAccountProjects(String strAccount){
 		ArrayList<String> projects = new ArrayList<>();
 		for (int i = 1; i <= tblReport.getRowCount(); i++) {
-			if (tblReport.getCell(i,1).getText().equals(strAccount) && !tblReport.getCell(i,2).getText().contains("/"))
+			if (tblReport.getCell(i,1).getText().equals(strAccount) && !tblReport.getCell(i,2).getText().isEmpty())
 				projects.add(tblReport.getCell(i,2).getText());
 		}
 		return projects;
 	}
 
-	public List<String> getSubProjects(String strProject){
-		ArrayList<String> subProjects = new ArrayList<>();
-		for (int i = 1; i <= tblReport.getRowCount(); i++){
-			String temp = tblReport.getCell(i,2).getText();
-			//TestReporter.log("temp: "+temp);
-			if (temp.contains(strProject+" /")){
-				subProjects.add(temp);
-			}
-		}
-		return subProjects;
-	}
-
-	public String[] getProjectData(String strProject){
+	/**
+	 * @author David Grayson
+	 * @param strProject {@link String} The name of the project to get the data for
+	 * @return {@link String[]} Returns a String array of the reports rows data
+	 */
+	public String[] getRowData(String strProject){
 		int row = tblReport.getRowWithCellText(strProject);
+		TestReporter.logStep("Getting row "+row+" data");
 		return new String[]{
 				tblReport.getCell(row,3).getText().trim(), //SOW ID
 				tblReport.getCell(row,4).getText().trim(), //Budget Hrs
@@ -86,16 +76,4 @@ public String[] getProjectData(String strProject){
 				tblReport.getCell(row,7).getText().trim() //Reported $
 		};
 	}
-
-	public String[] getSubProjectData(String strSubProject){
-		int row = tblReport.getRowWithCellText(strSubProject);
-		//TestReporter.log(strProject + " / " + strSubProject);
-		return new String[]{
-				tblReport.getCell(row,3).getText().trim(), // 0 - SOW ID
-				tblReport.getCell(row,4).getText().trim(), // 1 - Budget Hrs
-				tblReport.getCell(row,5).getText().trim(), // 2 - Reported Hrs
-				tblReport.getCell(row,6).getText().trim(), // 3 - Budget $
-				tblReport.getCell(row,7).getText().trim() // 4 - Reported $
-		};
-	}
 }
\ No newline at end of file
diff --git a/src/test/java/com/bluesource/reports/CreateNewBurndownReportFormat.java b/src/test/java/com/bluesource/reports/CreateNewBurnDownReportFormat.java
similarity index 70%
rename from src/test/java/com/bluesource/reports/CreateNewBurndownReportFormat.java
rename to src/test/java/com/bluesource/reports/CreateNewBurnDownReportFormat.java
index 71b31ee..1f2d6d9 100644
--- a/src/test/java/com/bluesource/reports/CreateNewBurndownReportFormat.java
+++ b/src/test/java/com/bluesource/reports/CreateNewBurnDownReportFormat.java
@@ -16,7 +16,7 @@
 import java.util.Date;
 import java.util.HashMap;
 
-public class CreateNewBurndownReportFormat extends WebBaseTest {
+public class CreateNewBurnDownReportFormat extends WebBaseTest {
 	@BeforeMethod
 	@Parameters({"runLocation", "browserUnderTest", "browserVersion",
 			"operatingSystem", "environment"})
@@ -29,7 +29,7 @@ public void setup(@Optional String runLocation, String browserUnderTest,
 		setRunLocation(runLocation);
 		setEnvironment(environment);
 		setThreadDriver(true);
-		testStart("");
+		testStart("Create New Burn Down Report Format");
 	}
 
 	@AfterMethod
@@ -38,13 +38,13 @@ public void close(ITestContext testResults) {
 	}
 
 	@Test
-	public void createNewBurndownReportFormat() {
+	public void createNewBurnDownReportFormat() {
 		//Test Variables
 		String bluesourceURL = "http://10.238.243.127/login";
 		String strAccount = "Account1";
 		SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy");
 		String strCurrentDate = sdf.format(new Date());
-		HashMap<String,String[]> projectDataHashMap = null;
+		HashMap<String,String[]> projectDataHashMap;
 
 
 		//Page Models
@@ -52,43 +52,54 @@ public void createNewBurndownReportFormat() {
 		Header header = new Header(getDriver());
 		Accounts accounts = new Accounts(getDriver());
 		ReportingNavBar reportingNavBar = new ReportingNavBar(getDriver());
-		AccountBurndownDataReportForm form = new AccountBurndownDataReportForm(getDriver());
+		AccountBurnDownDataReportForm form = new AccountBurnDownDataReportForm(getDriver());
 		Report report = new Report(getDriver());
 
+		TestReporter.logStep("Navigating to BlueSource Reporting login");
 		header.navigateReporting();
 
 		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying BlueSource Reporting login page is loaded");
 
+		TestReporter.logStep("Logging in as Admin");
 		loginPage.AdminLogin();
 
 		TestReporter.assertTrue(reportingNavBar.verifyHomePageIsDisplayed(),"Verifying Reporting home page is displayed");
 
+		TestReporter.logStep("Clicking 'Account Reports'");
 		reportingNavBar.clickAccountReports();
 
+		TestReporter.logStep("Clicking 'Burn Down Data'");
 		reportingNavBar.clickBurnDownData();
 
-		TestReporter.assertTrue(form.verifyFormLoaded(), "Verifying Account Burndown Data Report form loaded");
+		TestReporter.assertTrue(form.verifyFormLoaded(), "Verifying Account Burn Down Data Report form loaded");
 
+		TestReporter.logStep("Selecting Account [" + strAccount + "]");
 		form.selectAccount(strAccount);
 
+		TestReporter.logStep("Clicking Generate Report");
 		form.clickGenerateReport();
 
 		TestReporter.assertTrue(report.verifyReportIsLoaded(),"Verifying report page loaded");
 
-		TestReporter.assertEquals("Account Burndown Data Report: " + strCurrentDate,report.getTitle(),"Verifying report title");
+		TestReporter.assertEquals("Account Burn Down Data Report: " + strCurrentDate,report.getTitle(),"Verifying report title");
 
+		TestReporter.logStep("Storing report data for comparison");
 		projectDataHashMap = getReportData(report,strAccount);
 
+		TestReporter.logStep("Navigating to BlueSource login");
 		getDriver().get(bluesourceURL);
 
 		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying BlueSource login page loaded");
 
+		TestReporter.logStep("Logging in as Admin");
 		loginPage.AdminLogin();
 
+		TestReporter.logStep("Navigating to Accounts");
 		header.navigateAccounts();
 
 		TestReporter.assertTrue(accounts.verifyAccountsPageIsLoaded(),"Verifying Accounts page loaded");
 
+		TestReporter.logStep("Clicking [" + strAccount + "] link");
 		accounts.clickAccountLink(strAccount);
 
 		for (String project:accounts.getAllProject()){
@@ -96,78 +107,57 @@ public void createNewBurndownReportFormat() {
 
 			String[] projectData = projectDataHashMap.get(project);
 
+			TestReporter.logStep("Clicking ["+project+"] link");
 			accounts.clickProjectLink(project);
-			PageLoaded.isDomComplete(getDriver());
 
-			TestReporter.log("["+projectData[0]+"]");
-			TestReporter.log("["+accounts.getSOW()+"]");
+			TestReporter.assertTrue(PageLoaded.isDomComplete(getDriver()),"Verifying Project [" + project + "] page is completely loaded");
 
 			TestReporter.assertEquals(projectData[0],accounts.getSOW(),"Verifying Project [" + project + "] SOW");
 
-			TestReporter.log("["+projectData[1]+"]");
-			TestReporter.log("["+accounts.getAllocatedHours()+"]");
-
 			TestReporter.assertEquals(projectData[1],accounts.getAllocatedHours(),"Verifying Budget Hours");
 
-			TestReporter.log("["+projectData[2]+"]");
-			TestReporter.log("["+accounts.getSubmittedHours()+"]");
-
 			TestReporter.assertEquals(projectData[2],accounts.getSubmittedHours(),"Verifying Reported Hours");
 
-			TestReporter.log("["+projectData[3]+"]");
-			TestReporter.log("["+accounts.getAllocatedBudget()+"]");
-
 			TestReporter.assertEquals(projectData[3],accounts.getAllocatedBudget(),"Verifying Budget $");
 
-			TestReporter.log("["+projectData[4]+"]");
-			TestReporter.log("["+accounts.getSubmittedBudget()+"]");
-
 			TestReporter.assertEquals(projectData[4],accounts.getSubmittedBudget(),"Verifying Reported $");
 
 			for (String subProject:accounts.getAllSubProjects()){
 				TestReporter.assertTrue(projectDataHashMap.containsKey(project+" / "+subProject),"Verifying sub project [" + subProject + "] was in report");
 
+				TestReporter.logStep("Clicking ["+subProject+"] link");
 				accounts.clickSubprojectLink(subProject);
-				PageLoaded.isDomComplete(getDriver());
+
+				TestReporter.assertTrue(PageLoaded.isDomComplete(getDriver()),"Verifying Sub Project [" + subProject + "] page is completely loaded");
 
 				String[] subProjectData = projectDataHashMap.get(project + " / " + subProject);
 
 				TestReporter.assertEquals(subProjectData[0],accounts.getSOW(),"Verifying sub project [" + subProject + "] SOW");
 
-				TestReporter.log("["+subProjectData[1]+"]");
-				TestReporter.log("["+accounts.getAllocatedHours()+"]");
-
 				TestReporter.assertEquals(subProjectData[1],accounts.getAllocatedHours(),"Verifying sub project Budget Hours");
 
-				TestReporter.log("["+subProjectData[2]+"]");
-				TestReporter.log("["+accounts.getSubmittedHours()+"]");
-
 				TestReporter.assertEquals(subProjectData[2],accounts.getSubmittedHours(),"Verifying sub project Reported Hours");
 
-				TestReporter.log("["+subProjectData[3]+"]");
-				TestReporter.log("["+accounts.getAllocatedBudget()+"]");
-
 				TestReporter.assertEquals(subProjectData[3],accounts.getAllocatedBudget(),"Verifying sub project Budget $");
 
-				TestReporter.log("["+subProjectData[4]+"]");
-				TestReporter.log("["+accounts.getSubmittedBudget()+"]");
-
 				TestReporter.assertEquals(subProjectData[4],accounts.getSubmittedBudget(),"Verifying sub project Reported $");
 
 				getDriver().navigate().back();
 			}
 			getDriver().navigate().back();
 		}
-
 	}
 
+	/**
+	 * @author David Grayson
+	 * @param report {@link Report} The report page model to get data from
+	 * @param strAccount {@link String} The account to get data for
+	 * @return {@link HashMap<String,String[]>}Returns a HashMap where the keys are the accounts Project/SubProject names and the values are their respective rows data from the report as String[]
+	 */
 	private HashMap<String,String[]> getReportData(Report report, String strAccount) {
 		HashMap<String,String[]> projectHashMap = new HashMap<>();
-		for (String project: report.getProjects(strAccount)){
-			projectHashMap.put(project,report.getProjectData(project));
-			for (String subProject:report.getSubProjects(project)){
-				projectHashMap.put(subProject,report.getSubProjectData(subProject));
-			}
+		for (String project: report.getAccountProjects(strAccount)){
+			projectHashMap.put(project,report.getRowData(project));
 		}
 		return projectHashMap;
 	}