diff options
| author | Roel Spilker <r.spilker@gmail.com> | 2020-01-17 02:40:10 +0100 |
|---|---|---|
| committer | Roel Spilker <r.spilker@gmail.com> | 2020-01-20 14:11:21 +0100 |
| commit | 04523763dff98206487b2e358697226ac7b87fd7 (patch) | |
| tree | 8ca871b92f6ed22b8fe843b66b3d8d7c66c1e633 /test | |
| parent | 290edf95275f82e674952b21d27b9f485f5a2418 (diff) | |
| download | lombok-04523763dff98206487b2e358697226ac7b87fd7.tar.gz lombok-04523763dff98206487b2e358697226ac7b87fd7.tar.bz2 lombok-04523763dff98206487b2e358697226ac7b87fd7.zip | |
Config import: support .jar and .zip archives
Diffstat (limited to 'test')
12 files changed, 61 insertions, 7 deletions
diff --git a/test/configuration/resource/configurationRoot/archives/a1.jar b/test/configuration/resource/configurationRoot/archives/a1.jar Binary files differnew file mode 100644 index 00000000..d7dca22d --- /dev/null +++ b/test/configuration/resource/configurationRoot/archives/a1.jar diff --git a/test/configuration/resource/configurationRoot/archives/a1/d1/include.config b/test/configuration/resource/configurationRoot/archives/a1/d1/include.config new file mode 100644 index 00000000..cb5316f2 --- /dev/null +++ b/test/configuration/resource/configurationRoot/archives/a1/d1/include.config @@ -0,0 +1,4 @@ +import ../d2/include.config +import nonexisting + +lombok.addGeneratedAnnotation = true
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/archives/a1/d2/include.config b/test/configuration/resource/configurationRoot/archives/a1/d2/include.config new file mode 100644 index 00000000..d936fcfb --- /dev/null +++ b/test/configuration/resource/configurationRoot/archives/a1/d2/include.config @@ -0,0 +1 @@ +lombok.addJavaxGeneratedAnnotation = true
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/archives/a1/lombok.config b/test/configuration/resource/configurationRoot/archives/a1/lombok.config new file mode 100644 index 00000000..14ad3803 --- /dev/null +++ b/test/configuration/resource/configurationRoot/archives/a1/lombok.config @@ -0,0 +1,3 @@ +import d1/include.config +import /illegal +lombok.anyConstructor.addConstructorProperties = true
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/archives/a2.zip b/test/configuration/resource/configurationRoot/archives/a2.zip Binary files differnew file mode 100644 index 00000000..2b0d0036 --- /dev/null +++ b/test/configuration/resource/configurationRoot/archives/a2.zip diff --git a/test/configuration/resource/configurationRoot/archives/a2/reset.config b/test/configuration/resource/configurationRoot/archives/a2/reset.config new file mode 100644 index 00000000..94f6e4aa --- /dev/null +++ b/test/configuration/resource/configurationRoot/archives/a2/reset.config @@ -0,0 +1 @@ +clear lombok.copyableAnnotations
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/d1/d11/d111/import1.config b/test/configuration/resource/configurationRoot/d1/d11/d111/import1.config index 2a38bda5..e94bd991 100644 --- a/test/configuration/resource/configurationRoot/d1/d11/d111/import1.config +++ b/test/configuration/resource/configurationRoot/d1/d11/d111/import1.config @@ -1,5 +1,6 @@ import missing
import import1.config
import ../d111/import1.config
+import ../../../archives/a1.jar
lombok.accessors.prefix += z_
lombok.accessors.prefix += f
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/d1/d11/d111/lombok.config b/test/configuration/resource/configurationRoot/d1/d11/d111/lombok.config index fefcea42..7e7719e1 100644 --- a/test/configuration/resource/configurationRoot/d1/d11/d111/lombok.config +++ b/test/configuration/resource/configurationRoot/d1/d11/d111/lombok.config @@ -1,3 +1,5 @@ import import1.config +import ../../../archives/a2.zip!reset.config clear lombok.accessors.chain -lombok.accessors.prefix += m_
\ No newline at end of file +lombok.accessors.prefix += m_ +lombok.copyableAnnotations += copy2
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/d1/d11/lombok.config b/test/configuration/resource/configurationRoot/d1/d11/lombok.config index ec53df09..82238ba6 100644 --- a/test/configuration/resource/configurationRoot/d1/d11/lombok.config +++ b/test/configuration/resource/configurationRoot/d1/d11/lombok.config @@ -2,4 +2,6 @@ config.stopBubbling=true lombok.accessors.chain = false lombok.accessors.flagUsage = ERROR -lombok.accessors.prefix += f
\ No newline at end of file +lombok.accessors.prefix += f + +lombok.copyableAnnotations += copy1
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/err.txt b/test/configuration/resource/configurationRoot/err.txt index a9b3f8af..c17a6dea 100644 --- a/test/configuration/resource/configurationRoot/err.txt +++ b/test/configuration/resource/configurationRoot/err.txt @@ -1,2 +1,4 @@ Problems in the configuration files: -- Imported file does not exist: import missing (BASE/d1/d11/d111/import1.config:1)
\ No newline at end of file +- Imported file does not exist: import missing (BASE/d1/d11/d111/import1.config:1) +- Import is not valid: import /illegal (BASE/archives/a1.jar!lombok.config:2) +- Imported file does not exist: import nonexisting (BASE/archives/a1.jar!d1/include.config:2)
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/generate.bat b/test/configuration/resource/configurationRoot/generate.bat new file mode 100644 index 00000000..1a1f8fb0 --- /dev/null +++ b/test/configuration/resource/configurationRoot/generate.bat @@ -0,0 +1,2 @@ +jar -c -M -f archives/a1.jar -C archives/a1 . +jar -c -M -f archives/a2.zip -C archives/a2 .
\ No newline at end of file diff --git a/test/configuration/resource/configurationRoot/out.txt b/test/configuration/resource/configurationRoot/out.txt index 8cdd9bca..cca31c02 100644 --- a/test/configuration/resource/configurationRoot/out.txt +++ b/test/configuration/resource/configurationRoot/out.txt @@ -28,9 +28,21 @@ lombok.accessors.flagUsage = ERROR # BASE/d1/d11/lombok.config (stopped bubbling): # 4: lombok.accessors.flagUsage = ERROR # +# BASE/archives/a1.jar!d2/include.config (imported from BASE/archives/a1.jar!d1/include.config:1): +# <'lombok.accessors.flagUsage' not mentioned> +# +# BASE/archives/a1.jar!d1/include.config (imported from BASE/archives/a1.jar!lombok.config:1): +# <'lombok.accessors.flagUsage' not mentioned> +# +# BASE/archives/a1.jar!lombok.config (imported from BASE/d1/d11/d111/import1.config:4): +# <'lombok.accessors.flagUsage' not mentioned> +# # BASE/d1/d11/d111/import1.config (imported from BASE/d1/d11/d111/lombok.config:1): # <'lombok.accessors.flagUsage' not mentioned> # +# BASE/archives/a2.zip!reset.config (imported from BASE/d1/d11/d111/lombok.config:2): +# <'lombok.accessors.flagUsage' not mentioned> +# # BASE/d1/d11/d111/lombok.config: # <'lombok.accessors.flagUsage' not mentioned> @@ -39,11 +51,23 @@ clear lombok.accessors.chain # BASE/d1/d11/lombok.config (stopped bubbling): # 3: lombok.accessors.chain = false # +# BASE/archives/a1.jar!d2/include.config (imported from BASE/archives/a1.jar!d1/include.config:1): +# <'lombok.accessors.chain' not mentioned> +# +# BASE/archives/a1.jar!d1/include.config (imported from BASE/archives/a1.jar!lombok.config:1): +# <'lombok.accessors.chain' not mentioned> +# +# BASE/archives/a1.jar!lombok.config (imported from BASE/d1/d11/d111/import1.config:4): +# <'lombok.accessors.chain' not mentioned> +# # BASE/d1/d11/d111/import1.config (imported from BASE/d1/d11/d111/lombok.config:1): # <'lombok.accessors.chain' not mentioned> # +# BASE/archives/a2.zip!reset.config (imported from BASE/d1/d11/d111/lombok.config:2): +# <'lombok.accessors.chain' not mentioned> +# # BASE/d1/d11/d111/lombok.config: -# 2: clear lombok.accessors.chain +# 3: clear lombok.accessors.chain # Strip this field prefix, like 'f' or 'm_', from the names of generated getters and setters. lombok.accessors.prefix += z_ @@ -52,12 +76,24 @@ lombok.accessors.prefix += m_ # BASE/d1/d11/lombok.config (stopped bubbling): # 5: lombok.accessors.prefix += f # +# BASE/archives/a1.jar!d2/include.config (imported from BASE/archives/a1.jar!d1/include.config:1): +# <'lombok.accessors.prefix' not mentioned> +# +# BASE/archives/a1.jar!d1/include.config (imported from BASE/archives/a1.jar!lombok.config:1): +# <'lombok.accessors.prefix' not mentioned> +# +# BASE/archives/a1.jar!lombok.config (imported from BASE/d1/d11/d111/import1.config:4): +# <'lombok.accessors.prefix' not mentioned> +# # BASE/d1/d11/d111/import1.config (imported from BASE/d1/d11/d111/lombok.config:1): -# 4: lombok.accessors.prefix += z_ -# 5: lombok.accessors.prefix += f +# 5: lombok.accessors.prefix += z_ +# 6: lombok.accessors.prefix += f +# +# BASE/archives/a2.zip!reset.config (imported from BASE/d1/d11/d111/lombok.config:2): +# <'lombok.accessors.prefix' not mentioned> # # BASE/d1/d11/d111/lombok.config: -# 3: lombok.accessors.prefix += m_ +# 4: lombok.accessors.prefix += m_ # Use this name for the generated logger fields (default: 'log'). clear lombok.log.fieldName |