You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2012/03/23 03:13:34 UTC
git commit: DELTASPIKE-92 cleanup
Updated Branches:
refs/heads/master f9506fc12 -> 4b2fe6550
DELTASPIKE-92 cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/4b2fe655
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/4b2fe655
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/4b2fe655
Branch: refs/heads/master
Commit: 4b2fe6550dc4c33c204ac094fe53b5a31e595843
Parents: f9506fc
Author: gpetracek <gp...@apache.org>
Authored: Fri Mar 23 03:08:39 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Fri Mar 23 03:11:18 2012 +0100
----------------------------------------------------------------------
.../deltaspike/cdise/tck/ContainerCtrlTckTest.java | 16 +++---
.../org/apache/deltaspike/cdise/tck/beans/Car.java | 10 ++--
.../deltaspike/cdise/tck/beans/TestUser.java | 40 +++++++++++++++
.../apache/deltaspike/cdise/tck/beans/User.java | 40 ---------------
4 files changed, 53 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4b2fe655/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
index e37c5de..5fa9159 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/ContainerCtrlTckTest.java
@@ -55,7 +55,7 @@ public class ContainerCtrlTckTest
Assert.assertNotNull(carRepair);
Assert.assertNotNull(carRepair.getCar());
- Assert.assertNotNull(carRepair.getCar().getUsr());
+ Assert.assertNotNull(carRepair.getCar().getUser());
cc.shutdown();
}
@@ -79,7 +79,7 @@ public class ContainerCtrlTckTest
Assert.assertNotNull(carRepair);
Assert.assertNotNull(carRepair.getCar());
- Assert.assertNotNull(carRepair.getCar().getUsr());
+ Assert.assertNotNull(carRepair.getCar().getUser());
cc.shutdown();
}
@@ -116,17 +116,17 @@ public class ContainerCtrlTckTest
Car car = carRepair.getCar();
Assert.assertNotNull(car);
- Assert.assertNotNull(car.getUsr());
+ Assert.assertNotNull(car.getUser());
- carRepair.getCar().getUsr().setName("tester");
- Assert.assertEquals("tester", car.getUsr().getName());
+ carRepair.getCar().getUser().setName("tester");
+ Assert.assertEquals("tester", car.getUser().getName());
cdiContainer.getContextControl().stopContexts();
try
{
- Assert.assertNotNull(car.getUsr());
+ Assert.assertNotNull(car.getUser());
// accessing the car should have triggered a ContextNotActiveException
Assert.fail();
@@ -142,8 +142,8 @@ public class ContainerCtrlTckTest
beanManager.getReference(bean, CarRepair.class, beanManager.createCreationalContext(bean));
Assert.assertNotNull(carRepair.getCar());
- Assert.assertNotNull(carRepair.getCar().getUsr());
- Assert.assertNull(carRepair.getCar().getUsr().getName());
+ Assert.assertNotNull(carRepair.getCar().getUser());
+ Assert.assertNull(carRepair.getCar().getUser().getName());
cdiContainer.shutdown();
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4b2fe655/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java
index 8367572..dbb1125 100644
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/Car.java
@@ -26,15 +26,15 @@ import javax.inject.Inject;
public class Car
{
@Inject
- private User usr;
+ private TestUser user;
- public User getUsr()
+ public TestUser getUser()
{
- return usr;
+ return user;
}
- public void setUsr(User usr)
+ public void setUser(TestUser user)
{
- this.usr = usr;
+ this.user = user;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4b2fe655/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java
new file mode 100644
index 0000000..318a8b4
--- /dev/null
+++ b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/TestUser.java
@@ -0,0 +1,40 @@
+/*
+ * 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.deltaspike.cdise.tck.beans;
+
+import javax.enterprise.context.SessionScoped;
+import java.io.Serializable;
+
+@SessionScoped
+public class TestUser implements Serializable
+{
+ private static final long serialVersionUID = -4171521313675763849L;
+
+ private String name;
+
+ public String getName()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/4b2fe655/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java b/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java
deleted file mode 100644
index 61cc2b0..0000000
--- a/deltaspike/cdictrl/tck/src/main/java/org/apache/deltaspike/cdise/tck/beans/User.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * 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.deltaspike.cdise.tck.beans;
-
-import javax.enterprise.context.SessionScoped;
-import java.io.Serializable;
-
-@SessionScoped
-public class User implements Serializable
-{
- private static final long serialVersionUID = -4171521313675763849L;
-
- private String name;
-
- public String getName()
- {
- return name;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-}