Skip to content
This repository was archived by the owner on Jan 12, 2021. It is now read-only.

Formatting, override hashCode and mark final variables as final #35

Open
mibrahim wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Formatting, override hashCode and mark final variables as final #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5c3795e
Formatting !
mibrahim Dec 16, 2015
ca10e92
Add hashCode
mibrahim Dec 16, 2015
7a440d6
Add hashCode
mibrahim Dec 16, 2015
39921b4
Make the variables that should never change after set, final
mibrahim Dec 16, 2015
dd21de4
Comment out hashCode - seems to break the build
mibrahim Dec 16, 2015
ac26780
Move to 1.7
mibrahim Jan 13, 2016
e575319
Convert all dos 2 unix
mibrahim Jan 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ hs_err_pid*
/.project
/commandNames.txt
/Traceability_Matrix.txt
.idea/
*.iml
18 changes: 9 additions & 9 deletions mocktestlibrary/dupe.commands.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="CommandViewer.xsl"?>
<library>
<command name="repeat"
class="org.finra.jtaf.core.mock.Repeat">
<usage>duplicate command</usage>
</command>
</library>
<?xml version="1.0" encoding="ISO-8859-1"?>
<?xml-stylesheet type="text/xsl" href="CommandViewer.xsl"?>
<library>
<command name="repeat"
class="org.finra.jtaf.core.mock.Repeat">
<usage>duplicate command</usage>

</command>
</library>
32 changes: 16 additions & 16 deletions mocktestscripts/DoNothing.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="Placeholder test suite">
<test name="Placeholder">
<desc>
</desc>
<automationValue>High</automationValue>
<teststeps>
<repeat/>
</teststeps>
</test>
<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="Placeholder test suite">

<test name="Placeholder">
<desc>
</desc>
<automationValue>High</automationValue>
<teststeps>


<repeat/>

</teststeps>
</test>


</testsuite>
28 changes: 14 additions & 14 deletions parser_testing/DuplicateTestNameFolder/DuplicateTestName.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<testsuite name="Duplicate Test Name Suite">
<test name="Duplicate Test Name">
<teststeps>
<mockstep2 />
</teststeps>
</test>
<test name="Duplicate Test Name">
<teststeps>
<mockstep2 />
</teststeps>
</test>
<testsuite name="Duplicate Test Name Suite">

<test name="Duplicate Test Name">
<teststeps>
<mockstep2 />
</teststeps>
</test>

<test name="Duplicate Test Name">
<teststeps>
<mockstep2 />
</teststeps>
</test>

</testsuite>
2 changes: 1 addition & 1 deletion parser_testing/EmptySuite.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<testsuite name="Empty Suite">
<testsuite name="Empty Suite">
</testsuite>
12 changes: 6 additions & 6 deletions parser_testing/InvalidRoot.strategy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!-- This tests that the test strategy parser correctly responds to a strategy file whose root isn't <execute> -->
<incorrect>
<automationValue>ValidAutomationValue</automationValue>
<target name="path/to/some/script.xml" />
<!-- This tests that the test strategy parser correctly responds to a strategy file whose root isn't <execute> -->
<incorrect>

<automationValue>ValidAutomationValue</automationValue>
<target name="path/to/some/script.xml" />

</incorrect>
8 changes: 4 additions & 4 deletions parser_testing/InvalidScriptSourceTag.strategy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<execute>
<NotTarget name="path/to/some/script" />
<execute>

<NotTarget name="path/to/some/script" />

</execute>
10 changes: 5 additions & 5 deletions parser_testing/MissingTargetNameAttribute.strategy.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<execute>
<automationValue>ValidAutomationValue</automationValue>
<target xname="path/to/some/script.xml" />
<execute>

<automationValue>ValidAutomationValue</automationValue>
<target xname="path/to/some/script.xml" />

