Feature/xaptc 51 #78
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| config/*.xml | ||
| !config/config.xml | ||
| *.iml | ||
| .idea | ||
| ui/ | ||
| automated-perf-test | ||
| uiServices/test/*.xml | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,23 +50,23 @@ type ResponseValue struct { | |
|
|
||
| // TestDefinition encapsulates the XML data. | ||
| type TestDefinition struct { | ||
| 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"` | ||
|
Collaborator
There was a problem hiding this comment. Don't include this change (prethinktime, postthinktime, execweight). @ConorSmyth Should this be merging to develop? |
||
| 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"` | ||
| 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"` | ||
| 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"` | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,118 @@ | ||
| import { | ||
| browser, | ||
| element, | ||
| by, | ||
| By, | ||
| $, | ||
| $$, | ||
| ExpectedConditions, | ||
| protractor, | ||
| WebDriver, | ||
| Key | ||
| } from "protractor"; | ||
| import { read } from "fs"; | ||
| import { Input } from "@angular/core/src/metadata/directives"; | ||
| import { ToastModule } from "ng2-toastr/ng2-toastr"; | ||
| const since = require("jasmine2-custom-message"); | ||
|
|
||
| import TestCasePageObject = require("../pages/testCases-PO"); | ||
| const testCasePO: TestCasePageObject = new TestCasePageObject(); | ||
|
|
||
|
|
||
| describe("test cases component", () => { | ||
| beforeEach(() => { | ||
| browser.get("/"); | ||
| browser.executeScript("window.onbeforeunload = function(e){};"); | ||
| browser.driver | ||
| .manage() | ||
| .window() | ||
| .maximize(); | ||
| }); | ||
|
|
||
|
|
||
| fit('should create a new test case file', () => { | ||
| testCasePO.setTestCasesPage(); | ||
| testCasePO.setTestCaseData(); | ||
| testCasePO.btnSave.click(); | ||
| expect(testCasePO.toastrMessage.getText()).toEqual( | ||
| "Success!\nYour data has been saved!" | ||
| ); | ||
| }); | ||
|
|
||
| fit("should check that all text box names are correct", () => { | ||
| testCasePO.setTestCasesPage(); | ||
| testCasePO.setTestCaseData(); | ||
| expect(testCasePO.labels.get(0).getText()).toContain("Testname"); | ||
| expect(testCasePO.labels.get(1).getText()).toContain("Description"); | ||
| expect(testCasePO.labels.get(2).getText()).toContain("Base URI"); | ||
| expect(testCasePO.labels.get(3).getText()).toContain("Override Host"); | ||
| expect(testCasePO.labels.get(4).getText()).toContain("Multipart"); | ||
| expect(testCasePO.labels.get(5).getText()).toContain("Override Port"); | ||
| expect(testCasePO.labels.get(6).getText()).toContain("Payload"); | ||
| expect(testCasePO.labels.get(7).getText()).toContain("Http Method"); | ||
| expect(testCasePO.labels.get(8).getText()).toContain("Headers"); | ||
| expect(testCasePO.labels.get(11).getText()).toContain("Pre Think Time"); | ||
| expect(testCasePO.labels.get(12).getText()).toContain("Post Think Time"); | ||
| expect(testCasePO.labels.get(13).getText()).toContain("Exec Weight"); | ||
| expect(testCasePO.labels.get(14).getText()).toContain("Response Status Code"); | ||
| expect(testCasePO.labels.get(15).getText()).toContain("Response Content Type"); | ||
| expect(testCasePO.labels.get(16).getText()).toContain("Multipart Payload"); | ||
|
|
||
|
|
||
| }); | ||
|
|
||
|
|
||
| fit("should throw error when a test case file path does not exist", () => { | ||
| testCasePO.setTestCasesPage(); | ||
| testCasePO.setTestCaseData(); | ||
| testCasePO.testCaseDir.sendKeys("/path/to/bad/location"); | ||
| testCasePO.btnSave.click(); | ||
| expect(testCasePO.toastrMessage.getText()).toContain( | ||
| "Some of the fields do not conform to the schema" | ||
| ); | ||
| }); | ||
|
|
||
| fit("should check requiredFields warning appears when requiredFields input is blank", () => { | ||
| testCasePO.setTestCasesPage(); | ||
| testCasePO.checkRequiredFields(); | ||
| expect(testCasePO.requiredFields.get(0).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(1).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(2).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(3).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(4).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(5).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(6).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(7).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(8).getText()).toContain("This field is required."); | ||
|
|
||
| }); | ||
|
|
||
| fit("should show that string cannot be entered into a integer field", () => { | ||
| testCasePO.setTestCasesPage(); | ||
| testCasePO.checkForStrings(); | ||
| expect(testCasePO.postThinkTime.getAttribute("value")).toEqual(""); | ||
| expect(testCasePO.preThinkTime.getAttribute("value")).toEqual(""); | ||
| expect(testCasePO.responseStatusCode.getAttribute("value")).toEqual(""); | ||
| }); | ||
|
|
||
|
|
||
| fit("should check that e is not accepted in integer field", () =>{ | ||
| testCasePO.setTestCasesPage(); | ||
| testCasePO.checkEisNotAccepted(); | ||
| expect(testCasePO.requiredFields.get(0).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(1).getText()).toContain("This field is required."); | ||
| expect(testCasePO.requiredFields.get(2).getText()).toContain("This field is required."); | ||
| }); | ||
|
|
||
| fit("should check that warning appears if negative number is enter to integer field", () => { | ||
| testCasePO.setTestCasesPage(); | ||
| testCasePO.checkNegativeValues(); | ||
| //browser.sleep(10000); | ||
| expect(testCasePO.requiredFields.get(0).getText()).toContain("Must be 1 or more"); | ||
| expect(testCasePO.requiredFields.get(1).getText()).toContain("Must be 1 or more"); | ||
| expect(testCasePO.requiredFields.get(2).getText()).toContain("Must be 1 or more"); | ||
| }); | ||
|
|
||
|
|
||
|
|
||
| }); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
duplicate of lines 1-7?