From b4ac04c125f95aeaae71b3b3e742d8e56559aa50 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Tue, 27 Feb 2018 16:22:04 -0500
Subject: [PATCH 1/8] added 2 methods to Accounts.java +
 getRoleRateFromProjectPage + verifyRoleRate

added 1 test to new package "Projects" for Issue 793
+ Show_Rate_on_Project_Show_Page_Verify_Current_Rate
---
 .../java/com/orasi/bluesource/Accounts.java   | 67 +++++++++------
 ...Project_Show_Page_Verify_Current_Rate.java | 82 +++++++++++++++++++
 src/test/resources/sandbox.xml                |  2 +-
 3 files changed, 124 insertions(+), 27 deletions(-)
 create mode 100644 src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java

diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index e24471f..98a76e4 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -1,30 +1,16 @@
 package com.orasi.bluesource;
 
-import java.lang.reflect.UndeclaredThrowableException;
-import java.util.List;
-
-import javax.lang.model.util.Elements;
-
-import org.openqa.selenium.By;
-import org.openqa.selenium.JavascriptExecutor;
-import org.openqa.selenium.NoSuchElementException;
-import org.openqa.selenium.WebElement;
-import org.openqa.selenium.interactions.Actions;
-import org.openqa.selenium.support.FindBy;
-import org.openqa.selenium.support.ui.ExpectedConditions;
-import org.openqa.selenium.support.ui.WebDriverWait;
-
 import com.orasi.utils.Randomness;
-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.Link;
-import com.orasi.web.webelements.Listbox;
-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.By;
+import org.openqa.selenium.NoSuchElementException;
+import org.openqa.selenium.support.FindBy;
+
+import java.lang.reflect.UndeclaredThrowableException;
+import java.util.List;
 
 public class Accounts {
 	private OrasiDriver driver = null;
@@ -46,6 +32,8 @@ 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 = "//*[@id=\"panel_body_4\"]/div/div/table") private Webtable tblProjectRoles;
+	@FindBy(xpath = "//*[@id=\"panel_body_2\"]/div/table") private Webtable tblRoleRates;
 
 	/**Constructor**/
 	public Accounts(OrasiDriver driver){
@@ -55,10 +43,36 @@ public Accounts(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
-	/*
+	/**
+	 * returns <code>true</code> if the rate field from the Rates table on a Project page
+	 * matches the rate on the Rates table on the Role page.
+	 * @author David Grayson
+	 */
+	public boolean verifyRoleRate(String rate) {
+		return tblRoleRates.syncVisible() && tblRoleRates.getRowWithCellText(rate, 5, 1, true) != 0;
+	}
+
+	/**
+	 * Gets the rate field in the Role Table on a project page
+	 * @author David Grayson
+	 * @param role the name of the role to get the rate for
+	 */
+	public String getRoleRateFromProjectPage(String role){
+		final int colPosition = 2;
+		try{
+			int row = tblProjectRoles.getRowWithCellText(role);
+			return tblProjectRoles.getCell(row, colPosition).getText();
+		} catch (NoSuchElementException e){
+			System.out.println("No such exception, Role table on project page not found\n" + e.getLocalizedMessage());
+			e.printStackTrace();
+		}
+		return null;
+	}
+
+	/**
 	 * Click on accounts tab 
 	 * Make sure that the correct page loads
-	 * author: Daniel Smith
+	 * @author: Daniel Smith
 	 */
 	public void click_accounts_tab(String username)
 	{
@@ -116,9 +130,9 @@ public Integer getNumberOfAccounts() {
 		
 	}
 	
-	/*
+	/**
 	 * Change the number showing for accounts per page to 100
-	 * author: Daniel Smith
+	 * @author: Daniel Smith
 	 */
 	public void accountsPerPage()
 	{
@@ -137,7 +151,7 @@ public void accountsPerPage()
 		
 	}
 	
-	/*
+	/**
 	 * Sort accounts table by industry
 	 * @author: Daniel Smith
 	 */
@@ -157,6 +171,7 @@ public void clickAccountLink(String strAccount){
 		String xpathExpression;
 		xpathExpression = "//td//a[contains(text(),'" + strAccount + "')]";
 		Link lnkAccount = driver.findLink(By.xpath(xpathExpression));
+		lnkAccount.syncVisible();
 		lnkAccount.click();
 	}
 	
diff --git a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
new file mode 100644
index 0000000..75e305d
--- /dev/null
+++ b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
@@ -0,0 +1,82 @@
+package com.bluesource.projects;
+
+import com.orasi.bluesource.Accounts;
+import com.orasi.bluesource.Header;
+import com.orasi.bluesource.LoginPage;
+import com.orasi.utils.TestReporter;
+import com.orasi.web.WebBaseTest;
+import org.testng.ITestContext;
+import org.testng.annotations.*;
+
+public class Show_Rate_on_Project_Show_Page_Verify_Current_Rate 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("Show_Rate_on_Project_Show_Page_Verify_Current_Rate");
+	}
+
+	@AfterMethod
+	public void close(ITestContext testResults){
+		endTest("TestAlert", testResults);
+	}
+
+	@Test
+	public void Show_Rate_on_Project_Show_Page_Verify_Current_Rate()
+	{
+		/*
+		1. Open Browser
+		2. Navigate to http://10.238.243.127
+		3. Enter Login info
+		4. click login button
+		5. click on an account name - account info page appears
+		6. click on a project name - project info page appears
+		7. go to roles section - roles table is showing
+		8. click on role name - project roles page appears
+		9. go to rates section - rates is showing table in table header
+		10. verify current rate is displayed
+		11. logout
+		 */
+
+		String strAccount = "Account1";
+		String strProject = "Project2";
+		String strRole = "Role3";
+		String roleRateFromProjectPage = "";
+
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		Accounts accounts = new Accounts(getDriver());
+
+		TestReporter.logStep("Login to application as Account Viewer");
+		loginPage.Login("ACCOUNT_VIEWER");
+
+		TestReporter.logStep("Go to the Accounts page");
+		header.navigateAccounts();
+
+		TestReporter.logStep("Go to Accounts page for [" + strAccount + "]");
+		accounts.clickAccountLink(strAccount);
+
+		TestReporter.logStep("Go to [" + strProject + "] in [" + strAccount + "] page");
+		accounts.clickProjectLink(strProject);
+
+		TestReporter.logStep("Get and store [" + strRole + "] rate");
+		roleRateFromProjectPage = accounts.getRoleRateFromProjectPage(strRole);
+		System.out.println(roleRateFromProjectPage);
+
+		TestReporter.logStep("Go to Role [" + strRole + "] page");
+		accounts.clickRoleLink(strRole);
+
+		TestReporter.assertTrue(accounts.verifyRoleRate(roleRateFromProjectPage),
+				"Verify Role rate from Project page exists on Role page");
+
+
+	}
+}
diff --git a/src/test/resources/sandbox.xml b/src/test/resources/sandbox.xml
index 37bb0d4..b023328 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.projects.Show_Rate_on_Project_Show_Page_Verify_Current_Rate" />
 		</classes>
 	</test>
 

From a7224ab5e79f8a416c08b4fe591818718fbbd630 Mon Sep 17 00:00:00 2001
From: "david.grayson" <david.grayson@orasi.com>
Date: Tue, 27 Feb 2018 16:25:26 -0500
Subject: [PATCH 2/8] added 2 methods to Accounts.java +
 getRoleRateFromProjectPage + verifyRoleRate

added 1 test to new package "Projects" for Issue 793
+ Show_Rate_on_Project_Show_Page_Verify_Current_Rate
---
 .../Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
index 75e305d..c2261b5 100644
--- a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
+++ b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
@@ -69,14 +69,11 @@ public void Show_Rate_on_Project_Show_Page_Verify_Current_Rate()
 
 		TestReporter.logStep("Get and store [" + strRole + "] rate");
 		roleRateFromProjectPage = accounts.getRoleRateFromProjectPage(strRole);
-		System.out.println(roleRateFromProjectPage);
 
 		TestReporter.logStep("Go to Role [" + strRole + "] page");
 		accounts.clickRoleLink(strRole);
 
 		TestReporter.assertTrue(accounts.verifyRoleRate(roleRateFromProjectPage),
 				"Verify Role rate from Project page exists on Role page");
-
-
 	}
 }

From 6c90dc57b9fc86609bfafeea441717ce2c1eb231 Mon Sep 17 00:00:00 2001
From: "david.grayson" <david.grayson@orasi.com>
Date: Wed, 28 Feb 2018 13:18:55 -0500
Subject: [PATCH 3/8] + added excel sheets path to constants as EXCEL_SHEETS +
 added Test for Issue 793 on mustard + added Excel file for test data provider

---
 .../java/com/orasi/bluesource/Accounts.java   |  13 +--
 src/main/java/com/orasi/utils/Constants.java  |   1 +
 .../excelsheets/ShowRateOnProjectVerify.xlsx  | Bin 0 -> 8624 bytes
 ...Show_Rate_on_Project_Show_Page_Verify.java |  76 +++++++++++++++++
 ...Project_Show_Page_Verify_Current_Rate.java |  79 ------------------
 src/test/resources/sandbox.xml                |   2 +-
 6 files changed, 85 insertions(+), 86 deletions(-)
 create mode 100644 src/main/resources/excelsheets/ShowRateOnProjectVerify.xlsx
 create mode 100644 src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
 delete mode 100644 src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java

diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index 98a76e4..76a4760 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -32,8 +32,6 @@ 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 = "//*[@id=\"panel_body_4\"]/div/div/table") private Webtable tblProjectRoles;
-	@FindBy(xpath = "//*[@id=\"panel_body_2\"]/div/table") private Webtable tblRoleRates;
 
 	/**Constructor**/
 	public Accounts(OrasiDriver driver){
@@ -44,12 +42,13 @@ public Accounts(OrasiDriver driver){
 	/**Page Interactions**/
 
 	/**
-	 * returns <code>true</code> if the rate field from the Rates table on a Project page
-	 * matches the rate on the Rates table on the Role page.
+	 * Checks if the rate provided matches the rate field on the Role page
 	 * @author David Grayson
+	 * @return <code>true</code> if the rate field from the Rates table on a Project page
+	 * matches the rate on the Rates table on the Role page, <code>false</code> if not.
 	 */
 	public boolean verifyRoleRate(String rate) {
-		return tblRoleRates.syncVisible() && tblRoleRates.getRowWithCellText(rate, 5, 1, true) != 0;
+		return driver.findWebtable(By.xpath("//th[contains(text(), 'Rate')]/../../..")).getRowWithCellText(rate, 5) != 0;
 	}
 
 	/**
@@ -60,6 +59,7 @@ public boolean verifyRoleRate(String rate) {
 	public String getRoleRateFromProjectPage(String role){
 		final int colPosition = 2;
 		try{
+			Webtable tblProjectRoles = driver.findWebtable(By.xpath("//th[contains(text(), 'Rate')]/../../.."));
 			int row = tblProjectRoles.getRowWithCellText(role);
 			return tblProjectRoles.getCell(row, colPosition).getText();
 		} catch (NoSuchElementException e){
@@ -170,8 +170,9 @@ public void sort_by_industry()
 	public void clickAccountLink(String strAccount){
 		String xpathExpression;
 		xpathExpression = "//td//a[contains(text(),'" + strAccount + "')]";
+		accountsPerPage();
 		Link lnkAccount = driver.findLink(By.xpath(xpathExpression));
-		lnkAccount.syncVisible();
+		//lnkAccount.syncVisible();
 		lnkAccount.click();
 	}
 	
diff --git a/src/main/java/com/orasi/utils/Constants.java b/src/main/java/com/orasi/utils/Constants.java
index 71841a1..f056d02 100644
--- a/src/main/java/com/orasi/utils/Constants.java
+++ b/src/main/java/com/orasi/utils/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
     public final static String USER_CREDENTIALS_PATH = "UserCredentials";
     public final static String SANDBOX_PATH = "/sandbox/";
     public final static String TNSNAMES_PATH = "/database/";
+    final static public String EXCEL_SHEETS = "/excelsheets";
 
     /**
      * Defaults to "./" if there's an exception of any sort.
diff --git a/src/main/resources/excelsheets/ShowRateOnProjectVerify.xlsx b/src/main/resources/excelsheets/ShowRateOnProjectVerify.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..aedd3a004f51612b4d5e98e06de2246e71d247c4
GIT binary patch
literal 8624
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

literal 0
HcmV?d00001

diff --git a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
new file mode 100644
index 0000000..6ae3186
--- /dev/null
+++ b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
@@ -0,0 +1,76 @@
+package com.bluesource.projects;
+
+import com.orasi.bluesource.Accounts;
+import com.orasi.bluesource.Header;
+import com.orasi.bluesource.LoginPage;
+import com.orasi.utils.Constants;
+import com.orasi.utils.TestReporter;
+import com.orasi.utils.dataProviders.ExcelDataProvider;
+import com.orasi.web.WebBaseTest;
+import org.testng.ITestContext;
+import org.testng.annotations.*;
+
+public class Show_Rate_on_Project_Show_Page_Verify extends WebBaseTest {
+	//*****************
+	// Data Provider
+	//*****************
+	@DataProvider(name = "show_project_rate_verify", parallel = true)
+	public Object[][]scenarions(){
+		return new ExcelDataProvider(Constants.EXCEL_SHEETS + "/ShowRateOnProjectVerify.xlsx","Sheet1").getTestData();
+	}
+
+	@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("Show_Rate_on_Project_Show_Page_Verify");
+	}
+
+	@AfterMethod
+	public void close(ITestContext testResults){
+		endTest("TestAlert", testResults);
+	}
+
+	@Test(dataProvider = "show_project_rate_verify")
+	public void Show_Rate_on_Project_Show_Page_Verify(String scenario, String account, String project, String role)
+	{
+		String rateFromProjectPage;
+		TestReporter.logScenario("Scenario: " + scenario + " START");
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		Accounts accounts = new Accounts(getDriver());
+
+		TestReporter.logStep("Login to application as Account Viewer");
+		loginPage.Login("ACCOUNT_VIEWER");
+
+		TestReporter.logStep("Go to the Accounts page");
+		header.navigateAccounts();
+
+		TestReporter.logStep("Go to Accounts page for [" + account + "]");
+		accounts.clickAccountLink(account);
+
+		TestReporter.logStep("Go to [" + project + "] in [" + account + "] page");
+		accounts.clickProjectLink(project);
+
+		TestReporter.logStep("Get and store [" + role + "] rate");
+		rateFromProjectPage = accounts.getRoleRateFromProjectPage(role);
+
+		TestReporter.assertNotNull(rateFromProjectPage,"Check that the rate from Project page isn't null.");
+
+		TestReporter.logStep("Go to Role [" + role + "] page");
+		accounts.clickRoleLink(role);
+
+		TestReporter.assertTrue(accounts.verifyRoleRate(rateFromProjectPage),
+				"Verify Role rate from Project page exists on Role page in scenario \"" + scenario + "\"");
+
+		TestReporter.logScenario("Scenario " + scenario + " END");
+	}
+}
diff --git a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
deleted file mode 100644
index c2261b5..0000000
--- a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.bluesource.projects;
-
-import com.orasi.bluesource.Accounts;
-import com.orasi.bluesource.Header;
-import com.orasi.bluesource.LoginPage;
-import com.orasi.utils.TestReporter;
-import com.orasi.web.WebBaseTest;
-import org.testng.ITestContext;
-import org.testng.annotations.*;
-
-public class Show_Rate_on_Project_Show_Page_Verify_Current_Rate 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("Show_Rate_on_Project_Show_Page_Verify_Current_Rate");
-	}
-
-	@AfterMethod
-	public void close(ITestContext testResults){
-		endTest("TestAlert", testResults);
-	}
-
-	@Test
-	public void Show_Rate_on_Project_Show_Page_Verify_Current_Rate()
-	{
-		/*
-		1. Open Browser
-		2. Navigate to http://10.238.243.127
-		3. Enter Login info
-		4. click login button
-		5. click on an account name - account info page appears
-		6. click on a project name - project info page appears
-		7. go to roles section - roles table is showing
-		8. click on role name - project roles page appears
-		9. go to rates section - rates is showing table in table header
-		10. verify current rate is displayed
-		11. logout
-		 */
-
-		String strAccount = "Account1";
-		String strProject = "Project2";
-		String strRole = "Role3";
-		String roleRateFromProjectPage = "";
-
-		LoginPage loginPage = new LoginPage(getDriver());
-		Header header = new Header(getDriver());
-		Accounts accounts = new Accounts(getDriver());
-
-		TestReporter.logStep("Login to application as Account Viewer");
-		loginPage.Login("ACCOUNT_VIEWER");
-
-		TestReporter.logStep("Go to the Accounts page");
-		header.navigateAccounts();
-
-		TestReporter.logStep("Go to Accounts page for [" + strAccount + "]");
-		accounts.clickAccountLink(strAccount);
-
-		TestReporter.logStep("Go to [" + strProject + "] in [" + strAccount + "] page");
-		accounts.clickProjectLink(strProject);
-
-		TestReporter.logStep("Get and store [" + strRole + "] rate");
-		roleRateFromProjectPage = accounts.getRoleRateFromProjectPage(strRole);
-
-		TestReporter.logStep("Go to Role [" + strRole + "] page");
-		accounts.clickRoleLink(strRole);
-
-		TestReporter.assertTrue(accounts.verifyRoleRate(roleRateFromProjectPage),
-				"Verify Role rate from Project page exists on Role page");
-	}
-}
diff --git a/src/test/resources/sandbox.xml b/src/test/resources/sandbox.xml
index b023328..96283c5 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.projects.Show_Rate_on_Project_Show_Page_Verify_Current_Rate" />
+			<class name="com.bluesource.projects.Show_Rate_on_Project_Show_Page_Verify" />
 		</classes>
 	</test>
 

