Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Align bats tests #291

Merged
merged 101 commits into from
Dec 7, 2018
Merged

Align bats tests #291

merged 101 commits into from
Dec 7, 2018

Conversation

AirQuick
Copy link
Member

This pull request derives from #289. So needs to be handled after that.


This pull request just aligns the bats test scripts. The changes are trivial (name, indent). All the tests are virtually kept intact.

This change makes it easier to compare the scripts.

…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	build.xml
#	test/run-xspec-tests-ant.cmd
#	test/run-xspec-tests-ant.sh
…-tests

# Conflicts:
#	test/end-to-end/generate-expected.cmd
#	test/end-to-end/generate-expected.sh
#	test/end-to-end/run-e2e-tests.cmd
#	test/end-to-end/run-e2e-tests.sh
…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…k/xspec into align-bats-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/.gitignore
#	test/xspec-bat.cmd
@cirulls cirulls self-requested a review December 6, 2018 16:38
…-tests

# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
Copy link
Member

@cirulls cirulls left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, thanks for tyding up the code. I reviewed it by inspecting the code and checking that the changes are cosmetic and do not impact the tests or the code logic.

I'm merging this into master.

Just two comments:

  • I can see this test for Windows was added but it is never executed:

    <!-- bin\xspec.bat does not support saxon script -->
    <case ifdef="NEVER" name="invoking xspec with saxon script uses the saxon script #121 #122">

    I guess this is just to align the tests on Windows and Linux/MacOS. I'm absolutely fine with that, I just wanted to mention it in case I misunderstood it.

  • I am probably the one to blame for introducing inconsistent indentation in the shell scripts. One thing I would like to do in the future is to introduce some code styling checks (things like 4 spaces for indentation, etc.) so that we have some consistent code styling in the code base and this is checked automatically by the CI. This is just an idea but it would prevent sloppy contributors like to me to commit inconsistent spacing 😉

@cirulls cirulls merged commit d4fe8cd into xspec:master Dec 7, 2018
@AirQuick
Copy link
Member Author

AirQuick commented Dec 7, 2018

I guess this is just to align the tests on Windows and Linux/MacOS.

Exactly.
Thanks for the review.

@AirQuick AirQuick deleted the align-bats-tests branch December 7, 2018 12:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants