Fixed testcase. Added "Zest Shell" to build
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/c8cdfcc0 Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/c8cdfcc0 Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/c8cdfcc0 Branch: refs/heads/develop Commit: c8cdfcc08caa78eb5648b26fdcf0193f1f9be5e6 Parents: 6a8c565 Author: Niclas Hedhman <[email protected]> Authored: Sun Apr 17 12:39:22 2016 +0800 Committer: Niclas Hedhman <[email protected]> Committed: Sun Apr 17 12:39:22 2016 +0800 ---------------------------------------------------------------------- build.gradle | 8 ++++++++ .../apache/zest/test/composite/CleanStackTraceTest.java | 12 ++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/zest-java/blob/c8cdfcc0/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index aa09709..d459586 100644 --- a/build.gradle +++ b/build.gradle @@ -832,6 +832,13 @@ def libsImage = copySpec { } } +def toolsImage = copySpec { + releaseApprovedProjects.collect { proj -> + from( "$projectDir/src/bin/**") + into( "bin/" ) + } +} + def binDistNoticesImage = copySpec { from( "$projectDir/LICENSE.txt") from( "$projectDir/src/bin-dist" ) @@ -845,6 +852,7 @@ def binDistImage = copySpec { with reportsDistImage with runtimeDependenciesListImage with libsImage + with toolsImage } task zipSources( type: Zip ) { http://git-wip-us.apache.org/repos/asf/zest-java/blob/c8cdfcc0/core/runtime/src/test/java/org/apache/zest/test/composite/CleanStackTraceTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/zest/test/composite/CleanStackTraceTest.java b/core/runtime/src/test/java/org/apache/zest/test/composite/CleanStackTraceTest.java index ba3ac61..dcfbca3 100644 --- a/core/runtime/src/test/java/org/apache/zest/test/composite/CleanStackTraceTest.java +++ b/core/runtime/src/test/java/org/apache/zest/test/composite/CleanStackTraceTest.java @@ -82,14 +82,14 @@ public class CleanStackTraceTest { String separator = System.getProperty( "line.separator" ); String correctTrace1 = "java.lang.RuntimeException: level 2" + separator + - "\tat org.apache.zest.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:122)" + separator + - "\tat org.apache.zest.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:135)" + separator + - "\tat org.apache.zest.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:73)"; + "\tat org.apache.zest.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:128)" + separator + + "\tat org.apache.zest.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:141)" + separator + + "\tat org.apache.zest.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:79)"; assertEquality( e, correctTrace1 ); String correctTrace2 = "java.lang.RuntimeException: level 1" + separator + - "\tat org.apache.zest.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:118)" + separator + - "\tat org.apache.zest.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:135)" + separator + - "\tat org.apache.zest.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:73)"; + "\tat org.apache.zest.test.composite.CleanStackTraceTest$DoStuffMixin.doStuff(CleanStackTraceTest.java:124)" + separator + + "\tat org.apache.zest.test.composite.CleanStackTraceTest$NillyWilly.invoke(CleanStackTraceTest.java:141)" + separator + + "\tat org.apache.zest.test.composite.CleanStackTraceTest.cleanStackTraceOnApplicationException(CleanStackTraceTest.java:79)"; assertThat( e.getCause(), notNullValue() ); assertEquality( e.getCause(), correctTrace2 ); }
