-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'jabref/master' into enhanceSidePaneToggle
# Conflicts: # src/test/java/net/sf/jabref/gui/importer/fetcher/GeneralFetcherTest.java
- Loading branch information
Showing
268 changed files
with
3,879 additions
and
2,995 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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 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 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 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,27 @@ | ||
| #!/bin/bash | ||
| # taken from https://github.com/lhotari/travis-gradle-test-failures-to-console/blob/master/travis/junit-errors-to-stdout.sh | ||
| IFS=' | ||
| ' | ||
| DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) | ||
| if [ "$TRAVIS" = "true" ]; then | ||
| #echo 'Installing xml-twig-tools and xsltproc....' | ||
| sudo apt-get install -qq -y --force-yes xml-twig-tools xsltproc > /dev/null | ||
| fi | ||
| ROOTDIR="$1" | ||
| if [ -z "$ROOTDIR" ]; then | ||
| ROOTDIR="." | ||
| fi | ||
| echo 'Formatting results...' | ||
| FILES=$(find "$ROOTDIR" -path '*/build/test-results/*.xml' | xargs --no-run-if-empty xml_grep --files --cond 'testsuite[@failures > 0 or @errors > 0]') | ||
| if [ -n "$FILES" ]; then | ||
| for file in $FILES; do | ||
| echo "Formatting $file" | ||
| if [ -f "$file" ]; then | ||
| echo '=====================================================' | ||
| xsltproc "$DIR/junit-xml-format-errors.xsl" "$file" | ||
| fi | ||
| done | ||
| echo '=====================================================' | ||
| else | ||
| echo 'No */build/test-results/*.xml files found with failing tests.' | ||
| fi |
This file contains 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,61 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- based on SO answer http://stackoverflow.com/a/9471505/166062 by dvdvorle http://stackoverflow.com/users/481635/dvdvorle --> | ||
| <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> | ||
| <xsl:output method="text" indent="no"/> | ||
| <xsl:template match="/testsuite"> | ||
| <xsl:text>Testsuite: </xsl:text><xsl:value-of select="@name" /> | ||
| <xsl:text> | ||
| Tests run: </xsl:text> | ||
| <xsl:value-of select="@tests" /> | ||
| <xsl:text>, Failures: </xsl:text> | ||
| <xsl:value-of select="@failures" /> | ||
| <xsl:text>, Errors: </xsl:text> | ||
| <xsl:value-of select="@errors" /> | ||
| <xsl:text>, Time elapsed: </xsl:text> | ||
| <xsl:value-of select="@time" /> | ||
| <xsl:text> sec</xsl:text> | ||
| <xsl:text> | ||
| --------- ----------- ---------</xsl:text> | ||
| <xsl:apply-templates select="testcase" /> | ||
| <xsl:apply-templates select="system-out" /> | ||
| <xsl:apply-templates select="system-err" /> | ||
| </xsl:template> | ||
|
|
||
| <xsl:template match="testcase"> | ||
| <xsl:text> | ||
| Testcase: </xsl:text> | ||
| <xsl:value-of select="@name" /> | ||
| <xsl:text> took </xsl:text> | ||
| <xsl:value-of select="@time" /> | ||
| <xsl:choose> | ||
| <xsl:when test="failure"><xsl:text> FAILURE </xsl:text><xsl:apply-templates select="failure"/></xsl:when> | ||
| <xsl:when test="error"><xsl:text> ERROR </xsl:text><xsl:apply-templates select="error"/></xsl:when> | ||
| <xsl:otherwise><xsl:text> SUCCESS</xsl:text></xsl:otherwise> | ||
| </xsl:choose> | ||
| </xsl:template> | ||
|
|
||
| <xsl:template match="error | failure"> | ||
| <xsl:value-of select="@message" /> | ||
| <xsl:if test="@type != @message"> | ||
| <xsl:text> </xsl:text><xsl:value-of select="@type" /> | ||
| </xsl:if> | ||
| <xsl:text> | ||
| </xsl:text> | ||
| <xsl:value-of select="." /> | ||
| </xsl:template> | ||
|
|
||
| <xsl:template match="system-out"> | ||
| <xsl:text> | ||
| ------ Standard output ------ | ||
| </xsl:text> | ||
| <xsl:value-of select="." /> | ||
| </xsl:template> | ||
|
|
||
| <xsl:template match="system-err"> | ||
| <xsl:text> | ||
| ------ Error output ------ | ||
| </xsl:text> | ||
| <xsl:value-of select="." /> | ||
| </xsl:template> | ||
|
|
||
| </xsl:stylesheet> |
This file contains 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
Oops, something went wrong.