From 0506664ca45796b31a44c8a225b8b2fcff9908cd Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Wed, 28 Feb 2018 13:18:55 -0500
Subject: [PATCH 4/8] Implementing suggested changes

---
 .../java/com/orasi/bluesource/Accounts.java   |  15 ++--
 src/main/java/com/orasi/utils/Constants.java  |   1 +
 .../excelsheets/ShowRateOnProjectVerify.xlsx  | Bin 0 -> 8624 bytes
 ...Show_Rate_on_Project_Show_Page_Verify.java |  76 +++++++++++++++++
 ...Project_Show_Page_Verify_Current_Rate.java |  79 ------------------
 src/test/resources/sandbox.xml                |   2 +-
 6 files changed, 86 insertions(+), 87 deletions(-)
 create mode 100644 src/main/resources/excelsheets/ShowRateOnProjectVerify.xlsx
 create mode 100644 src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
 delete mode 100644 src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java

diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index 98a76e4..9b407dc 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -32,8 +32,6 @@ 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 = "//*[@id=\"panel_body_4\"]/div/div/table") private Webtable tblProjectRoles;
-	@FindBy(xpath = "//*[@id=\"panel_body_2\"]/div/table") private Webtable tblRoleRates;
 
 	/**Constructor**/
 	public Accounts(OrasiDriver driver){
@@ -44,12 +42,13 @@ public Accounts(OrasiDriver driver){
 	/**Page Interactions**/
 
 	/**
-	 * returns <code>true</code> if the rate field from the Rates table on a Project page
-	 * matches the rate on the Rates table on the Role page.
+	 * Checks if the rate provided matches the rate field on the Role page
 	 * @author David Grayson
+	 * @return <code>true</code> if the rate field from the Rates table on a Project page
+	 * matches the rate on the Rates table on the Role page, <code>false</code> if not.
 	 */
-	public boolean verifyRoleRate(String rate) {
-		return tblRoleRates.syncVisible() && tblRoleRates.getRowWithCellText(rate, 5, 1, true) != 0;
+	public int getRoleRate(String rate) {
+		return driver.findWebtable(By.xpath("//th[contains(text(), 'Rate')]/../../..")).getRowWithCellText(rate, 5);
 	}
 
 	/**
@@ -60,6 +59,7 @@ public boolean verifyRoleRate(String rate) {
 	public String getRoleRateFromProjectPage(String role){
 		final int colPosition = 2;
 		try{
+			Webtable tblProjectRoles = driver.findWebtable(By.xpath("//th[contains(text(), 'Rate')]/../../.."));
 			int row = tblProjectRoles.getRowWithCellText(role);
 			return tblProjectRoles.getCell(row, colPosition).getText();
 		} catch (NoSuchElementException e){
@@ -170,8 +170,9 @@ public void sort_by_industry()
 	public void clickAccountLink(String strAccount){
 		String xpathExpression;
 		xpathExpression = "//td//a[contains(text(),'" + strAccount + "')]";
+		accountsPerPage();
 		Link lnkAccount = driver.findLink(By.xpath(xpathExpression));
-		lnkAccount.syncVisible();
+		//lnkAccount.syncVisible();
 		lnkAccount.click();
 	}
 	
diff --git a/src/main/java/com/orasi/utils/Constants.java b/src/main/java/com/orasi/utils/Constants.java
index 71841a1..f056d02 100644
--- a/src/main/java/com/orasi/utils/Constants.java
+++ b/src/main/java/com/orasi/utils/Constants.java
@@ -28,6 +28,7 @@ public class Constants {
     public final static String USER_CREDENTIALS_PATH = "UserCredentials";
     public final static String SANDBOX_PATH = "/sandbox/";
     public final static String TNSNAMES_PATH = "/database/";
+    final static public String EXCEL_SHEETS = "/excelsheets";
 
     /**
      * Defaults to "./" if there's an exception of any sort.
diff --git a/src/main/resources/excelsheets/ShowRateOnProjectVerify.xlsx b/src/main/resources/excelsheets/ShowRateOnProjectVerify.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..aedd3a004f51612b4d5e98e06de2246e71d247c4
GIT binary patch
literal 8624
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

literal 0
HcmV?d00001

diff --git a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
new file mode 100644
index 0000000..767f3dd
--- /dev/null
+++ b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
@@ -0,0 +1,76 @@
+package com.bluesource.projects;
+
+import com.orasi.bluesource.Accounts;
+import com.orasi.bluesource.Header;
+import com.orasi.bluesource.LoginPage;
+import com.orasi.utils.Constants;
+import com.orasi.utils.TestReporter;
+import com.orasi.utils.dataProviders.ExcelDataProvider;
+import com.orasi.web.WebBaseTest;
+import org.testng.ITestContext;
+import org.testng.annotations.*;
+
+public class Show_Rate_on_Project_Show_Page_Verify extends WebBaseTest {
+	//*****************
+	// Data Provider
+	//*****************
+	@DataProvider(name = "show_project_rate_verify", parallel = true)
+	public Object[][]scenarions(){
+		return new ExcelDataProvider(Constants.EXCEL_SHEETS + "/ShowRateOnProjectVerify.xlsx","Sheet1").getTestData();
+	}
+
+	@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("Show_Rate_on_Project_Show_Page_Verify");
+	}
+
+	@AfterMethod
+	public void close(ITestContext testResults){
+		endTest("TestAlert", testResults);
+	}
+
+	@Test(dataProvider = "show_project_rate_verify")
+	public void Show_Rate_on_Project_Show_Page_Verify(String scenario, String account, String project, String role)
+	{
+		String rateFromProjectPage;
+		TestReporter.logScenario("Scenario: " + scenario + " START");
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		Accounts accounts = new Accounts(getDriver());
+
+		TestReporter.logStep("Login to application as Account Viewer");
+		loginPage.Login("ACCOUNT_VIEWER");
+
+		TestReporter.logStep("Go to the Accounts page");
+		header.navigateAccounts();
+
+		TestReporter.logStep("Go to Accounts page for [" + account + "]");
+		accounts.clickAccountLink(account);
+
+		TestReporter.logStep("Go to [" + project + "] in [" + account + "] page");
+		accounts.clickProjectLink(project);
+
+		TestReporter.logStep("Get and store [" + role + "] rate");
+		rateFromProjectPage = accounts.getRoleRateFromProjectPage(role);
+
+		TestReporter.assertNotNull(rateFromProjectPage,"Check that the rate from Project page isn't null.");
+
+		TestReporter.logStep("Go to Role [" + role + "] page");
+		accounts.clickRoleLink(role);
+
+		TestReporter.assertTrue(accounts.getRoleRate(rateFromProjectPage) != 0,
+				"Verify Role rate from Project page exists on Role page in scenario \"" + scenario + "\"");
+
+		TestReporter.logScenario("Scenario " + scenario + " END");
+	}
+}
diff --git a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
deleted file mode 100644
index c2261b5..0000000
--- a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify_Current_Rate.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.bluesource.projects;
-
-import com.orasi.bluesource.Accounts;
-import com.orasi.bluesource.Header;
-import com.orasi.bluesource.LoginPage;
-import com.orasi.utils.TestReporter;
-import com.orasi.web.WebBaseTest;
-import org.testng.ITestContext;
-import org.testng.annotations.*;
-
-public class Show_Rate_on_Project_Show_Page_Verify_Current_Rate 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("Show_Rate_on_Project_Show_Page_Verify_Current_Rate");
-	}
-
-	@AfterMethod
-	public void close(ITestContext testResults){
-		endTest("TestAlert", testResults);
-	}
-
-	@Test
-	public void Show_Rate_on_Project_Show_Page_Verify_Current_Rate()
-	{
-		/*
-		1. Open Browser
-		2. Navigate to http://10.238.243.127
-		3. Enter Login info
-		4. click login button
-		5. click on an account name - account info page appears
-		6. click on a project name - project info page appears
-		7. go to roles section - roles table is showing
-		8. click on role name - project roles page appears
-		9. go to rates section - rates is showing table in table header
-		10. verify current rate is displayed
-		11. logout
-		 */
-
-		String strAccount = "Account1";
-		String strProject = "Project2";
-		String strRole = "Role3";
-		String roleRateFromProjectPage = "";
-
-		LoginPage loginPage = new LoginPage(getDriver());
-		Header header = new Header(getDriver());
-		Accounts accounts = new Accounts(getDriver());
-
-		TestReporter.logStep("Login to application as Account Viewer");
-		loginPage.Login("ACCOUNT_VIEWER");
-
-		TestReporter.logStep("Go to the Accounts page");
-		header.navigateAccounts();
-
-		TestReporter.logStep("Go to Accounts page for [" + strAccount + "]");
-		accounts.clickAccountLink(strAccount);
-
-		TestReporter.logStep("Go to [" + strProject + "] in [" + strAccount + "] page");
-		accounts.clickProjectLink(strProject);
-
-		TestReporter.logStep("Get and store [" + strRole + "] rate");
-		roleRateFromProjectPage = accounts.getRoleRateFromProjectPage(strRole);
-
-		TestReporter.logStep("Go to Role [" + strRole + "] page");
-		accounts.clickRoleLink(strRole);
-
-		TestReporter.assertTrue(accounts.verifyRoleRate(roleRateFromProjectPage),
-				"Verify Role rate from Project page exists on Role page");
-	}
-}
diff --git a/src/test/resources/sandbox.xml b/src/test/resources/sandbox.xml
index b023328..96283c5 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.projects.Show_Rate_on_Project_Show_Page_Verify_Current_Rate" />
+			<class name="com.bluesource.projects.Show_Rate_on_Project_Show_Page_Verify" />
 		</classes>
 	</test>
 

From d0174aca74ee4d571270d67738d20dce38fbfeb9 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Wed, 7 Mar 2018 08:30:57 -0500
Subject: [PATCH 5/8] Implementing suggested changes, fixed naming conventions

---
 .../java/com/orasi/bluesource/Accounts.java   | 57 +++++++++---
 .../ShowRateOnProjectShowPageVerify.java      | 92 +++++++++++++++++++
 ...Show_Rate_on_Project_Show_Page_Verify.java | 76 ---------------
 src/test/resources/sandbox.xml                |  2 +-
 4 files changed, 135 insertions(+), 92 deletions(-)
 create mode 100644 src/test/java/com/bluesource/projects/ShowRateOnProjectShowPageVerify.java
 delete mode 100644 src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java

diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index 8cec8f8..89e78ab 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -1,6 +1,7 @@
 package com.orasi.bluesource;
 
 import com.orasi.utils.Randomness;
+import com.orasi.utils.TestReporter;
 import com.orasi.web.OrasiDriver;
 import com.orasi.web.PageLoaded;
 import com.orasi.web.webelements.*;
@@ -32,8 +33,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 = "//*[@id=\"panel_body_4\"]/div/div/table") private Webtable tblProjectRoles;
-	@FindBy(xpath = "//*[@id=\"panel_body_2\"]/div/table") private Webtable tblRoleRates;
+	@FindBy(xpath = "//th[contains(text(),'Role')]/../../..") private Webtable tblProjectRoles;
+	@FindBy(xpath = "//th[contains(text(),'Rate')]/../../..") private Webtable tblRoleRates;
+	@FindBy(xpath = "//h4[@class='panel-title' and contains(text(),'Project Info')]") private Element elmProjectInfoPanelHeader;
+	@FindBy(xpath = "//h4[@class='panel-title' and contains(text(),'Role Information')]") private Element elmRoleInfoPanelHeader;
 
 	/**Constructor**/
 	public Accounts(OrasiDriver driver){
@@ -43,32 +46,56 @@ public Accounts(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+	public boolean verifyRolePageIsLoaded(String strAccount, String strProject, String strRole){
+		return PageLoaded.isElementLoaded(this.getClass(),driver,elmRoleInfoPanelHeader,5)
+				&& driver.findElement(By.xpath("//div[@class='breadcrumbs']")).getText()
+				.equals("Accounts - " + strAccount + " - " + strProject + " - " + strRole);
+	}
+
+	public boolean verifyProjectPageIsLoaded(String strAccount, String strProject){
+		return PageLoaded.isElementLoaded(this.getClass(),driver, elmProjectInfoPanelHeader,5)
+				&& driver.findElement(By.xpath("//div[@class='breadcrumbs']")).getText()
+				.equals("Accounts - " + strAccount + " - " + strProject);
+	}
+
+	public boolean verifyAccountPageIsLoaded(String strAccount){
+		String xpath = "//div[@class='breadcrumbs']/a[contains(text(),'" + strAccount + "')]";
+		return PageLoaded.isElementLoaded(this.getClass(),driver,tblProjects,5)
+				&& driver.findLink(By.xpath(xpath)).syncVisible(5,false);
+	}
+
+	/**
+	 * @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);
+	}
+
 	/**
-	 * Checks if the rate provided matches the rate field on the Role page
 	 * @author David Grayson
-	 * @return <code>true</code> if the rate field from the Rates table on a Project page
-	 * matches the rate on the Rates table on the Role page, <code>false</code> if not.
+	 * @return {@link Boolean} Returns <code>true</code> if the rate field from the Rates table on a Project page
+	 * matches the rate on the Rates table on the Role page.
 	 */
-	public int getRoleRate(String rate) {
-		return driver.findWebtable(By.xpath("//th[contains(text(), 'Rate')]/../../..")).getRowWithCellText(rate, 5);
+	public boolean verifyRoleRate(String rate) {
+		TestReporter.log(driver.findElement(By.xpath("//div[@class='breadcrumbs']")).getText());
+		return tblRoleRates.syncVisible() && tblRoleRates.getRowWithCellText(rate, 5, 1, true) != 0;
 	}
 
 	/**
 	 * Gets the rate field in the Role Table on a project page
 	 * @author David Grayson
-	 * @param role the name of the role to get the rate for
+	 * @param role {@link String}the name of the role to get the rate for
+	 * @return {@link String}
 	 */
 	public String getRoleRateFromProjectPage(String role){
 		final int colPosition = 2;
-		try{
-			Webtable tblProjectRoles = driver.findWebtable(By.xpath("//th[contains(text(), 'Rate')]/../../.."));
+		if (tblProjectRoles.syncEnabled(5,false) && tblProjectRoles.syncVisible(5,false)){
 			int row = tblProjectRoles.getRowWithCellText(role);
-			return tblProjectRoles.getCell(row, colPosition).getText();
-		} catch (NoSuchElementException e){
-			System.out.println("No such exception, Role table on project page not found\n" + e.getLocalizedMessage());
-			e.printStackTrace();
+			if (tblProjectRoles.getCell(row,colPosition).isEnabled() && tblProjectRoles.getCell(row,colPosition).isDisplayed())
+				return tblProjectRoles.getCell(row, colPosition).getText();
 		}
-		return null;
+		return "";
 	}
 
 	/**
diff --git a/src/test/java/com/bluesource/projects/ShowRateOnProjectShowPageVerify.java b/src/test/java/com/bluesource/projects/ShowRateOnProjectShowPageVerify.java
new file mode 100644
index 0000000..08d7585
--- /dev/null
+++ b/src/test/java/com/bluesource/projects/ShowRateOnProjectShowPageVerify.java
@@ -0,0 +1,92 @@
+package com.bluesource.projects;
+
+import com.orasi.bluesource.Accounts;
+import com.orasi.bluesource.Header;
+import com.orasi.bluesource.LoginPage;
+import com.orasi.utils.Constants;
+import com.orasi.utils.TestReporter;
+import com.orasi.utils.dataProviders.ExcelDataProvider;
+import com.orasi.web.WebBaseTest;
+import org.testng.ITestContext;
+import org.testng.annotations.*;
+
+public class ShowRateOnProjectShowPageVerify extends WebBaseTest {
+	//*****************
+	// Data Provider
+	//*****************
+	@DataProvider(name = "show_project_rate_verify", parallel = true)
+	public Object[][]scenarions(){
+		return new ExcelDataProvider(Constants.EXCEL_SHEETS + "/ShowRateOnProjectVerify.xlsx","Sheet1").getTestData();
+	}
+
+	@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("Show_Rate_on_Project_Show_Page_Verify");
+	}
+
+	@AfterMethod
+	public void close(ITestContext testResults){
+		endTest("TestAlert", testResults);
+	}
+
+	@Test(dataProvider = "show_project_rate_verify")
+	public void showRateOnProjectShowPageVerify(String strScenario, String strAccount, String strProject, String strRole)
+	{
+		TestReporter.logScenario("Scenario: [" + strScenario + "] START");
+
+		//Test Variables
+		String rateFromProjectPage;
+
+		//Page Models
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		Accounts accounts = new Accounts(getDriver());
+
+		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying Login Page is loaded");
+
+		TestReporter.logStep("Logging in to application as Account Viewer");
+		loginPage.Login("ACCOUNT_VIEWER");
+
+		TestReporter.logStep("Navigating to the Accounts page");
+		header.navigateAccounts();
+
+		TestReporter.assertTrue(accounts.verifyAccountsPageIsLoaded(),"Verifying Accounts Page is loaded");
+
+		TestReporter.assertTrue(accounts.verifyAccountLink(strAccount),"Verifying [" + strAccount + "] link");
+
+		TestReporter.logStep("Clicking link for [" + strAccount + "]");
+		accounts.clickAccountLink(strAccount);
+
+		TestReporter.assertTrue(accounts.verifyAccountPageIsLoaded(strAccount),"Verifying [" + strAccount + "] Page is loaded");
+
+		TestReporter.logStep("Clicking [" + strProject + "] link in [" + strAccount + "] page");
+		accounts.clickProjectLink(strProject);
+
+		TestReporter.assertTrue(accounts.verifyProjectPageIsLoaded(strAccount,strProject),"Verifying [" + strProject + "] Page is loaded");
+
+		TestReporter.logStep("Get and store [" + strRole + "] rate");
+		rateFromProjectPage = accounts.getRoleRateFromProjectPage(strRole);
+
+		TestReporter.assertNotEquals(rateFromProjectPage,"","Verifying valid rate returned from project page");
+
+		TestReporter.logStep("Clicking [" + strRole + "] link");
+		accounts.clickRoleLink(strRole);
+
+		TestReporter.assertTrue(accounts.verifyRolePageIsLoaded(strAccount,strProject,strRole),"Verifying Role page is loaded");
+
+		TestReporter.assertTrue(accounts.verifyRoleRate(rateFromProjectPage),
+				"Verify Role rate from Project page exists on Role page in scenario [" + strScenario + "]");
+
+		TestReporter.logScenario("Scenario [" + strScenario + "] END");
+	}
+}
diff --git a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java b/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
deleted file mode 100644
index 767f3dd..0000000
--- a/src/test/java/com/bluesource/projects/Show_Rate_on_Project_Show_Page_Verify.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package com.bluesource.projects;
-
-import com.orasi.bluesource.Accounts;
-import com.orasi.bluesource.Header;
-import com.orasi.bluesource.LoginPage;
-import com.orasi.utils.Constants;
-import com.orasi.utils.TestReporter;
-import com.orasi.utils.dataProviders.ExcelDataProvider;
-import com.orasi.web.WebBaseTest;
-import org.testng.ITestContext;
-import org.testng.annotations.*;
-
-public class Show_Rate_on_Project_Show_Page_Verify extends WebBaseTest {
-	//*****************
-	// Data Provider
-	//*****************
-	@DataProvider(name = "show_project_rate_verify", parallel = true)
-	public Object[][]scenarions(){
-		return new ExcelDataProvider(Constants.EXCEL_SHEETS + "/ShowRateOnProjectVerify.xlsx","Sheet1").getTestData();
-	}
-
-	@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("Show_Rate_on_Project_Show_Page_Verify");
-	}
-
-	@AfterMethod
-	public void close(ITestContext testResults){
-		endTest("TestAlert", testResults);
-	}
-
-	@Test(dataProvider = "show_project_rate_verify")
-	public void Show_Rate_on_Project_Show_Page_Verify(String scenario, String account, String project, String role)
-	{
-		String rateFromProjectPage;
-		TestReporter.logScenario("Scenario: " + scenario + " START");
-		LoginPage loginPage = new LoginPage(getDriver());
-		Header header = new Header(getDriver());
-		Accounts accounts = new Accounts(getDriver());
-
-		TestReporter.logStep("Login to application as Account Viewer");
-		loginPage.Login("ACCOUNT_VIEWER");
-
-		TestReporter.logStep("Go to the Accounts page");
-		header.navigateAccounts();
-
-		TestReporter.logStep("Go to Accounts page for [" + account + "]");
-		accounts.clickAccountLink(account);
-
-		TestReporter.logStep("Go to [" + project + "] in [" + account + "] page");
-		accounts.clickProjectLink(project);
-
-		TestReporter.logStep("Get and store [" + role + "] rate");
-		rateFromProjectPage = accounts.getRoleRateFromProjectPage(role);
-
-		TestReporter.assertNotNull(rateFromProjectPage,"Check that the rate from Project page isn't null.");
-
-		TestReporter.logStep("Go to Role [" + role + "] page");
-		accounts.clickRoleLink(role);
-
-		TestReporter.assertTrue(accounts.getRoleRate(rateFromProjectPage) != 0,
-				"Verify Role rate from Project page exists on Role page in scenario \"" + scenario + "\"");
-
-		TestReporter.logScenario("Scenario " + scenario + " END");
-	}
-}
diff --git a/src/test/resources/sandbox.xml b/src/test/resources/sandbox.xml
index 96283c5..da0ac1f 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.projects.Show_Rate_on_Project_Show_Page_Verify" />
+			<class name="com.bluesource.projects.ShowRateOnProjectShowPageVerify" />
 		</classes>
 	</test>
 

From 41c6e194d8012d2e1287ee67256bc621b969f812 Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Wed, 7 Mar 2018 08:36:20 -0500
Subject: [PATCH 6/8] added comments/documentation

---
 .../java/com/orasi/bluesource/Accounts.java    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index 89e78ab..0b33471 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -46,18 +46,36 @@ public Accounts(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+	/**
+	 * @author David Grayson
+	 * @param strAccount {@link String} name of Roles parent account
+	 * @param strProject {@link String} name of Roles parent project
+	 * @param strRole {@link String} name of role
+	 * @return {@link Boolean} Returns <code>true</code> if the provided Roles page is loaded, <code>false</code> otherwise.
+	 */
 	public boolean verifyRolePageIsLoaded(String strAccount, String strProject, String strRole){
 		return PageLoaded.isElementLoaded(this.getClass(),driver,elmRoleInfoPanelHeader,5)
 				&& driver.findElement(By.xpath("//div[@class='breadcrumbs']")).getText()
 				.equals("Accounts - " + strAccount + " - " + strProject + " - " + strRole);
 	}
 
+	/**
+	 * @author David Grayson
+	 * @param strAccount {@link String} name of Projects parent account
+	 * @param strProject {@link String} name of project
+	 * @return {@link Boolean} Returns <code>true</code> if the provided Projects page is loaded, <code>false</code> otherwise.
+	 */
 	public boolean verifyProjectPageIsLoaded(String strAccount, String strProject){
 		return PageLoaded.isElementLoaded(this.getClass(),driver, elmProjectInfoPanelHeader,5)
 				&& driver.findElement(By.xpath("//div[@class='breadcrumbs']")).getText()
 				.equals("Accounts - " + strAccount + " - " + strProject);
 	}
 
+	/**
+	 * @author David Grayson
+	 * @param strAccount {@link String} name of Account
+	 * @return {@link Boolean} Returns <code>true</code> if the provided Accounts page is loaded, <code>false</code> otherwise.
+	 */
 	public boolean verifyAccountPageIsLoaded(String strAccount){
 		String xpath = "//div[@class='breadcrumbs']/a[contains(text(),'" + strAccount + "')]";
 		return PageLoaded.isElementLoaded(this.getClass(),driver,tblProjects,5)

From c1312a331284761cc2ed30a5c9ba2dda07abdd2a Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Fri, 9 Mar 2018 16:24:26 -0500
Subject: [PATCH 7/8] Test passes

---
 .../AccountBurnDownDataReportForm.java        |  46 ++++++
 .../java/com/orasi/bluesource/Accounts.java   |  22 +++
 .../com/orasi/bluesource/AddDocumentForm.java |  93 ++++++++++++
 .../java/com/orasi/bluesource/Header.java     |  10 ++
 .../java/com/orasi/bluesource/Report.java     |  56 +++++++
 .../com/orasi/bluesource/ReportingNavBar.java |  59 ++++++++
 .../orasi/bluesource/UpdateDocumentForm.java  |  28 ++++
 ...LongDecimalsOnBurnDownTableTotalHours.java | 137 ++++++++++++++++++
 8 files changed, 451 insertions(+)
 create mode 100644 src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java
 create mode 100644 src/main/java/com/orasi/bluesource/AddDocumentForm.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/main/java/com/orasi/bluesource/UpdateDocumentForm.java
 create mode 100644 src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.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..fc2ed45
--- /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 0b33471..f65e6f1 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -37,6 +37,8 @@ public class Accounts {
 	@FindBy(xpath = "//th[contains(text(),'Rate')]/../../..") private Webtable tblRoleRates;
 	@FindBy(xpath = "//h4[@class='panel-title' and contains(text(),'Project Info')]") private Element elmProjectInfoPanelHeader;
 	@FindBy(xpath = "//h4[@class='panel-title' and contains(text(),'Role Information')]") private Element elmRoleInfoPanelHeader;
+	@FindBy(xpath = "//h4[@class='panel-title'and contains(text(),'Documents')]/../button") private Button btnProjectAddDocument;
+	@FindBy(xpath = "//th[contains(text(),'Document')]/../../..") private Webtable tblDocuments;
 
 	/**Constructor**/
 	public Accounts(OrasiDriver driver){
@@ -46,6 +48,26 @@ public Accounts(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+	public void clickEditDocument(String document){
+		if (canInteract(tblDocuments)){
+			int row = tblDocuments.getRowWithCellText(document);
+			tblDocuments.findElement(By.xpath("//tr[" + row + "]//a[@class='glyphicon glyphicon-pencil']")).click();
+		}
+	}
+
+	public boolean verifyDocumentExists(String document){
+		return tblDocuments.getRowWithCellText(document) > 0;
+	}
+
+	public void clickAddDocument(){
+		if (canInteract(btnProjectAddDocument))
+			btnProjectAddDocument.click();
+	}
+
+	private boolean canInteract(Element element) {
+		return element.syncEnabled(5) && element.syncVisible(5);
+	}
+
 	/**
 	 * @author David Grayson
 	 * @param strAccount {@link String} name of Roles parent account
diff --git a/src/main/java/com/orasi/bluesource/AddDocumentForm.java b/src/main/java/com/orasi/bluesource/AddDocumentForm.java
new file mode 100644
index 0000000..c2a83d9
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/AddDocumentForm.java
@@ -0,0 +1,93 @@
+package com.orasi.bluesource;
+
+import com.orasi.web.OrasiDriver;
+import com.orasi.web.PageLoaded;
+import com.orasi.web.webelements.Button;
+import com.orasi.web.webelements.Checkbox;
+import com.orasi.web.webelements.Element;
+import com.orasi.web.webelements.Textbox;
+import com.orasi.web.webelements.impl.internal.ElementFactory;
+import org.openqa.selenium.support.FindBy;
+
+import java.text.DecimalFormat;
+import java.util.List;
+
+public class AddDocumentForm {
+	private OrasiDriver driver = null;
+
+	/**Page Elements**/
+	@FindBy(xpath = "//form[@id='new_document']") private Element elmAddDocumentForm;
+	@FindBy(xpath = "//input[@name='document[file]']") private Element elmDocumentFile;
+	@FindBy(xpath = "//span[@class='select2-results']/ul/li") private List<Element> elmDocumentTypeOptions;
+	@FindBy(xpath = "//input[@id='document_budget']") private Textbox txtTotalBudget;
+	@FindBy(xpath = "//input[@id='document_hours']") private Textbox txtTotalHours;
+	@FindBy(xpath = "//input[@id='document_signed']") private Checkbox chkSigned;
+	@FindBy(xpath = "//input[@value='Create Document']") private Element elmCreateDocument;
+	@FindBy(xpath = "//form[@id='new_document']//span[@role='combobox']") private Element elmDocumentType;
+
+	/**
+	 * Constructor
+	 **/
+	public AddDocumentForm(OrasiDriver driver) {
+		this.driver = driver;
+		ElementFactory.initElements(driver, this);
+	}
+
+	/**Page Interactions**/
+
+	public boolean verifyFormLoaded(){
+		return PageLoaded.isElementLoaded(this.getClass(),driver,elmAddDocumentForm,5);
+	}
+
+	public void setFile(String filePath){
+		if (canInteract(elmDocumentFile))
+			elmDocumentFile.sendKeys(filePath);
+	}
+
+	public String getFileName(){
+		if (canInteract(elmDocumentFile))
+			return elmDocumentFile.getText();
+		else
+			return "";
+	}
+
+	public void clickCreateDocument(){
+		if (canInteract(elmCreateDocument))
+			elmCreateDocument.click();
+	}
+
+	public void selectDocumentType(String type){
+		if (canInteract(elmDocumentType)){
+			elmDocumentType.click();
+			for (Element elm:elmDocumentTypeOptions){
+				if (elm.getText().equals(type)){
+					elm.click();
+					break;
+				}
+			}
+		}
+	}
+
+	public void setTotalHours(double hours){
+		if (canInteract(txtTotalHours)){
+			txtTotalHours.clear();
+			txtTotalHours.sendKeys(new DecimalFormat("####.00").format(hours));
+		}
+	}
+
+	public void setTotalBudget(int budget){
+		if (canInteract(txtTotalBudget)){
+			txtTotalBudget.clear();
+			txtTotalBudget.sendKeys(String.valueOf(budget));
+		}
+	}
+
+	public void checkSigned(){
+		if (canInteract(chkSigned))
+			chkSigned.check();
+	}
+
+	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/Header.java b/src/main/java/com/orasi/bluesource/Header.java
index 3522250..05794ac 100644
--- a/src/main/java/com/orasi/bluesource/Header.java
+++ b/src/main/java/com/orasi/bluesource/Header.java
@@ -27,6 +27,16 @@ 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..059f41b
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/Report.java
@@ -0,0 +1,56 @@
+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.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**/
+
+	/**
+	 * @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 boolean doesReportHaveLongDecimals(){
+		for (int i = 1; i <= tblReport.getRowCount(); i++){
+			for (int x = 1; x <= 7; x++){
+				if (tblReport.getCellData(i,x).contains(".")){
+					String[] split = tblReport.getCellData(i,x).split("[.]");
+					if (split[1].length()>2)
+						return true;
+				}
+			}
+		}
+		return false;
+	}
+}
\ 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..aac9d07
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/ReportingNavBar.java
@@ -0,0 +1,59 @@
+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 = "//h1[text()='Welcome']") private Element elmWelcome;
+	@FindBy(xpath = "//span[contains(text(),'Account Reports')]/..") private Link lnkAccountReportsDropdown;
+	@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**/
+
+	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();
+	}
+
+	/**
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns <code>true</code> if on the Reporting Home page.
+	 */
+	public boolean verifyHomePageIsDisplayed(){
+		return elmWelcome.syncVisible(5,false);
+	}
+
+	/**
+	 * 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/main/java/com/orasi/bluesource/UpdateDocumentForm.java b/src/main/java/com/orasi/bluesource/UpdateDocumentForm.java
new file mode 100644
index 0000000..92aea53
--- /dev/null
+++ b/src/main/java/com/orasi/bluesource/UpdateDocumentForm.java
@@ -0,0 +1,28 @@
+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 UpdateDocumentForm {
+	private OrasiDriver driver = null;
+
+	/**Page Elements**/
+	@FindBy(xpath = "//a[@data-method='delete']") private Link lnkDelete;
+
+	/**
+	 * Constructor
+	 **/
+	public UpdateDocumentForm(OrasiDriver driver) {
+		this.driver = driver;
+		ElementFactory.initElements(driver, this);
+	}
+
+	/**Page Interactions**/
+
+	public void clickDelete(){
+		lnkDelete.syncVisible(5);
+		lnkDelete.click();
+	}
+}
\ No newline at end of file
diff --git a/src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.java b/src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.java
new file mode 100644
index 0000000..428c778
--- /dev/null
+++ b/src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.java
@@ -0,0 +1,137 @@
+package com.bluesource.reports;
+
+import com.orasi.bluesource.*;
+import org.bouncycastle.jce.provider.symmetric.TEA;
+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.utils.TestReporter;
+import com.orasi.web.WebBaseTest;
+
+public class LongDecimalsOnBurnDownTableTotalHours 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 longDecimalsOnBurnDownTableTotalHours() {
+		//Test Variables
+		String strAccount = "Account1";
+		String strProject = "Project1";
+		String filePath = "C:\\Users\\david.grayson\\Documents\\SOW.txt";
+		String docName = "Project1-SOW";
+		int budget = 549875625;
+		double hours = 131.81;
+
+		//Page Models
+		LoginPage loginPage = new LoginPage(getDriver());
+		Header header = new Header(getDriver());
+		Accounts accounts = new Accounts(getDriver());
+		AddDocumentForm addDocumentForm = new AddDocumentForm(getDriver());
+		ReportingNavBar reportingNavBar = new ReportingNavBar(getDriver());
+		AccountBurnDownDataReportForm burnDownDataReportForm = new AccountBurnDownDataReportForm(getDriver());
+		Report report = new Report(getDriver());
+		UpdateDocumentForm updateDocumentForm = new UpdateDocumentForm(getDriver());
+
+
+		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying BlueSource login page is loaded");
+
+		TestReporter.logStep("Logging in as Admin");
+		loginPage.AdminLogin();
+
+		TestReporter.logStep("Navigating to Accounts");
+		header.navigateAccounts();
+
+		TestReporter.assertTrue(accounts.verifyAccountLink(strAccount),"Verifying account ["+strAccount+"] link");
+
+		TestReporter.logStep("Clicking account ["+strAccount+"] link");
+		accounts.clickAccountLink(strAccount);
+
+		TestReporter.assertTrue(accounts.verifyAccountPageIsLoaded(strAccount),"Verifying ["+strAccount+"] page is loaded");
+
+		TestReporter.logStep("Clicking project ["+strProject+"] link");
+		accounts.clickProjectLink(strProject);
+
+		TestReporter.assertTrue(accounts.verifyProjectPageIsLoaded(strAccount,strProject),"Verifying ["+strProject+"] page is loaded");
+
+		TestReporter.logStep("Checking if document already exists");
+		if (accounts.verifyDocumentExists(docName)){
+			TestReporter.logStep("Document exists, deleting");
+			accounts.clickEditDocument(docName);
+			updateDocumentForm.clickDelete();
+		} else {
+			TestReporter.logStep("Document does not exist");
+		}
+
+		TestReporter.logStep("Clicking Add Document");
+		accounts.clickAddDocument();
+
+		TestReporter.assertTrue(addDocumentForm.verifyFormLoaded(),"Verifying Add Document form loaded");
+
+		TestReporter.logStep("Setting File to upload");
+		addDocumentForm.setFile(filePath);
+
+		TestReporter.logStep("Setting Document Type");
+		addDocumentForm.selectDocumentType("SOW");
+
+		TestReporter.logStep("Setting Total Budget");
+		addDocumentForm.setTotalBudget(budget);
+
+		TestReporter.logStep("Setting Total Hours");
+		addDocumentForm.setTotalHours(hours);
+
+		TestReporter.logStep("Setting 'Signed' to checked");
+		addDocumentForm.checkSigned();
+
+		TestReporter.logStep("Clicking Create Document");
+		addDocumentForm.clickCreateDocument();
+
+		TestReporter.assertTrue(accounts.verifyDocumentExists(docName),"Verifying new Document is on page");
+
+		TestReporter.logStep("Navigating to BlueSource Reporting");
+		header.navigateReporting();
+
+		TestReporter.assertTrue(loginPage.verifyPageIsLoaded(),"Verifying BlueSource Reporting login page 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(burnDownDataReportForm.verifyFormLoaded(), "Verifying Account Burn Down Report form loaded");
+
+		TestReporter.logStep("Selecting [" + strAccount + "] for report");
+		burnDownDataReportForm.selectAccount(strAccount);
+
+		TestReporter.logStep("Clicking Generate Report");
+		burnDownDataReportForm.clickGenerateReport();
+
+		TestReporter.assertFalse(report.doesReportHaveLongDecimals(),"Verifying that the report doesn't have long decimals in any field");
+	}
+}
\ No newline at end of file

From c244995dfcd3fd5a53ad0ad319a35fc0757c5c2f Mon Sep 17 00:00:00 2001
From: David Grayson <david.grayson@orasi.com>
Date: Fri, 9 Mar 2018 16:35:15 -0500
Subject: [PATCH 8/8] Added comments/documentation

---
 .../AccountBurnDownDataReportForm.java        |  6 ++++++
 .../java/com/orasi/bluesource/Accounts.java   | 19 +++++++++++++++++++
 .../com/orasi/bluesource/AddDocumentForm.java | 18 +++++++++++++-----
 .../java/com/orasi/bluesource/Report.java     |  4 ++++
 ...LongDecimalsOnBurnDownTableTotalHours.java |  4 ++++
 5 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java b/src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java
index fc2ed45..47efbf0 100644
--- a/src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java
+++ b/src/main/java/com/orasi/bluesource/AccountBurnDownDataReportForm.java
@@ -40,6 +40,12 @@ public void selectAccount(String strAccount){
 		}
 	}
 
+	/**
+	 * 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);
 	}
diff --git a/src/main/java/com/orasi/bluesource/Accounts.java b/src/main/java/com/orasi/bluesource/Accounts.java
index f65e6f1..bb5468d 100644
--- a/src/main/java/com/orasi/bluesource/Accounts.java
+++ b/src/main/java/com/orasi/bluesource/Accounts.java
@@ -48,6 +48,10 @@ public Accounts(OrasiDriver driver){
 	
 	/**Page Interactions**/
 
+	/**
+	 * @author David Grayson
+	 * @param document {@link String} name of the document to edit
+	 */
 	public void clickEditDocument(String document){
 		if (canInteract(tblDocuments)){
 			int row = tblDocuments.getRowWithCellText(document);
@@ -55,15 +59,30 @@ public void clickEditDocument(String document){
 		}
 	}
 
+	/**
+	 * @author David Grayson
+	 * @param document {@link String} the name of the document to find
+	 * @return {@link Boolean} Returns true if a document of the name provided exists in the documents table
+	 */
 	public boolean verifyDocumentExists(String document){
 		return tblDocuments.getRowWithCellText(document) > 0;
 	}
 
+	/**
+	 * Clicks the add document button in Account or Project pages
+	 * @author David Grayson
+	 */
 	public void clickAddDocument(){
 		if (canInteract(btnProjectAddDocument))
 			btnProjectAddDocument.click();
 	}
 
+	/**
+	 * This method provides standard checks that an element can be interacted with
+	 * @author David Grayson
+	 * @param element {@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 element) {
 		return element.syncEnabled(5) && element.syncVisible(5);
 	}
diff --git a/src/main/java/com/orasi/bluesource/AddDocumentForm.java b/src/main/java/com/orasi/bluesource/AddDocumentForm.java
index c2a83d9..6e9d677 100644
--- a/src/main/java/com/orasi/bluesource/AddDocumentForm.java
+++ b/src/main/java/com/orasi/bluesource/AddDocumentForm.java
@@ -24,6 +24,7 @@ public class AddDocumentForm {
 	@FindBy(xpath = "//input[@id='document_signed']") private Checkbox chkSigned;
 	@FindBy(xpath = "//input[@value='Create Document']") private Element elmCreateDocument;
 	@FindBy(xpath = "//form[@id='new_document']//span[@role='combobox']") private Element elmDocumentType;
+	@FindBy(xpath = "//input[@id='document_name']") private Textbox txtDocumentName;
 
 	/**
 	 * Constructor
@@ -39,16 +40,17 @@ public boolean verifyFormLoaded(){
 		return PageLoaded.isElementLoaded(this.getClass(),driver,elmAddDocumentForm,5);
 	}
 
+	/**
+	 * @author David Grayson
+	 * @param filePath {@link String} the complete path for the file to be uploaded
+	 */
 	public void setFile(String filePath){
 		if (canInteract(elmDocumentFile))
 			elmDocumentFile.sendKeys(filePath);
 	}
 
-	public String getFileName(){
-		if (canInteract(elmDocumentFile))
-			return elmDocumentFile.getText();
-		else
-			return "";
+	public String getDocumentName(){
+		return txtDocumentName.getText();
 	}
 
 	public void clickCreateDocument(){
@@ -87,6 +89,12 @@ public void checkSigned(){
 			chkSigned.check();
 	}
 
+	/**
+	 * 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);
 	}
diff --git a/src/main/java/com/orasi/bluesource/Report.java b/src/main/java/com/orasi/bluesource/Report.java
index 059f41b..72f1f71 100644
--- a/src/main/java/com/orasi/bluesource/Report.java
+++ b/src/main/java/com/orasi/bluesource/Report.java
@@ -41,6 +41,10 @@ public String getTitle(){
 		return elmReportTitle.getText();
 	}
 
+	/**
+	 * @author David Grayson
+	 * @return {@link Boolean} Returns true if a report has a field with more than 2 decimals
+	 */
 	public boolean doesReportHaveLongDecimals(){
 		for (int i = 1; i <= tblReport.getRowCount(); i++){
 			for (int x = 1; x <= 7; x++){
diff --git a/src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.java b/src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.java
index 428c778..992e456 100644
--- a/src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.java
+++ b/src/test/java/com/bluesource/reports/LongDecimalsOnBurnDownTableTotalHours.java
@@ -1,6 +1,7 @@
 package com.bluesource.reports;
 
 import com.orasi.bluesource.*;
+import com.orasi.web.webelements.Textbox;
 import org.bouncycastle.jce.provider.symmetric.TEA;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
@@ -94,6 +95,9 @@ public void longDecimalsOnBurnDownTableTotalHours() {
 		TestReporter.logStep("Setting Document Type");
 		addDocumentForm.selectDocumentType("SOW");
 
+		TestReporter.logStep("Getting Document Name");
+		docName = addDocumentForm.getDocumentName();
+
 		TestReporter.logStep("Setting Total Budget");
 		addDocumentForm.setTotalBudget(budget);