</execute>
170 changes: 85 additions & 85 deletions parser_testing/StatementParserTesting.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,86 +1,86 @@
<testsuite name="StatementParser Script-Level Tests">
<test name="No test steps">
<teststeps>
</teststeps>
</test>
<test name="One test step">
<teststeps>
<DummyTestStep />
</teststeps>
</test>
<test name="Only try and recover at top level">
<teststeps>
<try>
<mockstep1 param1="true" />
</try>
<recover>
<mockstep2 />
</recover>
</teststeps>
</test>
<test name="Only recover at top level">
<teststeps>
<recover>
<mockstep1 param1="true" />
</recover>
</teststeps>
</test>
<test name="Only cleanup at top level">
<teststeps>
<cleanup>
<mockstep1 param1="true" />
</cleanup>
</teststeps>
</test>
<test name="Empty TryRecoverCleanup">
<teststeps>
<TryRecoverCleanup>
</TryRecoverCleanup>
</teststeps>
</test>
<test name="Block parameter has parsing exception">
<teststeps>
<mockstep2>
<mockstep2>
<map name="namedMap">
<string>map entry with no key</string>
</map>
</mockstep2>
</mockstep2>
</teststeps>
</test>
<test name="List parameter has no parsing exception">
<teststeps>
<mockstep2>
<list name="listParameter">
<string>listParameter</string>
</list>
</mockstep2>
</teststeps>
</test>
<test name="List parameter has parsing exception">
<teststeps>
<mockstep2>
<!-- <list> -->
<!-- <string>unnamed</string> -->
<!-- </list> -->
<list name="listParameter">
<map>
<string>map entry with no key</string>
</map>
</list>
</mockstep2>
</teststeps>
</test>
<testsuite name="StatementParser Script-Level Tests">

<test name="No test steps">
<teststeps>
</teststeps>
</test>

<test name="One test step">
<teststeps>
<DummyTestStep />
</teststeps>
</test>

<test name="Only try and recover at top level">
<teststeps>
<try>
<mockstep1 param1="true" />
</try>
<recover>
<mockstep2 />
</recover>
</teststeps>
</test>

<test name="Only recover at top level">
<teststeps>
<recover>
<mockstep1 param1="true" />
</recover>
</teststeps>
</test>

<test name="Only cleanup at top level">
<teststeps>
<cleanup>
<mockstep1 param1="true" />
</cleanup>
</teststeps>
</test>


<test name="Empty TryRecoverCleanup">
<teststeps>
<TryRecoverCleanup>
</TryRecoverCleanup>
</teststeps>
</test>

<test name="Block parameter has parsing exception">
<teststeps>
<mockstep2>
<mockstep2>
<map name="namedMap">
<string>map entry with no key</string>
</map>
</mockstep2>
</mockstep2>
</teststeps>
</test>

<test name="List parameter has no parsing exception">
<teststeps>
<mockstep2>
<list name="listParameter">
<string>listParameter</string>
</list>
</mockstep2>
</teststeps>
</test>

<test name="List parameter has parsing exception">
<teststeps>
<mockstep2>
<!-- <list> -->
<!-- <string>unnamed</string> -->
<!-- </list> -->
<list name="listParameter">
<map>
<string>map entry with no key</string>
</map>
</list>
</mockstep2>
</teststeps>
</test>

</testsuite>
18 changes: 9 additions & 9 deletions parser_testing/SuiteDependencyParserTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<testsuite name="Sutie Dependency Parser Tests">
<dependencies>
<testsuite name="JTAF CORE" />
<test name="Block Testing" />
</dependencies>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<testsuite name="Sutie Dependency Parser Tests">

<dependencies>
<testsuite name="JTAF CORE" />
<test name="Block Testing" />
</dependencies>

</testsuite>
18 changes: 9 additions & 9 deletions parser_testing/SuiteExclusionParserTest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<testsuite name="Sutie Exclusion Parser Tests">
<exclusions>
<testsuite name="JTAF CORE" />
<test name="Block Testing" />
</exclusions>
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>

<testsuite name="Sutie Exclusion Parser Tests">

<exclusions>
<testsuite name="JTAF CORE" />
<test name="Block Testing" />
</exclusions>

</testsuite>
8 changes: 4 additions & 4 deletions parser_testing/UnexpectedElementSuiteDependency.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<testsuite name="Unexpected Element Suite Dependency">
<dependencies>
<unexpectedElement name="Unexpected" />
</dependencies>
<testsuite name="Unexpected Element Suite Dependency">
<dependencies>
<unexpectedElement name="Unexpected" />
</dependencies>
</testsuite>
8 changes: 4 additions & 4 deletions parser_testing/UnexpectedElementSuiteExclusion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<testsuite name="Unexpected Element Suite Exclusion">
<exclusions>
<unexpectedElement name="Unexpected" />
</exclusions>
<testsuite name="Unexpected Element Suite Exclusion">
<exclusions>
<unexpectedElement name="Unexpected" />
</exclusions>
</testsuite>
Loading