Develop

.gitignore

@@ -1,7 +1,20 @@
-
+config/*.xml
+ !config/config.xml
+ *.iml
+ .idea
+ ui/
+ automated-perf-test
+ uiServices/test/*.xml
 *.bak
 main
 .idea
 ui/
 **/node_modules
-/.editorconfig
+/.editorconfig
+config/*.xml
+!config/config.xml
+*.iml
+.idea
+ui/
+automated-perf-test
+uiServices/test/*.xml

main.go

@@ -5,14 +5,15 @@ import (
 	"encoding/xml"
 	"flag"
 	"fmt"
-	log "github.com/Sirupsen/logrus"
-	"github.com/xtracdev/automated-perf-test/perfTestUtils"
-	"github.com/xtracdev/automated-perf-test/testStrategies"
-	"github.com/xtracdev/automated-perf-test/uiServices/src"
 	"io/ioutil"
 	"net/http"
 	"os"
 	"time"
+
+	log "github.com/Sirupsen/logrus"
+	"github.com/xtracdev/automated-perf-test/perfTestUtils"
+	"github.com/xtracdev/automated-perf-test/testStrategies"
+	"github.com/xtracdev/automated-perf-test/uiServices/src"
 )
 
 //----- Globals ------------------------------------------------------------------
@@ -147,7 +148,7 @@ func initConfig(args []string, fs perfTestUtils.FileSystem, exit func(code int))
 
 	// Start server for the User Interface Mode
 	if uiMode {
-		services.StartUiMode()
+		services.StartUIMode()
 	}
 
 	setLogLevel(boolVerbose, boolDebug)

testStrategies/commonToAllTestStrategies.go

@@ -50,23 +50,23 @@ type ResponseValue struct {
 
 // TestDefinition encapsulates the XML data.
 type TestDefinition struct {
-	XMLName             xml.Name             `xml:"testDefinition" json:"testDefinition"`
-	TestName            string               `xml:"testName" json:"testName"`
-	OverrideHost        string               `xml:"overrideHost" json:"overrideHost"`
-	OverridePort        string               `xml:"overridePort" json:"overridePort"`
-	HTTPMethod          string               `xml:"httpMethod" json:"httpMethod"`
-	Description         string               `xml:"description" json:"description"`
-	BaseURI             string               `xml:"baseUri" json:"baseUri"`
-	Multipart           bool                 `xml:"multipart" json:"multipart"`
-	Payload             string               `xml:"payload" json:"payload"`
-	MultipartPayload    []multipartFormField `xml:"multipartPayload>multipartFormField" json:"multipartPayload"`
-	ResponseStatusCode  int                  `xml:"responseStatusCode" json:"responseStatusCode"`
-	ResponseContentType string               `xml:"responseContentType" json:"responseContentType"`
-	Headers             []Header             `xml:"headers>header" json:"headers"`
-	ResponseValues      []ResponseValue      `xml:"responseProperties>value" json:"responseValues"`
-	PreThinkTime        int64
-	PostThinkTime       int64
-	ExecWeight          string
+	XMLName             xml.Name             `xml:"testDefinition"`
+	TestName            string               `xml:"testName"`
+	OverrideHost        string               `xml:"overrideHost"`
+	OverridePort        string               `xml:"overridePort"`
+	HTTPMethod          string               `xml:"httpMethod"`
+	Description         string               `xml:"description"`
+	BaseURI             string               `xml:"baseUri"`
+	Multipart           bool                 `xml:"multipart"`
+	Payload             string               `xml:"payload"`
+	MultipartPayload    []multipartFormField `xml:"multipartPayload>multipartFormField"`
+	ResponseStatusCode  int                  `xml:"responseStatusCode"`
+	ResponseContentType string               `xml:"responseContentType"`
+	Headers             []Header             `xml:"headers>header"`
+	ResponseValues      []ResponseValue      `xml:"responseProperties>value"`
+	PreThinkTime        int64                `xml:"preThinkTime"`
+	PostThinkTime       int64                `xml:"postThinkTime"`
+	ExecWeight          string               `xml:"execWeight"`
 }
 
 // TestSuite fields get populated from the TestSuiteDefinition after the XML
@@ -75,17 +75,18 @@ type TestSuite struct {
 	XMLName         xml.Name   `xml:"testSuite"`
 	Name            string     `xml:"name" json:"name"`
 	Description     string     `xml:"description" json:"description"`
-	TestStrategy    string     `xml:"testStrategy" json:"testStrategy"`
-	TestCases       []TestCase `xml:"testCases>testCase" json:"testCases"`
+	TestStrategy    string     `xml:"testStrategy"`
+	TestCases       []TestCase `xml:"testCases>testCase"`
 	TestDefinitions []*TestDefinition
 }
 
 // TestCase is used to encapsulate and marshal a <testCase> tag from the
 // <testSuite> XML file. This data will then be consolidated into
 // the TestSuite/TestDefinition data structure for usage.
 type TestCase struct {
-	XMLName       xml.Name `xml:"testCase" json:"testCase"`
+	XMLName       xml.Name `xml:"testCase"`
 	Name          string   `xml:",chardata"`
+	Description   string   `xml:"description,attr" json:"description"`
 	PreThinkTime  int64    `xml:"preThinkTime,attr" json:"preThinkTime"`
 	PostThinkTime int64    `xml:"postThinkTime,attr" json:"postThinkTime"`
 	ExecWeight    string   `xml:"execWeight,attr" json:"execWeight"`

ui-src/e2e/components/configurationComponent.e2e-spec.ts

@@ -1,3 +1,4 @@
+
 import {
   browser,
   element,
@@ -36,11 +37,6 @@ describe("configuration component", () => {
     );
   });
 
-  it("should show submit button is disabled when requiredFields data is blank", () => {
-    // used to clear default data in this test
-    configPO.checkRequiredFields();
-    expect(configPO.submitBtn.isEnabled()).toBe(false);
-  });
 
   it("should check that all text box names are correct", () => {
     configPO.setConfigData();
@@ -65,7 +61,7 @@ describe("configuration component", () => {
 
   it("should check values of existing file are as expected", () => {
     configPO.configFilePath.sendKeys(configPO.absolutePath);
-    configPO.xmlFileName.sendKeys("config.xml");
+    configPO.xmlFileName.sendKeys("config");
     configPO.cancelBtn.click();
     expect(configPO.applicationName.getAttribute("value")).toEqual("config");
     expect(configPO.targetHost.getAttribute("value")).toEqual("localhost");
@@ -85,9 +81,10 @@ describe("configuration component", () => {
     expect(configPO.requestDelay.getAttribute("value")).toEqual("5000");
     expect(configPO.tpsFreq.getAttribute("value")).toEqual("30");
     expect(configPO.rampDelay.getAttribute("value")).toEqual("15");
-    expect(configPO.rampUsers.getAttribute("value")).toEqual("5");
+    expect(configPO.rampUsers.getAttribute("value")).toEqual("15");
   });
 
+
   it("should throw error when file path does not exist", () => {
     configPO.setConfigData();
     configPO.configFilePath.sendKeys("/path/to/bad/location");
@@ -228,18 +225,16 @@ describe("configuration component", () => {
 
   it("should update existing file", () => {
     configPO.configFilePath.sendKeys(configPO.absolutePath);
-    configPO.xmlFileName.sendKeys("config.xml");
+    configPO.xmlFileName.sendKeys("config");
     configPO.cancelBtn.click();
     configPO.numIterations.sendKeys(5);
     configPO.btnUpdate.click();
     configPO.numIterations.sendKeys(Key.BACK_SPACE);
     configPO.cancelBtn.click();
 
-    configPO.getConfigFileBtn.click();
-
     expect(configPO.numIterations.getAttribute("value")).toEqual("10005");
   });
   it("should show update button is disabled when Xml File Name is blank", () => {
-    expect(configPO.btnUpdate.isEnabled()).toBe(false);
+    expect(configPO.btnUpdate.isPresent()).toBe(false);
   });
 });

ui-src/e2e/pages/configuration-PO.ts

@@ -14,14 +14,14 @@ const configFileLocation = "../../../config/";
 
 class ConfigurationPageObject {
   configFilePath = element(by.id("config-file-path"));
-  btnUpdate = element(by.id("update-config-file-btn"));
+  btnUpdate = element(by.id("btn-update"));
   xmlFileName = element(by.id("xml-file-name"));
   applicationName = element(by.name("apiName"));
   targetHost = element(by.name("targetHost"));
   targetPort = element(by.name("targetPort"));
   memoryEndpoint = element(by.name("memoryEndpoint"));
-  submitBtn = element(by.className("btn"));
-  cancelBtn = element(by.id("cancel-btn"));
+  submitBtn = element(by.id("btn-create"));
+  cancelBtn = element(by.id("btn-cancel"));
 
   numIterations = element(by.name("numIterations"));
   concurrentUsers = element(by.name("concurrentUsers"));