From 316479a164be4140320df169ade554b083af6c0d Mon Sep 17 00:00:00 2001 From: David RACODON Date: Mon, 27 Feb 2017 21:50:10 +0100 Subject: [PATCH] Improve ITs with UTF-8 / ISO-8859-1 --- .../commentsExclamationMarkAndHash.properties | 0 ...xclamationMarkMissingWhitespace.properties | 0 .../commentsExclamationMarkOnly.properties | 0 .../commentsHashAndExclamationMark.properties | 0 .../commentsHashMissingWhitespace.properties | 0 .../commentsHashOnly.properties | 0 .../commentRegularExpression.properties | 0 .../commentedOutCode.properties | 0 .../crossFileDuplicatedKeys1.properties | 0 .../crossFileDuplicatedKeys2.properties | 0 .../keys.properties | 0 .../keys2.properties | 0 .../keys_fr.properties | 0 .../keys_fr_FR.properties | 0 .../duplicatedKeys.properties | 0 .../duplicatedValues.properties | 0 .../duplicatedValuesCustom1.properties | 0 .../duplicatedValuesCustom2.properties | 0 .../emptyElement.properties | 0 .../endLineCharacters.properties | 0 .../file-name/fileNameOK.properties | 0 .../file-name/file_name.ko.properties | 0 .../file-name/file_name.kocustom.properties | 0 .../file-name/file_name.ok.properties | 0 .../{custom => iso8859}/fixme.properties | 0 .../hardCodedCredentials.properties | 0 ...dCodedCredentialsValuesToIgnore.properties | 0 .../indentation/indentation.properties | 0 .../indentationIssueFirstLine.properties | 0 ...a9DefaultEncodingSwitchISO88591.properties | 0 .../keyNamingConvention.properties | 0 .../keyNamingConventionCustom.properties | 0 .../keyRegularExpression.properties | 0 .../keyRegularExpressionNoMatch.properties | 0 .../{custom => iso8859}/lineLength.properties | 0 .../abc.properties | 0 .../message.properties | 0 .../message_en.properties | 0 .../message_es.properties | 0 .../message_fr.properties | 0 .../message_fr_FR.properties | 0 .../test_fr_FR.properties | 0 .../missing-translations/abc.properties | 0 .../missing-translations/message.properties | 0 .../message_en.properties | 0 .../message_es.properties | 0 .../message_fr.properties | 0 .../message_fr_FR.properties | 0 .../test_fr_FR.properties | 0 .../newLineEndOfFile.properties | 0 .../no-properties/noProperties.properties | 0 .../no-properties/someProperties.properties | 0 .../noNewLineEndOfFile.properties | 0 .../noParsingError.properties | 0 .../noTabCharacter.properties | 0 .../parsingError.properties | 0 .../separatorConventionColon.properties | 0 .../separatorConventionEquals.properties | 0 .../deprecatedProperties.properties | 0 .../tabCharacter.properties | 0 .../{custom => iso8859}/todo.properties | 0 .../tooManyKeys30.properties | 0 .../tooManyKeys50.properties | 0 .../valueRegularExpression.properties | 0 .../valueRegularExpressionNoMatch.properties | 0 .../{custom => utf8}/bom/utf8.properties | 0 .../bom/utf8WithBOM.properties | 0 .../duplicatedKeysUTF8WithBOM.properties | 0 .../indentationUTF8WithBOM.properties | 0 ...tationUTF8WithBOMIssueFirstLine.properties | 0 .../java9DefaultEncodingSwitchUTF8.properties | 0 .../expected/iso8859/jproperties-S1134.json | 15 +++ .../expected/iso8859/jproperties-S1135.json | 15 +++ .../expected/iso8859/jproperties-S1578.json | 11 +++ .../expected/iso8859/jproperties-S2068.json | 9 ++ .../expected/iso8859/jproperties-S2260.json | 5 + .../jproperties-comment-convention.json | 93 +++++++++++++++++++ .../jproperties-commented-out-code.json | 4 +- ...operties-duplicated-keys-across-files.json | 76 +++++++++++++++ .../iso8859/jproperties-duplicated-keys.json | 38 ++++++++ .../jproperties-duplicated-values.json | 67 +++++++++++++ .../iso8859/jproperties-empty-element.json | 26 ++++++ .../jproperties-empty-line-end-of-file.json | 8 ++ .../iso8859/jproperties-indentation.json | 68 ++++++++++++++ ...perties-java9-default-encoding-switch.json | 6 ++ .../jproperties-key-naming-convention.json | 33 +++++++ .../iso8859/jproperties-line-length.json | 14 +++ .../jproperties-maximum-number-keys.json | 5 + ...rties-missing-translations-in-default.json | 12 +++ .../jproperties-missing-translations.json | 14 +++ .../iso8859/jproperties-no-properties.json | 17 ++++ .../jproperties-separator-convention.json | 36 +++++++ .../iso8859/jproperties-tab-character.json | 5 + ...r-sonar-scanner-deprecated-properties.json | 9 ++ .../src/test/expected/jproperties-S1134.json | 15 --- .../src/test/expected/jproperties-S1135.json | 15 --- .../src/test/expected/jproperties-S1578.json | 11 --- .../src/test/expected/jproperties-S2068.json | 9 -- .../src/test/expected/jproperties-S2260.json | 5 - .../expected/jproperties-bom-utf8-files.json | 14 --- .../jproperties-comment-convention.json | 93 ------------------- ...operties-duplicated-keys-across-files.json | 78 ---------------- .../expected/jproperties-duplicated-keys.json | 41 -------- .../jproperties-duplicated-values.json | 73 --------------- .../expected/jproperties-empty-element.json | 26 ------ .../jproperties-empty-line-end-of-file.json | 11 --- .../expected/jproperties-indentation.json | 77 --------------- .../jproperties-key-naming-convention.json | 36 ------- .../expected/jproperties-line-length.json | 14 --- .../jproperties-maximum-number-keys.json | 5 - ...rties-missing-translations-in-default.json | 12 --- .../jproperties-missing-translations.json | 14 --- .../expected/jproperties-no-properties.json | 17 ---- .../jproperties-separator-convention.json | 48 ---------- .../expected/jproperties-tab-character.json | 5 - ...r-sonar-scanner-deprecated-properties.json | 9 -- .../utf8/jproperties-bom-utf8-files.json | 14 +++ ...operties-duplicated-keys-across-files.json | 11 +++ .../utf8/jproperties-duplicated-keys.json | 5 + .../utf8/jproperties-duplicated-values.json | 8 ++ .../jproperties-empty-line-end-of-file.json | 5 + .../utf8/jproperties-indentation.json | 11 +++ .../jproperties-key-naming-convention.json | 5 + .../jproperties-separator-convention.json | 14 +++ .../its/JavaPropertiesRulingTest.java | 51 ++++++---- 125 files changed, 688 insertions(+), 650 deletions(-) rename its/ruling/projects/{custom => iso8859}/comment-convention/commentsExclamationMarkAndHash.properties (100%) rename its/ruling/projects/{custom => iso8859}/comment-convention/commentsExclamationMarkMissingWhitespace.properties (100%) rename its/ruling/projects/{custom => iso8859}/comment-convention/commentsExclamationMarkOnly.properties (100%) rename its/ruling/projects/{custom => iso8859}/comment-convention/commentsHashAndExclamationMark.properties (100%) rename its/ruling/projects/{custom => iso8859}/comment-convention/commentsHashMissingWhitespace.properties (100%) rename its/ruling/projects/{custom => iso8859}/comment-convention/commentsHashOnly.properties (100%) rename its/ruling/projects/{custom => iso8859}/commentRegularExpression.properties (100%) rename its/ruling/projects/{custom => iso8859}/commentedOutCode.properties (100%) rename its/ruling/projects/{custom => iso8859}/cross-file-duplicated-keys/crossFileDuplicatedKeys1.properties (100%) rename its/ruling/projects/{custom => iso8859}/cross-file-duplicated-keys/crossFileDuplicatedKeys2.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicated-keys-across-files/keys.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicated-keys-across-files/keys2.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicated-keys-across-files/keys_fr.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicated-keys-across-files/keys_fr_FR.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicatedKeys.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicatedValues.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicatedValuesCustom1.properties (100%) rename its/ruling/projects/{custom => iso8859}/duplicatedValuesCustom2.properties (100%) rename its/ruling/projects/{custom => iso8859}/emptyElement.properties (100%) rename its/ruling/projects/{custom => iso8859}/endLineCharacters.properties (100%) rename its/ruling/projects/{custom => iso8859}/file-name/fileNameOK.properties (100%) rename its/ruling/projects/{custom => iso8859}/file-name/file_name.ko.properties (100%) rename its/ruling/projects/{custom => iso8859}/file-name/file_name.kocustom.properties (100%) rename its/ruling/projects/{custom => iso8859}/file-name/file_name.ok.properties (100%) rename its/ruling/projects/{custom => iso8859}/fixme.properties (100%) rename its/ruling/projects/{custom => iso8859}/hard-coded-credentials/hardCodedCredentials.properties (100%) rename its/ruling/projects/{custom => iso8859}/hard-coded-credentials/hardCodedCredentialsValuesToIgnore.properties (100%) rename its/ruling/projects/{custom => iso8859}/indentation/indentation.properties (100%) rename its/ruling/projects/{custom => iso8859}/indentation/indentationIssueFirstLine.properties (100%) rename its/ruling/projects/{custom => iso8859}/java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties (100%) rename its/ruling/projects/{custom => iso8859}/keyNamingConvention.properties (100%) rename its/ruling/projects/{custom => iso8859}/keyNamingConventionCustom.properties (100%) rename its/ruling/projects/{custom => iso8859}/keyRegularExpression.properties (100%) rename its/ruling/projects/{custom => iso8859}/keyRegularExpressionNoMatch.properties (100%) rename its/ruling/projects/{custom => iso8859}/lineLength.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations-in-default/abc.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations-in-default/message.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations-in-default/message_en.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations-in-default/message_es.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations-in-default/message_fr.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations-in-default/message_fr_FR.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations-in-default/test_fr_FR.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations/abc.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations/message.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations/message_en.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations/message_es.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations/message_fr.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations/message_fr_FR.properties (100%) rename its/ruling/projects/{custom => iso8859}/missing-translations/test_fr_FR.properties (100%) rename its/ruling/projects/{custom => iso8859}/newLineEndOfFile.properties (100%) rename its/ruling/projects/{custom => iso8859}/no-properties/noProperties.properties (100%) rename its/ruling/projects/{custom => iso8859}/no-properties/someProperties.properties (100%) rename its/ruling/projects/{custom => iso8859}/noNewLineEndOfFile.properties (100%) rename its/ruling/projects/{custom => iso8859}/noParsingError.properties (100%) rename its/ruling/projects/{custom => iso8859}/noTabCharacter.properties (100%) rename its/ruling/projects/{custom => iso8859}/parsingError.properties (100%) rename its/ruling/projects/{custom => iso8859}/separatorConventionColon.properties (100%) rename its/ruling/projects/{custom => iso8859}/separatorConventionEquals.properties (100%) rename its/ruling/projects/{custom => iso8859}/sonarscanner/deprecatedProperties.properties (100%) rename its/ruling/projects/{custom => iso8859}/tabCharacter.properties (100%) rename its/ruling/projects/{custom => iso8859}/todo.properties (100%) rename its/ruling/projects/{custom => iso8859}/tooManyKeys30.properties (100%) rename its/ruling/projects/{custom => iso8859}/tooManyKeys50.properties (100%) rename its/ruling/projects/{custom => iso8859}/valueRegularExpression.properties (100%) rename its/ruling/projects/{custom => iso8859}/valueRegularExpressionNoMatch.properties (100%) rename its/ruling/projects/{custom => utf8}/bom/utf8.properties (100%) rename its/ruling/projects/{custom => utf8}/bom/utf8WithBOM.properties (100%) rename its/ruling/projects/{custom => utf8}/duplicatedKeysUTF8WithBOM.properties (100%) rename its/ruling/projects/{custom => utf8}/indentation/indentationUTF8WithBOM.properties (100%) rename its/ruling/projects/{custom => utf8}/indentation/indentationUTF8WithBOMIssueFirstLine.properties (100%) rename its/ruling/projects/{custom => utf8}/java9-default-encoding-switch/java9DefaultEncodingSwitchUTF8.properties (100%) create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-S1134.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-S1135.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-S1578.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-S2068.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-S2260.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-comment-convention.json rename its/ruling/tests/src/test/expected/{ => iso8859}/jproperties-commented-out-code.json (51%) create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys-across-files.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-values.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-empty-element.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-empty-line-end-of-file.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-indentation.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-java9-default-encoding-switch.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-key-naming-convention.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-line-length.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-maximum-number-keys.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations-in-default.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-no-properties.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-separator-convention.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/jproperties-tab-character.json create mode 100644 its/ruling/tests/src/test/expected/iso8859/sonarscanner-sonar-scanner-deprecated-properties.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-S1134.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-S1135.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-S1578.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-S2068.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-S2260.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-bom-utf8-files.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-comment-convention.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-duplicated-keys-across-files.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-duplicated-keys.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-duplicated-values.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-empty-element.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-empty-line-end-of-file.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-indentation.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-key-naming-convention.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-line-length.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-maximum-number-keys.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-missing-translations-in-default.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-missing-translations.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-no-properties.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-separator-convention.json delete mode 100644 its/ruling/tests/src/test/expected/jproperties-tab-character.json delete mode 100644 its/ruling/tests/src/test/expected/sonarscanner-sonar-scanner-deprecated-properties.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-bom-utf8-files.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys-across-files.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-values.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-empty-line-end-of-file.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-indentation.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-key-naming-convention.json create mode 100644 its/ruling/tests/src/test/expected/utf8/jproperties-separator-convention.json diff --git a/its/ruling/projects/custom/comment-convention/commentsExclamationMarkAndHash.properties b/its/ruling/projects/iso8859/comment-convention/commentsExclamationMarkAndHash.properties similarity index 100% rename from its/ruling/projects/custom/comment-convention/commentsExclamationMarkAndHash.properties rename to its/ruling/projects/iso8859/comment-convention/commentsExclamationMarkAndHash.properties diff --git a/its/ruling/projects/custom/comment-convention/commentsExclamationMarkMissingWhitespace.properties b/its/ruling/projects/iso8859/comment-convention/commentsExclamationMarkMissingWhitespace.properties similarity index 100% rename from its/ruling/projects/custom/comment-convention/commentsExclamationMarkMissingWhitespace.properties rename to its/ruling/projects/iso8859/comment-convention/commentsExclamationMarkMissingWhitespace.properties diff --git a/its/ruling/projects/custom/comment-convention/commentsExclamationMarkOnly.properties b/its/ruling/projects/iso8859/comment-convention/commentsExclamationMarkOnly.properties similarity index 100% rename from its/ruling/projects/custom/comment-convention/commentsExclamationMarkOnly.properties rename to its/ruling/projects/iso8859/comment-convention/commentsExclamationMarkOnly.properties diff --git a/its/ruling/projects/custom/comment-convention/commentsHashAndExclamationMark.properties b/its/ruling/projects/iso8859/comment-convention/commentsHashAndExclamationMark.properties similarity index 100% rename from its/ruling/projects/custom/comment-convention/commentsHashAndExclamationMark.properties rename to its/ruling/projects/iso8859/comment-convention/commentsHashAndExclamationMark.properties diff --git a/its/ruling/projects/custom/comment-convention/commentsHashMissingWhitespace.properties b/its/ruling/projects/iso8859/comment-convention/commentsHashMissingWhitespace.properties similarity index 100% rename from its/ruling/projects/custom/comment-convention/commentsHashMissingWhitespace.properties rename to its/ruling/projects/iso8859/comment-convention/commentsHashMissingWhitespace.properties diff --git a/its/ruling/projects/custom/comment-convention/commentsHashOnly.properties b/its/ruling/projects/iso8859/comment-convention/commentsHashOnly.properties similarity index 100% rename from its/ruling/projects/custom/comment-convention/commentsHashOnly.properties rename to its/ruling/projects/iso8859/comment-convention/commentsHashOnly.properties diff --git a/its/ruling/projects/custom/commentRegularExpression.properties b/its/ruling/projects/iso8859/commentRegularExpression.properties similarity index 100% rename from its/ruling/projects/custom/commentRegularExpression.properties rename to its/ruling/projects/iso8859/commentRegularExpression.properties diff --git a/its/ruling/projects/custom/commentedOutCode.properties b/its/ruling/projects/iso8859/commentedOutCode.properties similarity index 100% rename from its/ruling/projects/custom/commentedOutCode.properties rename to its/ruling/projects/iso8859/commentedOutCode.properties diff --git a/its/ruling/projects/custom/cross-file-duplicated-keys/crossFileDuplicatedKeys1.properties b/its/ruling/projects/iso8859/cross-file-duplicated-keys/crossFileDuplicatedKeys1.properties similarity index 100% rename from its/ruling/projects/custom/cross-file-duplicated-keys/crossFileDuplicatedKeys1.properties rename to its/ruling/projects/iso8859/cross-file-duplicated-keys/crossFileDuplicatedKeys1.properties diff --git a/its/ruling/projects/custom/cross-file-duplicated-keys/crossFileDuplicatedKeys2.properties b/its/ruling/projects/iso8859/cross-file-duplicated-keys/crossFileDuplicatedKeys2.properties similarity index 100% rename from its/ruling/projects/custom/cross-file-duplicated-keys/crossFileDuplicatedKeys2.properties rename to its/ruling/projects/iso8859/cross-file-duplicated-keys/crossFileDuplicatedKeys2.properties diff --git a/its/ruling/projects/custom/duplicated-keys-across-files/keys.properties b/its/ruling/projects/iso8859/duplicated-keys-across-files/keys.properties similarity index 100% rename from its/ruling/projects/custom/duplicated-keys-across-files/keys.properties rename to its/ruling/projects/iso8859/duplicated-keys-across-files/keys.properties diff --git a/its/ruling/projects/custom/duplicated-keys-across-files/keys2.properties b/its/ruling/projects/iso8859/duplicated-keys-across-files/keys2.properties similarity index 100% rename from its/ruling/projects/custom/duplicated-keys-across-files/keys2.properties rename to its/ruling/projects/iso8859/duplicated-keys-across-files/keys2.properties diff --git a/its/ruling/projects/custom/duplicated-keys-across-files/keys_fr.properties b/its/ruling/projects/iso8859/duplicated-keys-across-files/keys_fr.properties similarity index 100% rename from its/ruling/projects/custom/duplicated-keys-across-files/keys_fr.properties rename to its/ruling/projects/iso8859/duplicated-keys-across-files/keys_fr.properties diff --git a/its/ruling/projects/custom/duplicated-keys-across-files/keys_fr_FR.properties b/its/ruling/projects/iso8859/duplicated-keys-across-files/keys_fr_FR.properties similarity index 100% rename from its/ruling/projects/custom/duplicated-keys-across-files/keys_fr_FR.properties rename to its/ruling/projects/iso8859/duplicated-keys-across-files/keys_fr_FR.properties diff --git a/its/ruling/projects/custom/duplicatedKeys.properties b/its/ruling/projects/iso8859/duplicatedKeys.properties similarity index 100% rename from its/ruling/projects/custom/duplicatedKeys.properties rename to its/ruling/projects/iso8859/duplicatedKeys.properties diff --git a/its/ruling/projects/custom/duplicatedValues.properties b/its/ruling/projects/iso8859/duplicatedValues.properties similarity index 100% rename from its/ruling/projects/custom/duplicatedValues.properties rename to its/ruling/projects/iso8859/duplicatedValues.properties diff --git a/its/ruling/projects/custom/duplicatedValuesCustom1.properties b/its/ruling/projects/iso8859/duplicatedValuesCustom1.properties similarity index 100% rename from its/ruling/projects/custom/duplicatedValuesCustom1.properties rename to its/ruling/projects/iso8859/duplicatedValuesCustom1.properties diff --git a/its/ruling/projects/custom/duplicatedValuesCustom2.properties b/its/ruling/projects/iso8859/duplicatedValuesCustom2.properties similarity index 100% rename from its/ruling/projects/custom/duplicatedValuesCustom2.properties rename to its/ruling/projects/iso8859/duplicatedValuesCustom2.properties diff --git a/its/ruling/projects/custom/emptyElement.properties b/its/ruling/projects/iso8859/emptyElement.properties similarity index 100% rename from its/ruling/projects/custom/emptyElement.properties rename to its/ruling/projects/iso8859/emptyElement.properties diff --git a/its/ruling/projects/custom/endLineCharacters.properties b/its/ruling/projects/iso8859/endLineCharacters.properties similarity index 100% rename from its/ruling/projects/custom/endLineCharacters.properties rename to its/ruling/projects/iso8859/endLineCharacters.properties diff --git a/its/ruling/projects/custom/file-name/fileNameOK.properties b/its/ruling/projects/iso8859/file-name/fileNameOK.properties similarity index 100% rename from its/ruling/projects/custom/file-name/fileNameOK.properties rename to its/ruling/projects/iso8859/file-name/fileNameOK.properties diff --git a/its/ruling/projects/custom/file-name/file_name.ko.properties b/its/ruling/projects/iso8859/file-name/file_name.ko.properties similarity index 100% rename from its/ruling/projects/custom/file-name/file_name.ko.properties rename to its/ruling/projects/iso8859/file-name/file_name.ko.properties diff --git a/its/ruling/projects/custom/file-name/file_name.kocustom.properties b/its/ruling/projects/iso8859/file-name/file_name.kocustom.properties similarity index 100% rename from its/ruling/projects/custom/file-name/file_name.kocustom.properties rename to its/ruling/projects/iso8859/file-name/file_name.kocustom.properties diff --git a/its/ruling/projects/custom/file-name/file_name.ok.properties b/its/ruling/projects/iso8859/file-name/file_name.ok.properties similarity index 100% rename from its/ruling/projects/custom/file-name/file_name.ok.properties rename to its/ruling/projects/iso8859/file-name/file_name.ok.properties diff --git a/its/ruling/projects/custom/fixme.properties b/its/ruling/projects/iso8859/fixme.properties similarity index 100% rename from its/ruling/projects/custom/fixme.properties rename to its/ruling/projects/iso8859/fixme.properties diff --git a/its/ruling/projects/custom/hard-coded-credentials/hardCodedCredentials.properties b/its/ruling/projects/iso8859/hard-coded-credentials/hardCodedCredentials.properties similarity index 100% rename from its/ruling/projects/custom/hard-coded-credentials/hardCodedCredentials.properties rename to its/ruling/projects/iso8859/hard-coded-credentials/hardCodedCredentials.properties diff --git a/its/ruling/projects/custom/hard-coded-credentials/hardCodedCredentialsValuesToIgnore.properties b/its/ruling/projects/iso8859/hard-coded-credentials/hardCodedCredentialsValuesToIgnore.properties similarity index 100% rename from its/ruling/projects/custom/hard-coded-credentials/hardCodedCredentialsValuesToIgnore.properties rename to its/ruling/projects/iso8859/hard-coded-credentials/hardCodedCredentialsValuesToIgnore.properties diff --git a/its/ruling/projects/custom/indentation/indentation.properties b/its/ruling/projects/iso8859/indentation/indentation.properties similarity index 100% rename from its/ruling/projects/custom/indentation/indentation.properties rename to its/ruling/projects/iso8859/indentation/indentation.properties diff --git a/its/ruling/projects/custom/indentation/indentationIssueFirstLine.properties b/its/ruling/projects/iso8859/indentation/indentationIssueFirstLine.properties similarity index 100% rename from its/ruling/projects/custom/indentation/indentationIssueFirstLine.properties rename to its/ruling/projects/iso8859/indentation/indentationIssueFirstLine.properties diff --git a/its/ruling/projects/custom/java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties b/its/ruling/projects/iso8859/java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties similarity index 100% rename from its/ruling/projects/custom/java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties rename to its/ruling/projects/iso8859/java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties diff --git a/its/ruling/projects/custom/keyNamingConvention.properties b/its/ruling/projects/iso8859/keyNamingConvention.properties similarity index 100% rename from its/ruling/projects/custom/keyNamingConvention.properties rename to its/ruling/projects/iso8859/keyNamingConvention.properties diff --git a/its/ruling/projects/custom/keyNamingConventionCustom.properties b/its/ruling/projects/iso8859/keyNamingConventionCustom.properties similarity index 100% rename from its/ruling/projects/custom/keyNamingConventionCustom.properties rename to its/ruling/projects/iso8859/keyNamingConventionCustom.properties diff --git a/its/ruling/projects/custom/keyRegularExpression.properties b/its/ruling/projects/iso8859/keyRegularExpression.properties similarity index 100% rename from its/ruling/projects/custom/keyRegularExpression.properties rename to its/ruling/projects/iso8859/keyRegularExpression.properties diff --git a/its/ruling/projects/custom/keyRegularExpressionNoMatch.properties b/its/ruling/projects/iso8859/keyRegularExpressionNoMatch.properties similarity index 100% rename from its/ruling/projects/custom/keyRegularExpressionNoMatch.properties rename to its/ruling/projects/iso8859/keyRegularExpressionNoMatch.properties diff --git a/its/ruling/projects/custom/lineLength.properties b/its/ruling/projects/iso8859/lineLength.properties similarity index 100% rename from its/ruling/projects/custom/lineLength.properties rename to its/ruling/projects/iso8859/lineLength.properties diff --git a/its/ruling/projects/custom/missing-translations-in-default/abc.properties b/its/ruling/projects/iso8859/missing-translations-in-default/abc.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations-in-default/abc.properties rename to its/ruling/projects/iso8859/missing-translations-in-default/abc.properties diff --git a/its/ruling/projects/custom/missing-translations-in-default/message.properties b/its/ruling/projects/iso8859/missing-translations-in-default/message.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations-in-default/message.properties rename to its/ruling/projects/iso8859/missing-translations-in-default/message.properties diff --git a/its/ruling/projects/custom/missing-translations-in-default/message_en.properties b/its/ruling/projects/iso8859/missing-translations-in-default/message_en.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations-in-default/message_en.properties rename to its/ruling/projects/iso8859/missing-translations-in-default/message_en.properties diff --git a/its/ruling/projects/custom/missing-translations-in-default/message_es.properties b/its/ruling/projects/iso8859/missing-translations-in-default/message_es.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations-in-default/message_es.properties rename to its/ruling/projects/iso8859/missing-translations-in-default/message_es.properties diff --git a/its/ruling/projects/custom/missing-translations-in-default/message_fr.properties b/its/ruling/projects/iso8859/missing-translations-in-default/message_fr.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations-in-default/message_fr.properties rename to its/ruling/projects/iso8859/missing-translations-in-default/message_fr.properties diff --git a/its/ruling/projects/custom/missing-translations-in-default/message_fr_FR.properties b/its/ruling/projects/iso8859/missing-translations-in-default/message_fr_FR.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations-in-default/message_fr_FR.properties rename to its/ruling/projects/iso8859/missing-translations-in-default/message_fr_FR.properties diff --git a/its/ruling/projects/custom/missing-translations-in-default/test_fr_FR.properties b/its/ruling/projects/iso8859/missing-translations-in-default/test_fr_FR.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations-in-default/test_fr_FR.properties rename to its/ruling/projects/iso8859/missing-translations-in-default/test_fr_FR.properties diff --git a/its/ruling/projects/custom/missing-translations/abc.properties b/its/ruling/projects/iso8859/missing-translations/abc.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations/abc.properties rename to its/ruling/projects/iso8859/missing-translations/abc.properties diff --git a/its/ruling/projects/custom/missing-translations/message.properties b/its/ruling/projects/iso8859/missing-translations/message.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations/message.properties rename to its/ruling/projects/iso8859/missing-translations/message.properties diff --git a/its/ruling/projects/custom/missing-translations/message_en.properties b/its/ruling/projects/iso8859/missing-translations/message_en.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations/message_en.properties rename to its/ruling/projects/iso8859/missing-translations/message_en.properties diff --git a/its/ruling/projects/custom/missing-translations/message_es.properties b/its/ruling/projects/iso8859/missing-translations/message_es.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations/message_es.properties rename to its/ruling/projects/iso8859/missing-translations/message_es.properties diff --git a/its/ruling/projects/custom/missing-translations/message_fr.properties b/its/ruling/projects/iso8859/missing-translations/message_fr.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations/message_fr.properties rename to its/ruling/projects/iso8859/missing-translations/message_fr.properties diff --git a/its/ruling/projects/custom/missing-translations/message_fr_FR.properties b/its/ruling/projects/iso8859/missing-translations/message_fr_FR.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations/message_fr_FR.properties rename to its/ruling/projects/iso8859/missing-translations/message_fr_FR.properties diff --git a/its/ruling/projects/custom/missing-translations/test_fr_FR.properties b/its/ruling/projects/iso8859/missing-translations/test_fr_FR.properties similarity index 100% rename from its/ruling/projects/custom/missing-translations/test_fr_FR.properties rename to its/ruling/projects/iso8859/missing-translations/test_fr_FR.properties diff --git a/its/ruling/projects/custom/newLineEndOfFile.properties b/its/ruling/projects/iso8859/newLineEndOfFile.properties similarity index 100% rename from its/ruling/projects/custom/newLineEndOfFile.properties rename to its/ruling/projects/iso8859/newLineEndOfFile.properties diff --git a/its/ruling/projects/custom/no-properties/noProperties.properties b/its/ruling/projects/iso8859/no-properties/noProperties.properties similarity index 100% rename from its/ruling/projects/custom/no-properties/noProperties.properties rename to its/ruling/projects/iso8859/no-properties/noProperties.properties diff --git a/its/ruling/projects/custom/no-properties/someProperties.properties b/its/ruling/projects/iso8859/no-properties/someProperties.properties similarity index 100% rename from its/ruling/projects/custom/no-properties/someProperties.properties rename to its/ruling/projects/iso8859/no-properties/someProperties.properties diff --git a/its/ruling/projects/custom/noNewLineEndOfFile.properties b/its/ruling/projects/iso8859/noNewLineEndOfFile.properties similarity index 100% rename from its/ruling/projects/custom/noNewLineEndOfFile.properties rename to its/ruling/projects/iso8859/noNewLineEndOfFile.properties diff --git a/its/ruling/projects/custom/noParsingError.properties b/its/ruling/projects/iso8859/noParsingError.properties similarity index 100% rename from its/ruling/projects/custom/noParsingError.properties rename to its/ruling/projects/iso8859/noParsingError.properties diff --git a/its/ruling/projects/custom/noTabCharacter.properties b/its/ruling/projects/iso8859/noTabCharacter.properties similarity index 100% rename from its/ruling/projects/custom/noTabCharacter.properties rename to its/ruling/projects/iso8859/noTabCharacter.properties diff --git a/its/ruling/projects/custom/parsingError.properties b/its/ruling/projects/iso8859/parsingError.properties similarity index 100% rename from its/ruling/projects/custom/parsingError.properties rename to its/ruling/projects/iso8859/parsingError.properties diff --git a/its/ruling/projects/custom/separatorConventionColon.properties b/its/ruling/projects/iso8859/separatorConventionColon.properties similarity index 100% rename from its/ruling/projects/custom/separatorConventionColon.properties rename to its/ruling/projects/iso8859/separatorConventionColon.properties diff --git a/its/ruling/projects/custom/separatorConventionEquals.properties b/its/ruling/projects/iso8859/separatorConventionEquals.properties similarity index 100% rename from its/ruling/projects/custom/separatorConventionEquals.properties rename to its/ruling/projects/iso8859/separatorConventionEquals.properties diff --git a/its/ruling/projects/custom/sonarscanner/deprecatedProperties.properties b/its/ruling/projects/iso8859/sonarscanner/deprecatedProperties.properties similarity index 100% rename from its/ruling/projects/custom/sonarscanner/deprecatedProperties.properties rename to its/ruling/projects/iso8859/sonarscanner/deprecatedProperties.properties diff --git a/its/ruling/projects/custom/tabCharacter.properties b/its/ruling/projects/iso8859/tabCharacter.properties similarity index 100% rename from its/ruling/projects/custom/tabCharacter.properties rename to its/ruling/projects/iso8859/tabCharacter.properties diff --git a/its/ruling/projects/custom/todo.properties b/its/ruling/projects/iso8859/todo.properties similarity index 100% rename from its/ruling/projects/custom/todo.properties rename to its/ruling/projects/iso8859/todo.properties diff --git a/its/ruling/projects/custom/tooManyKeys30.properties b/its/ruling/projects/iso8859/tooManyKeys30.properties similarity index 100% rename from its/ruling/projects/custom/tooManyKeys30.properties rename to its/ruling/projects/iso8859/tooManyKeys30.properties diff --git a/its/ruling/projects/custom/tooManyKeys50.properties b/its/ruling/projects/iso8859/tooManyKeys50.properties similarity index 100% rename from its/ruling/projects/custom/tooManyKeys50.properties rename to its/ruling/projects/iso8859/tooManyKeys50.properties diff --git a/its/ruling/projects/custom/valueRegularExpression.properties b/its/ruling/projects/iso8859/valueRegularExpression.properties similarity index 100% rename from its/ruling/projects/custom/valueRegularExpression.properties rename to its/ruling/projects/iso8859/valueRegularExpression.properties diff --git a/its/ruling/projects/custom/valueRegularExpressionNoMatch.properties b/its/ruling/projects/iso8859/valueRegularExpressionNoMatch.properties similarity index 100% rename from its/ruling/projects/custom/valueRegularExpressionNoMatch.properties rename to its/ruling/projects/iso8859/valueRegularExpressionNoMatch.properties diff --git a/its/ruling/projects/custom/bom/utf8.properties b/its/ruling/projects/utf8/bom/utf8.properties similarity index 100% rename from its/ruling/projects/custom/bom/utf8.properties rename to its/ruling/projects/utf8/bom/utf8.properties diff --git a/its/ruling/projects/custom/bom/utf8WithBOM.properties b/its/ruling/projects/utf8/bom/utf8WithBOM.properties similarity index 100% rename from its/ruling/projects/custom/bom/utf8WithBOM.properties rename to its/ruling/projects/utf8/bom/utf8WithBOM.properties diff --git a/its/ruling/projects/custom/duplicatedKeysUTF8WithBOM.properties b/its/ruling/projects/utf8/duplicatedKeysUTF8WithBOM.properties similarity index 100% rename from its/ruling/projects/custom/duplicatedKeysUTF8WithBOM.properties rename to its/ruling/projects/utf8/duplicatedKeysUTF8WithBOM.properties diff --git a/its/ruling/projects/custom/indentation/indentationUTF8WithBOM.properties b/its/ruling/projects/utf8/indentation/indentationUTF8WithBOM.properties similarity index 100% rename from its/ruling/projects/custom/indentation/indentationUTF8WithBOM.properties rename to its/ruling/projects/utf8/indentation/indentationUTF8WithBOM.properties diff --git a/its/ruling/projects/custom/indentation/indentationUTF8WithBOMIssueFirstLine.properties b/its/ruling/projects/utf8/indentation/indentationUTF8WithBOMIssueFirstLine.properties similarity index 100% rename from its/ruling/projects/custom/indentation/indentationUTF8WithBOMIssueFirstLine.properties rename to its/ruling/projects/utf8/indentation/indentationUTF8WithBOMIssueFirstLine.properties diff --git a/its/ruling/projects/custom/java9-default-encoding-switch/java9DefaultEncodingSwitchUTF8.properties b/its/ruling/projects/utf8/java9-default-encoding-switch/java9DefaultEncodingSwitchUTF8.properties similarity index 100% rename from its/ruling/projects/custom/java9-default-encoding-switch/java9DefaultEncodingSwitchUTF8.properties rename to its/ruling/projects/utf8/java9-default-encoding-switch/java9DefaultEncodingSwitchUTF8.properties diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-S1134.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-S1134.json new file mode 100644 index 0000000..a7bc8dd --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-S1134.json @@ -0,0 +1,15 @@ +{ +'iso8859:commentedOutCode.properties':[ +72, +73, +76, +77, +], +'iso8859:fixme.properties':[ +2, +5, +8, +11, +14, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-S1135.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-S1135.json new file mode 100644 index 0000000..d848f19 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-S1135.json @@ -0,0 +1,15 @@ +{ +'iso8859:commentedOutCode.properties':[ +74, +75, +78, +79, +], +'iso8859:todo.properties':[ +2, +5, +8, +11, +14, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-S1578.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-S1578.json new file mode 100644 index 0000000..80bfe78 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-S1578.json @@ -0,0 +1,11 @@ +{ +'iso8859:file-name/file_name.ko.properties':[ +0, +], +'iso8859:file-name/file_name.kocustom.properties':[ +0, +], +'iso8859:file-name/file_name.ok.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-S2068.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-S2068.json new file mode 100644 index 0000000..44a411c --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-S2068.json @@ -0,0 +1,9 @@ +{ +'iso8859:hard-coded-credentials/hardCodedCredentials.properties':[ +2, +5, +8, +11, +14, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-S2260.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-S2260.json new file mode 100644 index 0000000..7f5a33b --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-S2260.json @@ -0,0 +1,5 @@ +{ +'iso8859:parsingError.properties':[ +3, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-comment-convention.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-comment-convention.json new file mode 100644 index 0000000..7f5c971 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-comment-convention.json @@ -0,0 +1,93 @@ +{ +'iso8859:comment-convention/commentsExclamationMarkAndHash.properties':[ +1, +4, +6, +9, +], +'iso8859:comment-convention/commentsExclamationMarkMissingWhitespace.properties':[ +1, +2, +2, +3, +3, +], +'iso8859:comment-convention/commentsExclamationMarkOnly.properties':[ +1, +2, +3, +], +'iso8859:comment-convention/commentsHashAndExclamationMark.properties':[ +4, +9, +], +'iso8859:comment-convention/commentsHashMissingWhitespace.properties':[ +2, +3, +], +'iso8859:commentRegularExpression.properties':[ +2, +], +'iso8859:commentedOutCode.properties':[ +3, +5, +11, +11, +13, +13, +15, +17, +19, +21, +23, +25, +27, +29, +31, +33, +35, +37, +39, +41, +43, +45, +57, +58, +60, +61, +62, +68, +69, +70, +72, +73, +73, +74, +75, +75, +76, +77, +77, +78, +79, +79, +], +'iso8859:fixme.properties':[ +5, +8, +11, +11, +14, +], +'iso8859:indentation/indentation.properties':[ +7, +17, +], +'iso8859:todo.properties':[ +5, +8, +11, +11, +14, +], +} diff --git a/its/ruling/tests/src/test/expected/jproperties-commented-out-code.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-commented-out-code.json similarity index 51% rename from its/ruling/tests/src/test/expected/jproperties-commented-out-code.json rename to its/ruling/tests/src/test/expected/iso8859/jproperties-commented-out-code.json index 6222cc5..55bad78 100644 --- a/its/ruling/tests/src/test/expected/jproperties-commented-out-code.json +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-commented-out-code.json @@ -1,8 +1,8 @@ { -'project:custom/commentRegularExpression.properties':[ +'iso8859:commentRegularExpression.properties':[ 3, ], -'project:custom/commentedOutCode.properties':[ +'iso8859:commentedOutCode.properties':[ 3, 5, 7, diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys-across-files.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys-across-files.json new file mode 100644 index 0000000..8a967db --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys-across-files.json @@ -0,0 +1,76 @@ +{ +'iso8859:comment-convention/commentsExclamationMarkAndHash.properties':[ +11, +], +'iso8859:commentRegularExpression.properties':[ +5, +], +'iso8859:cross-file-duplicated-keys/crossFileDuplicatedKeys1.properties':[ +2, +3, +4, +], +'iso8859:duplicated-keys-across-files/keys.properties':[ +1, +2, +], +'iso8859:duplicatedKeys.properties':[ +6, +], +'iso8859:duplicatedValues.properties':[ +1, +4, +5, +7, +9, +12, +15, +19, +20, +22, +23, +26, +27, +29, +30, +32, +33, +], +'iso8859:emptyElement.properties':[ +1, +2, +5, +8, +], +'iso8859:keyNamingConvention.properties':[ +1, +2, +3, +6, +7, +10, +13, +16, +18, +], +'iso8859:keyRegularExpression.properties':[ +7, +8, +], +'iso8859:missing-translations-in-default/message.properties':[ +1, +2, +], +'iso8859:separatorConventionColon.properties':[ +1, +2, +5, +9, +18, +20, +], +'iso8859:valueRegularExpression.properties':[ +8, +9, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys.json new file mode 100644 index 0000000..78f27b0 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-keys.json @@ -0,0 +1,38 @@ +{ +'iso8859:commentedOutCode.properties':[ +1, +], +'iso8859:duplicatedKeys.properties':[ +2, +6, +12, +], +'iso8859:duplicatedValuesCustom1.properties':[ +33, +], +'iso8859:lineLength.properties':[ +1, +], +'iso8859:missing-translations/message.properties':[ +3, +], +'iso8859:missing-translations/message_en.properties':[ +3, +], +'iso8859:separatorConventionColon.properties':[ +9, +20, +], +'iso8859:separatorConventionEquals.properties':[ +15, +], +'iso8859:tooManyKeys30.properties':[ +2, +], +'iso8859:tooManyKeys50.properties':[ +1, +], +'iso8859:valueRegularExpression.properties':[ +2, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-values.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-values.json new file mode 100644 index 0000000..341eb67 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-duplicated-values.json @@ -0,0 +1,67 @@ +{ +'iso8859:commentedOutCode.properties':[ +1, +], +'iso8859:duplicatedKeys.properties':[ +2, +], +'iso8859:duplicatedValues.properties':[ +4, +12, +], +'iso8859:duplicatedValuesCustom1.properties':[ +4, +12, +], +'iso8859:duplicatedValuesCustom2.properties':[ +3, +11, +], +'iso8859:emptyElement.properties':[ +1, +], +'iso8859:indentation/indentation.properties':[ +1, +], +'iso8859:indentation/indentationIssueFirstLine.properties':[ +1, +], +'iso8859:keyNamingConvention.properties':[ +1, +7, +], +'iso8859:keyNamingConventionCustom.properties':[ +2, +13, +], +'iso8859:missing-translations/abc.properties':[ +1, +], +'iso8859:missing-translations/message.properties':[ +1, +], +'iso8859:missing-translations/message_en.properties':[ +1, +], +'iso8859:missing-translations/message_fr.properties':[ +1, +], +'iso8859:missing-translations/message_fr_FR.properties':[ +1, +], +'iso8859:separatorConventionColon.properties':[ +1, +], +'iso8859:separatorConventionEquals.properties':[ +1, +], +'iso8859:tabCharacter.properties':[ +1, +], +'iso8859:tooManyKeys30.properties':[ +2, +], +'iso8859:tooManyKeys50.properties':[ +1, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-empty-element.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-empty-element.json new file mode 100644 index 0000000..6d010a0 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-empty-element.json @@ -0,0 +1,26 @@ +{ +'iso8859:duplicatedValues.properties':[ +19, +20, +], +'iso8859:duplicatedValuesCustom1.properties':[ +15, +16, +], +'iso8859:duplicatedValuesCustom2.properties':[ +14, +15, +], +'iso8859:emptyElement.properties':[ +5, +8, +], +'iso8859:separatorConventionColon.properties':[ +20, +23, +], +'iso8859:separatorConventionEquals.properties':[ +15, +16, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-empty-line-end-of-file.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-empty-line-end-of-file.json new file mode 100644 index 0000000..a731401 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-empty-line-end-of-file.json @@ -0,0 +1,8 @@ +{ +'iso8859:no-properties/noProperties.properties':[ +0, +], +'iso8859:noNewLineEndOfFile.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-indentation.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-indentation.json new file mode 100644 index 0000000..a269b31 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-indentation.json @@ -0,0 +1,68 @@ +{ +'iso8859:comment-convention/commentsExclamationMarkAndHash.properties':[ +2, +4, +], +'iso8859:comment-convention/commentsExclamationMarkMissingWhitespace.properties':[ +3, +], +'iso8859:comment-convention/commentsExclamationMarkOnly.properties':[ +1, +], +'iso8859:comment-convention/commentsHashAndExclamationMark.properties':[ +1, +4, +], +'iso8859:comment-convention/commentsHashMissingWhitespace.properties':[ +3, +], +'iso8859:comment-convention/commentsHashOnly.properties':[ +1, +], +'iso8859:commentedOutCode.properties':[ +5, +9, +13, +17, +], +'iso8859:indentation/indentation.properties':[ +4, +7, +10, +13, +17, +20, +], +'iso8859:indentation/indentationIssueFirstLine.properties':[ +1, +5, +8, +], +'iso8859:keyNamingConvention.properties':[ +13, +], +'iso8859:keyRegularExpression.properties':[ +5, +], +'iso8859:lineLength.properties':[ +3, +4, +], +'iso8859:separatorConventionColon.properties':[ +2, +5, +9, +12, +15, +18, +], +'iso8859:separatorConventionEquals.properties':[ +2, +5, +8, +11, +], +'iso8859:tabCharacter.properties':[ +2, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-java9-default-encoding-switch.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-java9-default-encoding-switch.json new file mode 100644 index 0000000..f0e3316 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-java9-default-encoding-switch.json @@ -0,0 +1,6 @@ +{ +'iso8859:java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties':[ +2, +5, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-key-naming-convention.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-key-naming-convention.json new file mode 100644 index 0000000..c78cc2f --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-key-naming-convention.json @@ -0,0 +1,33 @@ +{ +'iso8859:duplicatedKeys.properties':[ +12, +13, +], +'iso8859:duplicatedValues.properties':[ +29, +30, +], +'iso8859:duplicatedValuesCustom1.properties':[ +28, +29, +], +'iso8859:duplicatedValuesCustom2.properties':[ +27, +28, +], +'iso8859:java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties':[ +5, +], +'iso8859:keyNamingConvention.properties':[ +6, +10, +13, +16, +], +'iso8859:keyNamingConventionCustom.properties':[ +11, +14, +15, +16, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-line-length.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-line-length.json new file mode 100644 index 0000000..adf8477 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-line-length.json @@ -0,0 +1,14 @@ +{ +'iso8859:duplicatedValues.properties':[ +11, +], +'iso8859:duplicatedValuesCustom1.properties':[ +11, +], +'iso8859:duplicatedValuesCustom2.properties':[ +10, +], +'iso8859:tooManyKeys30.properties':[ +1, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-maximum-number-keys.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-maximum-number-keys.json new file mode 100644 index 0000000..34f8eb9 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-maximum-number-keys.json @@ -0,0 +1,5 @@ +{ +'iso8859:tooManyKeys50.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations-in-default.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations-in-default.json new file mode 100644 index 0000000..1fe1e8f --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations-in-default.json @@ -0,0 +1,12 @@ +{ +'iso8859:missing-translations-in-default/message.properties':[ +0, +0, +0, +0, +], +'iso8859:missing-translations/message.properties':[ +0, +0, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations.json new file mode 100644 index 0000000..7e99352 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-missing-translations.json @@ -0,0 +1,14 @@ +{ +'iso8859:missing-translations-in-default/message_fr_FR.properties':[ +0, +], +'iso8859:missing-translations/message_es.properties':[ +0, +], +'iso8859:missing-translations/message_fr.properties':[ +0, +], +'iso8859:missing-translations/message_fr_FR.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-no-properties.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-no-properties.json new file mode 100644 index 0000000..f157356 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-no-properties.json @@ -0,0 +1,17 @@ +{ +'iso8859:comment-convention/commentsExclamationMarkMissingWhitespace.properties':[ +0, +], +'iso8859:comment-convention/commentsHashMissingWhitespace.properties':[ +0, +], +'iso8859:fixme.properties':[ +0, +], +'iso8859:no-properties/noProperties.properties':[ +0, +], +'iso8859:todo.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-separator-convention.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-separator-convention.json new file mode 100644 index 0000000..5a71c71 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-separator-convention.json @@ -0,0 +1,36 @@ +{ +'iso8859:emptyElement.properties':[ +2, +8, +10, +], +'iso8859:indentation/indentation.properties':[ +13, +13, +14, +14, +], +'iso8859:indentation/indentationIssueFirstLine.properties':[ +8, +8, +9, +9, +], +'iso8859:separatorConventionColon.properties':[ +1, +2, +9, +9, +12, +12, +15, +18, +20, +], +'iso8859:separatorConventionEquals.properties':[ +5, +8, +11, +15, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/jproperties-tab-character.json b/its/ruling/tests/src/test/expected/iso8859/jproperties-tab-character.json new file mode 100644 index 0000000..84d5e27 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/jproperties-tab-character.json @@ -0,0 +1,5 @@ +{ +'iso8859:tabCharacter.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/iso8859/sonarscanner-sonar-scanner-deprecated-properties.json b/its/ruling/tests/src/test/expected/iso8859/sonarscanner-sonar-scanner-deprecated-properties.json new file mode 100644 index 0000000..a49aa70 --- /dev/null +++ b/its/ruling/tests/src/test/expected/iso8859/sonarscanner-sonar-scanner-deprecated-properties.json @@ -0,0 +1,9 @@ +{ +'iso8859:sonarscanner/deprecatedProperties.properties':[ +4, +7, +10, +13, +16, +], +} diff --git a/its/ruling/tests/src/test/expected/jproperties-S1134.json b/its/ruling/tests/src/test/expected/jproperties-S1134.json deleted file mode 100644 index 7a3e525..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-S1134.json +++ /dev/null @@ -1,15 +0,0 @@ -{ -'project:custom/commentedOutCode.properties':[ -72, -73, -76, -77, -], -'project:custom/fixme.properties':[ -2, -5, -8, -11, -14, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-S1135.json b/its/ruling/tests/src/test/expected/jproperties-S1135.json deleted file mode 100644 index f35a656..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-S1135.json +++ /dev/null @@ -1,15 +0,0 @@ -{ -'project:custom/commentedOutCode.properties':[ -74, -75, -78, -79, -], -'project:custom/todo.properties':[ -2, -5, -8, -11, -14, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-S1578.json b/its/ruling/tests/src/test/expected/jproperties-S1578.json deleted file mode 100644 index a48635b..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-S1578.json +++ /dev/null @@ -1,11 +0,0 @@ -{ -'project:custom/file-name/file_name.ko.properties':[ -0, -], -'project:custom/file-name/file_name.kocustom.properties':[ -0, -], -'project:custom/file-name/file_name.ok.properties':[ -0, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-S2068.json b/its/ruling/tests/src/test/expected/jproperties-S2068.json deleted file mode 100644 index bd00f75..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-S2068.json +++ /dev/null @@ -1,9 +0,0 @@ -{ -'project:custom/hard-coded-credentials/hardCodedCredentials.properties':[ -2, -5, -8, -11, -14, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-S2260.json b/its/ruling/tests/src/test/expected/jproperties-S2260.json deleted file mode 100644 index 90c2dcb..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-S2260.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -'project:custom/parsingError.properties':[ -3, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-bom-utf8-files.json b/its/ruling/tests/src/test/expected/jproperties-bom-utf8-files.json deleted file mode 100644 index f4dcc43..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-bom-utf8-files.json +++ /dev/null @@ -1,14 +0,0 @@ -{ -'project:custom/bom/utf8WithBOM.properties':[ -0, -], -'project:custom/duplicatedKeysUTF8WithBOM.properties':[ -0, -], -'project:custom/indentation/indentationUTF8WithBOM.properties':[ -0, -], -'project:custom/indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ -0, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-comment-convention.json b/its/ruling/tests/src/test/expected/jproperties-comment-convention.json deleted file mode 100644 index e23388a..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-comment-convention.json +++ /dev/null @@ -1,93 +0,0 @@ -{ -'project:custom/comment-convention/commentsExclamationMarkAndHash.properties':[ -1, -4, -6, -9, -], -'project:custom/comment-convention/commentsExclamationMarkMissingWhitespace.properties':[ -1, -2, -2, -3, -3, -], -'project:custom/comment-convention/commentsExclamationMarkOnly.properties':[ -1, -2, -3, -], -'project:custom/comment-convention/commentsHashAndExclamationMark.properties':[ -4, -9, -], -'project:custom/comment-convention/commentsHashMissingWhitespace.properties':[ -2, -3, -], -'project:custom/commentRegularExpression.properties':[ -2, -], -'project:custom/commentedOutCode.properties':[ -3, -5, -11, -11, -13, -13, -15, -17, -19, -21, -23, -25, -27, -29, -31, -33, -35, -37, -39, -41, -43, -45, -57, -58, -60, -61, -62, -68, -69, -70, -72, -73, -73, -74, -75, -75, -76, -77, -77, -78, -79, -79, -], -'project:custom/fixme.properties':[ -5, -8, -11, -11, -14, -], -'project:custom/indentation/indentation.properties':[ -7, -17, -], -'project:custom/todo.properties':[ -5, -8, -11, -11, -14, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-duplicated-keys-across-files.json b/its/ruling/tests/src/test/expected/jproperties-duplicated-keys-across-files.json deleted file mode 100644 index bd54a69..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-duplicated-keys-across-files.json +++ /dev/null @@ -1,78 +0,0 @@ -{ -'project:custom/bom/utf8.properties':[ -1, -], -'project:custom/comment-convention/commentsExclamationMarkAndHash.properties':[ -11, -], -'project:custom/cross-file-duplicated-keys/crossFileDuplicatedKeys1.properties':[ -2, -3, -4, -], -'project:custom/duplicated-keys-across-files/keys.properties':[ -1, -2, -], -'project:custom/duplicatedKeys.properties':[ -6, -], -'project:custom/duplicatedKeysUTF8WithBOM.properties':[ -5, -], -'project:custom/duplicatedValues.properties':[ -1, -4, -5, -7, -9, -12, -15, -19, -20, -22, -23, -26, -27, -29, -30, -32, -33, -], -'project:custom/emptyElement.properties':[ -1, -2, -5, -8, -], -'project:custom/keyNamingConvention.properties':[ -1, -2, -3, -6, -10, -13, -16, -18, -], -'project:custom/keyRegularExpression.properties':[ -7, -8, -], -'project:custom/missing-translations-in-default/message.properties':[ -1, -2, -], -'project:custom/separatorConventionColon.properties':[ -1, -2, -5, -9, -18, -20, -], -'project:custom/valueRegularExpression.properties':[ -8, -9, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-duplicated-keys.json b/its/ruling/tests/src/test/expected/jproperties-duplicated-keys.json deleted file mode 100644 index 42d1ad3..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-duplicated-keys.json +++ /dev/null @@ -1,41 +0,0 @@ -{ -'project:custom/commentedOutCode.properties':[ -1, -], -'project:custom/duplicatedKeys.properties':[ -2, -6, -12, -], -'project:custom/duplicatedKeysUTF8WithBOM.properties':[ -1, -], -'project:custom/duplicatedValuesCustom1.properties':[ -33, -], -'project:custom/lineLength.properties':[ -1, -], -'project:custom/missing-translations/message.properties':[ -3, -], -'project:custom/missing-translations/message_en.properties':[ -3, -], -'project:custom/separatorConventionColon.properties':[ -9, -20, -], -'project:custom/separatorConventionEquals.properties':[ -15, -], -'project:custom/tooManyKeys30.properties':[ -2, -], -'project:custom/tooManyKeys50.properties':[ -1, -], -'project:custom/valueRegularExpression.properties':[ -2, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-duplicated-values.json b/its/ruling/tests/src/test/expected/jproperties-duplicated-values.json deleted file mode 100644 index ff244a9..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-duplicated-values.json +++ /dev/null @@ -1,73 +0,0 @@ -{ -'project:custom/commentedOutCode.properties':[ -1, -], -'project:custom/duplicatedKeys.properties':[ -2, -], -'project:custom/duplicatedValues.properties':[ -4, -12, -], -'project:custom/duplicatedValuesCustom1.properties':[ -4, -12, -], -'project:custom/duplicatedValuesCustom2.properties':[ -3, -11, -], -'project:custom/emptyElement.properties':[ -1, -], -'project:custom/indentation/indentation.properties':[ -1, -], -'project:custom/indentation/indentationIssueFirstLine.properties':[ -1, -], -'project:custom/indentation/indentationUTF8WithBOM.properties':[ -1, -], -'project:custom/indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ -1, -], -'project:custom/keyNamingConvention.properties':[ -1, -7, -], -'project:custom/keyNamingConventionCustom.properties':[ -2, -13, -], -'project:custom/missing-translations/abc.properties':[ -1, -], -'project:custom/missing-translations/message.properties':[ -1, -], -'project:custom/missing-translations/message_en.properties':[ -1, -], -'project:custom/missing-translations/message_fr.properties':[ -1, -], -'project:custom/missing-translations/message_fr_FR.properties':[ -1, -], -'project:custom/separatorConventionColon.properties':[ -1, -], -'project:custom/separatorConventionEquals.properties':[ -1, -], -'project:custom/tabCharacter.properties':[ -1, -], -'project:custom/tooManyKeys30.properties':[ -2, -], -'project:custom/tooManyKeys50.properties':[ -1, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-empty-element.json b/its/ruling/tests/src/test/expected/jproperties-empty-element.json deleted file mode 100644 index 06b8380..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-empty-element.json +++ /dev/null @@ -1,26 +0,0 @@ -{ -'project:custom/duplicatedValues.properties':[ -19, -20, -], -'project:custom/duplicatedValuesCustom1.properties':[ -15, -16, -], -'project:custom/duplicatedValuesCustom2.properties':[ -14, -15, -], -'project:custom/emptyElement.properties':[ -5, -8, -], -'project:custom/separatorConventionColon.properties':[ -20, -23, -], -'project:custom/separatorConventionEquals.properties':[ -15, -16, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-empty-line-end-of-file.json b/its/ruling/tests/src/test/expected/jproperties-empty-line-end-of-file.json deleted file mode 100644 index f22ff05..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-empty-line-end-of-file.json +++ /dev/null @@ -1,11 +0,0 @@ -{ -'project:custom/duplicatedKeysUTF8WithBOM.properties':[ -0, -], -'project:custom/no-properties/noProperties.properties':[ -0, -], -'project:custom/noNewLineEndOfFile.properties':[ -0, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-indentation.json b/its/ruling/tests/src/test/expected/jproperties-indentation.json deleted file mode 100644 index 2df7399..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-indentation.json +++ /dev/null @@ -1,77 +0,0 @@ -{ -'project:custom/comment-convention/commentsExclamationMarkAndHash.properties':[ -2, -4, -], -'project:custom/comment-convention/commentsExclamationMarkMissingWhitespace.properties':[ -3, -], -'project:custom/comment-convention/commentsExclamationMarkOnly.properties':[ -1, -], -'project:custom/comment-convention/commentsHashAndExclamationMark.properties':[ -1, -4, -], -'project:custom/comment-convention/commentsHashMissingWhitespace.properties':[ -3, -], -'project:custom/comment-convention/commentsHashOnly.properties':[ -1, -], -'project:custom/commentedOutCode.properties':[ -5, -9, -13, -17, -], -'project:custom/indentation/indentation.properties':[ -4, -7, -10, -13, -17, -20, -], -'project:custom/indentation/indentationIssueFirstLine.properties':[ -1, -5, -8, -], -'project:custom/indentation/indentationUTF8WithBOM.properties':[ -4, -7, -], -'project:custom/indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ -1, -5, -8, -], -'project:custom/keyNamingConvention.properties':[ -13, -], -'project:custom/keyRegularExpression.properties':[ -5, -], -'project:custom/lineLength.properties':[ -3, -4, -], -'project:custom/separatorConventionColon.properties':[ -2, -5, -9, -12, -15, -18, -], -'project:custom/separatorConventionEquals.properties':[ -2, -5, -8, -11, -], -'project:custom/tabCharacter.properties':[ -2, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-key-naming-convention.json b/its/ruling/tests/src/test/expected/jproperties-key-naming-convention.json deleted file mode 100644 index 13c3c76..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-key-naming-convention.json +++ /dev/null @@ -1,36 +0,0 @@ -{ -'project:custom/duplicatedKeys.properties':[ -12, -13, -], -'project:custom/duplicatedValues.properties':[ -29, -30, -], -'project:custom/duplicatedValuesCustom1.properties':[ -28, -29, -], -'project:custom/duplicatedValuesCustom2.properties':[ -27, -28, -], -'project:custom/java9-default-encoding-switch/java9DefaultEncodingSwitchISO88591.properties':[ -5, -], -'project:custom/java9-default-encoding-switch/java9DefaultEncodingSwitchUTF8.properties':[ -2, -], -'project:custom/keyNamingConvention.properties':[ -6, -10, -13, -16, -], -'project:custom/keyNamingConventionCustom.properties':[ -11, -14, -15, -16, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-line-length.json b/its/ruling/tests/src/test/expected/jproperties-line-length.json deleted file mode 100644 index 33818d6..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-line-length.json +++ /dev/null @@ -1,14 +0,0 @@ -{ -'project:custom/duplicatedValues.properties':[ -11, -], -'project:custom/duplicatedValuesCustom1.properties':[ -11, -], -'project:custom/duplicatedValuesCustom2.properties':[ -10, -], -'project:custom/tooManyKeys30.properties':[ -1, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-maximum-number-keys.json b/its/ruling/tests/src/test/expected/jproperties-maximum-number-keys.json deleted file mode 100644 index 6d74530..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-maximum-number-keys.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -'project:custom/tooManyKeys50.properties':[ -0, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-missing-translations-in-default.json b/its/ruling/tests/src/test/expected/jproperties-missing-translations-in-default.json deleted file mode 100644 index 1d74c54..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-missing-translations-in-default.json +++ /dev/null @@ -1,12 +0,0 @@ -{ -'project:custom/missing-translations-in-default/message.properties':[ -0, -0, -0, -0, -], -'project:custom/missing-translations/message.properties':[ -0, -0, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-missing-translations.json b/its/ruling/tests/src/test/expected/jproperties-missing-translations.json deleted file mode 100644 index 37d5be7..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-missing-translations.json +++ /dev/null @@ -1,14 +0,0 @@ -{ -'project:custom/missing-translations-in-default/message_fr_FR.properties':[ -0, -], -'project:custom/missing-translations/message_es.properties':[ -0, -], -'project:custom/missing-translations/message_fr.properties':[ -0, -], -'project:custom/missing-translations/message_fr_FR.properties':[ -0, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-no-properties.json b/its/ruling/tests/src/test/expected/jproperties-no-properties.json deleted file mode 100644 index 6be27b0..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-no-properties.json +++ /dev/null @@ -1,17 +0,0 @@ -{ -'project:custom/comment-convention/commentsExclamationMarkMissingWhitespace.properties':[ -0, -], -'project:custom/comment-convention/commentsHashMissingWhitespace.properties':[ -0, -], -'project:custom/fixme.properties':[ -0, -], -'project:custom/no-properties/noProperties.properties':[ -0, -], -'project:custom/todo.properties':[ -0, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-separator-convention.json b/its/ruling/tests/src/test/expected/jproperties-separator-convention.json deleted file mode 100644 index 1faafd1..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-separator-convention.json +++ /dev/null @@ -1,48 +0,0 @@ -{ -'project:custom/emptyElement.properties':[ -2, -8, -10, -], -'project:custom/indentation/indentation.properties':[ -13, -13, -14, -14, -], -'project:custom/indentation/indentationIssueFirstLine.properties':[ -8, -8, -9, -9, -], -'project:custom/indentation/indentationUTF8WithBOM.properties':[ -7, -7, -8, -8, -], -'project:custom/indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ -8, -8, -9, -9, -], -'project:custom/separatorConventionColon.properties':[ -1, -2, -9, -9, -12, -12, -15, -18, -20, -], -'project:custom/separatorConventionEquals.properties':[ -5, -8, -11, -15, -], -} diff --git a/its/ruling/tests/src/test/expected/jproperties-tab-character.json b/its/ruling/tests/src/test/expected/jproperties-tab-character.json deleted file mode 100644 index 8e8160c..0000000 --- a/its/ruling/tests/src/test/expected/jproperties-tab-character.json +++ /dev/null @@ -1,5 +0,0 @@ -{ -'project:custom/tabCharacter.properties':[ -0, -], -} diff --git a/its/ruling/tests/src/test/expected/sonarscanner-sonar-scanner-deprecated-properties.json b/its/ruling/tests/src/test/expected/sonarscanner-sonar-scanner-deprecated-properties.json deleted file mode 100644 index 3daf893..0000000 --- a/its/ruling/tests/src/test/expected/sonarscanner-sonar-scanner-deprecated-properties.json +++ /dev/null @@ -1,9 +0,0 @@ -{ -'project:custom/sonarscanner/deprecatedProperties.properties':[ -4, -7, -10, -13, -16, -], -} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-bom-utf8-files.json b/its/ruling/tests/src/test/expected/utf8/jproperties-bom-utf8-files.json new file mode 100644 index 0000000..67cb843 --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-bom-utf8-files.json @@ -0,0 +1,14 @@ +{ +'utf8:bom/utf8WithBOM.properties':[ +0, +], +'utf8:duplicatedKeysUTF8WithBOM.properties':[ +0, +], +'utf8:indentation/indentationUTF8WithBOM.properties':[ +0, +], +'utf8:indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys-across-files.json b/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys-across-files.json new file mode 100644 index 0000000..4fab558 --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys-across-files.json @@ -0,0 +1,11 @@ +{ +'utf8:bom/utf8.properties':[ +1, +], +'utf8:indentation/indentationUTF8WithBOM.properties':[ +1, +4, +7, +8, +], +} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys.json b/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys.json new file mode 100644 index 0000000..64f31ca --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-keys.json @@ -0,0 +1,5 @@ +{ +'utf8:duplicatedKeysUTF8WithBOM.properties':[ +1, +], +} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-values.json b/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-values.json new file mode 100644 index 0000000..8e0cae0 --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-duplicated-values.json @@ -0,0 +1,8 @@ +{ +'utf8:indentation/indentationUTF8WithBOM.properties':[ +1, +], +'utf8:indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ +1, +], +} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-empty-line-end-of-file.json b/its/ruling/tests/src/test/expected/utf8/jproperties-empty-line-end-of-file.json new file mode 100644 index 0000000..9c4aa5e --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-empty-line-end-of-file.json @@ -0,0 +1,5 @@ +{ +'utf8:duplicatedKeysUTF8WithBOM.properties':[ +0, +], +} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-indentation.json b/its/ruling/tests/src/test/expected/utf8/jproperties-indentation.json new file mode 100644 index 0000000..6136b72 --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-indentation.json @@ -0,0 +1,11 @@ +{ +'utf8:indentation/indentationUTF8WithBOM.properties':[ +4, +7, +], +'utf8:indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ +1, +5, +8, +], +} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-key-naming-convention.json b/its/ruling/tests/src/test/expected/utf8/jproperties-key-naming-convention.json new file mode 100644 index 0000000..cecdd10 --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-key-naming-convention.json @@ -0,0 +1,5 @@ +{ +'utf8:java9-default-encoding-switch/java9DefaultEncodingSwitchUTF8.properties':[ +2, +], +} diff --git a/its/ruling/tests/src/test/expected/utf8/jproperties-separator-convention.json b/its/ruling/tests/src/test/expected/utf8/jproperties-separator-convention.json new file mode 100644 index 0000000..ebbabca --- /dev/null +++ b/its/ruling/tests/src/test/expected/utf8/jproperties-separator-convention.json @@ -0,0 +1,14 @@ +{ +'utf8:indentation/indentationUTF8WithBOM.properties':[ +7, +7, +8, +8, +], +'utf8:indentation/indentationUTF8WithBOMIssueFirstLine.properties':[ +8, +8, +9, +9, +], +} diff --git a/its/ruling/tests/src/test/java/org/sonar/jproperties/its/JavaPropertiesRulingTest.java b/its/ruling/tests/src/test/java/org/sonar/jproperties/its/JavaPropertiesRulingTest.java index 4e1f559..a1d4957 100644 --- a/its/ruling/tests/src/test/java/org/sonar/jproperties/its/JavaPropertiesRulingTest.java +++ b/its/ruling/tests/src/test/java/org/sonar/jproperties/its/JavaPropertiesRulingTest.java @@ -23,14 +23,13 @@ import com.sonar.orchestrator.Orchestrator; import com.sonar.orchestrator.build.SonarScanner; import com.sonar.orchestrator.locator.FileLocation; - -import java.io.File; -import java.nio.charset.StandardCharsets; - import org.junit.Before; import org.junit.ClassRule; import org.junit.Test; +import java.io.File; +import java.nio.charset.StandardCharsets; + import static org.fest.assertions.Assertions.assertThat; public class JavaPropertiesRulingTest { @@ -48,27 +47,39 @@ public void setUp() throws Exception { } @Test - public void test() throws Exception { - File litsDifferencesFile = FileLocation.of("target/differences").getFile(); - orchestrator.getServer().provisionProject("project", "project"); - orchestrator.getServer().associateProjectToQualityProfile("project", "jproperties", "rules"); - SonarScanner build = SonarScanner.create(FileLocation.of("../projects").getFile()) - .setProjectKey("project") - .setProjectName("project") + public void test_iso8859() throws Exception { + testProject("iso8859", "ISO-8859-1"); + } + + @Test + public void test_ut8() throws Exception { + testProject("utf8", "UTF-8"); + } + + private void testProject(String projectKey, String encoding) throws Exception { + orchestrator.getServer().provisionProject(projectKey, projectKey); + orchestrator.getServer().associateProjectToQualityProfile(projectKey, "jproperties", "rules"); + + SonarScanner build = createScanner(projectKey, encoding); + orchestrator.executeBuild(build); + + assertThat(Files.toString(FileLocation.of("target/differences-" + projectKey).getFile(), StandardCharsets.UTF_8)).isEmpty(); + } + + private SonarScanner createScanner(String projectKey, String encoding) { + return SonarScanner.create(FileLocation.of("../projects/" + projectKey).getFile()) + .setProjectKey(projectKey) + .setProjectName(projectKey) .setProjectVersion("1.0") .setLanguage("jproperties") .setSourceDirs("./") - .setSourceEncoding("UTF-8") + .setSourceEncoding(encoding) .setProperty("sonar.analysis.mode", "preview") .setProperty("sonar.issuesReport.html.enable", "true") - .setProperty("dump.old", FileLocation.of("src/test/expected").getFile().getAbsolutePath()) - .setProperty("dump.new", FileLocation.of("target/actual").getFile().getAbsolutePath()) - .setProperty("lits.differences", litsDifferencesFile.getAbsolutePath()) + .setProperty("dump.old", FileLocation.of("src/test/expected/" + projectKey).getFile().getAbsolutePath()) + .setProperty("dump.new", FileLocation.of("target/actual-" + projectKey).getFile().getAbsolutePath()) + .setProperty("lits.differences", FileLocation.of("target/differences-" + projectKey).getFile().getAbsolutePath()) .setProperty("sonar.cpd.skip", "true") - .setProperty("sonar.jproperties.sourceEncoding", "UTF-8"); - orchestrator.executeBuild(build); - - assertThat(Files.toString(litsDifferencesFile, StandardCharsets.UTF_8)).isEmpty(); + .setProperty("sonar.jproperties.sourceEncoding", encoding); } - }