You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@polygene.apache.org by pa...@apache.org on 2016/02/09 23:43:59 UTC
[1/3] zest-java git commit: Upgrade Gradle version from 2.5 to 2.11
Repository: zest-java
Updated Branches:
refs/heads/ZEST-132 0e737703d -> 5f737d52f
Upgrade Gradle version from 2.5 to 2.11
Tested most of the build features
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/9460a607
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/9460a607
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/9460a607
Branch: refs/heads/ZEST-132
Commit: 9460a607b3822a4f5aa93b9c4f26155dcb3fa12d
Parents: 0e73770
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Feb 9 20:17:27 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Feb 9 23:34:20 2016 +0100
----------------------------------------------------------------------
build.gradle | 2 +-
gradle/wrapper/gradle-wrapper.properties | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/9460a607/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index df6eeb6..f9298c4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1033,5 +1033,5 @@ task release {
// 2) /gradlew.bat which is the windows bat script for for executing builds
// 3) /gradle/wrapper which is a directory named by the "jarPath" config which contains other needed files.
task wrapper( type: Wrapper ) {
- gradleVersion = '2.5'
+ gradleVersion = '2.11'
}
http://git-wip-us.apache.org/repos/asf/zest-java/blob/9460a607/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 48f202a..fafa8dd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-bin.zip
[2/3] zest-java git commit: Unignore now passing tests for @This
injection
Posted by pa...@apache.org.
Unignore now passing tests for @This injection
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/b87b63a6
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/b87b63a6
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/b87b63a6
Branch: refs/heads/ZEST-132
Commit: b87b63a68c6264a00b3395ee048fe06891f3005f
Parents: 9460a60
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Feb 9 23:34:56 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Feb 9 23:34:56 2016 +0100
----------------------------------------------------------------------
.../runtime/injection/ConstructorInjectionOfThisTest.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/b87b63a6/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java
index 558d05a..4d246f2 100755
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ConstructorInjectionOfThisTest.java
@@ -26,7 +26,6 @@ import org.apache.zest.api.structure.Module;
import org.apache.zest.bootstrap.AssemblyException;
import org.apache.zest.bootstrap.ModuleAssembly;
import org.apache.zest.bootstrap.SingletonAssembler;
-import org.junit.Ignore;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -43,7 +42,6 @@ public class ConstructorInjectionOfThisTest
{
SingletonAssembler singletonAssembler = new SingletonAssembler()
{
-
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
@@ -56,13 +54,12 @@ public class ConstructorInjectionOfThisTest
does.doSomething();
}
- @Test @Ignore
+ @Test
public void givenConcernWithThisInConstructorWhenCreatingModelExpectNoException()
throws ActivationException, AssemblyException
{
SingletonAssembler singletonAssembler = new SingletonAssembler()
{
-
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
@@ -75,13 +72,12 @@ public class ConstructorInjectionOfThisTest
does.doSomething();
}
- @Test @Ignore
+ @Test
public void givenSideEffectWithThisInConstructorWhenCreatingModelExpectNoException()
throws ActivationException, AssemblyException
{
SingletonAssembler singletonAssembler = new SingletonAssembler()
{
-
@Override
public void assemble( ModuleAssembly module )
throws AssemblyException
[3/3] zest-java git commit: Some little more coverage for @This
injection
Posted by pa...@apache.org.
Some little more coverage for @This injection
Project: http://git-wip-us.apache.org/repos/asf/zest-java/repo
Commit: http://git-wip-us.apache.org/repos/asf/zest-java/commit/5f737d52
Tree: http://git-wip-us.apache.org/repos/asf/zest-java/tree/5f737d52
Diff: http://git-wip-us.apache.org/repos/asf/zest-java/diff/5f737d52
Branch: refs/heads/ZEST-132
Commit: 5f737d52fedab2d93fa73e8b7f455e74794cc559
Parents: b87b63a
Author: Paul Merlin <pa...@apache.org>
Authored: Tue Feb 9 23:35:27 2016 +0100
Committer: Paul Merlin <pa...@apache.org>
Committed: Tue Feb 9 23:42:28 2016 +0100
----------------------------------------------------------------------
.../runtime/injection/ThisInjectionTest.java | 56 ++++++++++++++------
1 file changed, 39 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/zest-java/blob/5f737d52/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
index 7d071fd..d840a5f 100644
--- a/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
+++ b/core/runtime/src/test/java/org/apache/zest/runtime/injection/ThisInjectionTest.java
@@ -83,17 +83,25 @@ public class ThisInjectionTest
public static class TestMixin
implements Test
{
- @This
- Test test;
+ @This Test test;
+ @This TestPrivate testPrivate;
+ Test ctorTest;
+ TestPrivate ctorTestPrivate;
- @This
- TestPrivate testPrivate;
+ public TestMixin( @This Test test, @This TestPrivate testPrivate )
+ {
+ ctorTest = test;
+ ctorTestPrivate = testPrivate;
+ }
+ @Override
public boolean isInjected()
{
- return test != null && !testPrivate.testPrivate().get();
+ return test != null && ctorTest != null &&
+ !testPrivate.testPrivate().get() && !ctorTestPrivate.testPrivate().get();
}
+ @Override
public String test()
{
return "Foo";
@@ -104,17 +112,23 @@ public class ThisInjectionTest
extends ConcernOf<Test>
implements Test
{
- @This
- Test test;
+ @This Test test;
+ @This TestPrivate testPrivate;
+ Test ctorTest;
+ TestPrivate ctorTestPrivate;
- @This
- TestPrivate testPrivate;
+ public TestConcern( @This Test test, @This TestPrivate testPrivate )
+ {
+ ctorTest = test;
+ ctorTestPrivate = testPrivate;
+ }
+ @Override
public boolean isInjected()
{
- return test != null && test.test().equals( "Foo" ) &&
- !testPrivate.testPrivate().get() &&
- next.isInjected();
+ return test != null && ctorTest != null &&
+ !testPrivate.testPrivate().get() && !ctorTestPrivate.testPrivate().get() &&
+ next.isInjected();
}
}
@@ -122,14 +136,22 @@ public class ThisInjectionTest
extends SideEffectOf<Test>
implements Test
{
- @This
- Test test;
- @This
- TestPrivate testPrivate;
+ @This Test test;
+ @This TestPrivate testPrivate;
+ Test ctorTest;
+ TestPrivate ctorTestPrivate;
+
+ public TestSideEffect( @This Test test, @This TestPrivate testPrivate )
+ {
+ ctorTest = test;
+ ctorTestPrivate = testPrivate;
+ }
+ @Override
public boolean isInjected()
{
- sideEffectInjected = test != null && !testPrivate.testPrivate().get();
+ sideEffectInjected = test != null && ctorTest != null &&
+ !testPrivate.testPrivate().get() && !ctorTestPrivate.testPrivate().get();
return false;
}