You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by pa...@apache.org on 2013/11/08 15:56:45 UTC
[3/4] git commit: Fix testcases
Fix testcases
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad5d35c3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad5d35c3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad5d35c3
Branch: refs/heads/master
Commit: ad5d35c3b62dfefb06a7f617b35d28ff8d745755
Parents: f3f0c61
Author: Emond Papegaaij <em...@topicus.nl>
Authored: Fri Nov 8 14:35:22 2013 +0100
Committer: Emond Papegaaij <em...@topicus.nl>
Committed: Fri Nov 8 15:56:23 2013 +0100
----------------------------------------------------------------------
.../wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml | 2 +-
.../org/apache/wicket/cdi/BeanManagerLookup.java | 16 ++++++++++++++++
.../apache/wicket/cdi/ComponentInjectorTest.java | 10 ++++------
.../org/apache/wicket/cdi/WicketCdiTestCase.java | 3 +--
4 files changed, 22 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
index dd2106e..d488750 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/pom.xml
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.jglue.cdi-unit</groupId>
<artifactId>cdi-unit</artifactId>
- <version>2.1.0</version>
+ <version>2.2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
index cbe8013..d9051ba 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/main/java/org/apache/wicket/cdi/BeanManagerLookup.java
@@ -1,3 +1,19 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.wicket.cdi;
import javax.enterprise.inject.spi.BeanManager;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
index e093ae2..8cef530 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/ComponentInjectorTest.java
@@ -38,9 +38,7 @@ public class ComponentInjectorTest extends WicketCdiTestCase
public void innerNonStaticClass()
{
TestNonStaticComponent component = new TestNonStaticComponent("someId");
- assertNull(component.dependency);
- componentInjector.onInstantiation(component);
- assertNull(component.dependency);
+ assertEquals(component.dependency, "Test String");
}
/**
@@ -50,7 +48,6 @@ public class ComponentInjectorTest extends WicketCdiTestCase
public void innerStaticClass()
{
TestStaticComponent component = new TestStaticComponent("someId");
- componentInjector.onInstantiation(component);
assertEquals(component.dependency, "Test String");
}
@@ -61,6 +58,7 @@ public class ComponentInjectorTest extends WicketCdiTestCase
WebComponent component = new WebComponent("someId")
{
@Inject
+ @TestQualifier
private String dependency;
@Override
@@ -69,14 +67,14 @@ public class ComponentInjectorTest extends WicketCdiTestCase
return dependency;
}
};
- componentInjector.onInstantiation(component);
- assertNull(component.toString());
+ assertEquals(component.toString(), "Test String");
}
private class TestNonStaticComponent extends WebComponent
{
@Inject
+ @TestQualifier
private String dependency;
public TestNonStaticComponent(String id)
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad5d35c3/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
index 6d66c29..1f16a58 100644
--- a/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
+++ b/wicket-experimental/wicket-cdi-1.1/wicket-cdi-1.1-core/src/test/java/org/apache/wicket/cdi/WicketCdiTestCase.java
@@ -66,13 +66,12 @@ public class WicketCdiTestCase extends Assert
{
tester.destroy();
tester = null;
+ contextController.closeRequest();
}
private void prepareRequest(HttpServletRequest request)
{
contextController.openRequest(request);
- contextController.openSession(request);
- contextController.openConversation(request);
}
}