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/12/17 09:19:30 UTC
[2/2] git commit: DELTASPIKE-300 fixed test
DELTASPIKE-300 fixed test
Project: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/commit/dcd40a84
Tree: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/tree/dcd40a84
Diff: http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/diff/dcd40a84
Branch: refs/heads/master
Commit: dcd40a841df390b975d56503101fb44412c1008d
Parents: 5202915
Author: gpetracek <gp...@apache.org>
Authored: Mon Dec 17 09:07:40 2012 +0100
Committer: gpetracek <gp...@apache.org>
Committed: Mon Dec 17 09:07:40 2012 +0100
----------------------------------------------------------------------
.../deltaspike/test/core/impl/jmx/MyMBean.java | 64 +++++++++++++
.../test/core/impl/jmx/SimpleRegistrationTest.java | 74 +++------------
2 files changed, 79 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/dcd40a84/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java
new file mode 100644
index 0000000..6c1f338
--- /dev/null
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/MyMBean.java
@@ -0,0 +1,64 @@
+/*
+ * 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.test.core.impl.jmx;
+
+import org.apache.deltaspike.core.api.jmx.JmxBroadcaster;
+import org.apache.deltaspike.core.api.jmx.annotation.JmxManaged;
+import org.apache.deltaspike.core.api.jmx.annotation.MBean;
+
+import javax.enterprise.context.ApplicationScoped;
+import javax.inject.Inject;
+import javax.management.Notification;
+
+@ApplicationScoped
+@MBean(description = "my mbean")
+public class MyMBean
+{
+ @JmxManaged(description = "get counter")
+ private int counter = 0;
+
+ @Inject
+ private JmxBroadcaster broadcaster;
+
+ public int getCounter()
+ {
+ return counter;
+ }
+
+ public void setCounter(final int v)
+ {
+ counter = v;
+ }
+
+ public void resetTo(final int value)
+ {
+ counter = value;
+ }
+
+ @JmxManaged(description = "multiply counter")
+ public int multiply(final int n)
+ {
+ return counter * n;
+ }
+
+ public void broadcast()
+ {
+ broadcaster.send(new Notification(String.class.getName(), this, 10L));
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-deltaspike/blob/dcd40a84/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java
index bb82d8e..ef49d94 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/impl/jmx/SimpleRegistrationTest.java
@@ -18,21 +18,17 @@
*/
package org.apache.deltaspike.test.core.impl.jmx;
-import org.apache.deltaspike.core.api.jmx.JmxBroadcaster;
-import org.apache.deltaspike.core.api.jmx.annotation.JmxManaged;
-import org.apache.deltaspike.core.api.jmx.annotation.MBean;
import org.apache.deltaspike.core.impl.jmx.MBeanExtension;
+import org.apache.deltaspike.test.util.ArchiveUtils;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
-import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.spi.Extension;
import javax.inject.Inject;
import javax.management.*;
@@ -45,28 +41,24 @@ import static org.junit.Assert.assertTrue;
@RunWith(Arquillian.class)
public class SimpleRegistrationTest {
- @Deployment
- public static WebArchive war() {
- return ShrinkWrap.create(WebArchive.class)
- .addClass(MyMBean.class)
- .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
- .addAsLibraries(ShrinkWrap.create(JavaArchive.class)
- .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml")
- .addAsServiceProvider(Extension.class, MBeanExtension.class)
- .addPackages(true, MBeanExtension.class.getPackage()));
-
- }
-
- private static MBeanServer server;
-
- @BeforeClass
- public static void initMBeanServer() {
- server = ManagementFactory.getPlatformMBeanServer();
- }
+ private static MBeanServer server = ManagementFactory.getPlatformMBeanServer();
@Inject
private MyMBean myMBean;
+ @Deployment
+ public static WebArchive war() {
+ JavaArchive testJar = ShrinkWrap.create(JavaArchive.class, "simpleRegistrationTest.jar")
+ .addPackage(SimpleRegistrationTest.class.getPackage())
+ .addAsManifestResource(EmptyAsset.INSTANCE, "beans.xml");
+
+ return ShrinkWrap.create(WebArchive.class, "simpleRegistrationTest.war")
+ .addAsLibraries(ArchiveUtils.getDeltaSpikeCoreArchive())
+ .addAsLibraries(testJar)
+ .addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
+ .addAsServiceProvider(Extension.class, MBeanExtension.class);
+ }
+
@Test
public void checkMBean() throws Exception {
assertEquals(0, myMBean.getCounter());
@@ -96,40 +88,4 @@ public class SimpleRegistrationTest {
assertEquals(1, notifications.size());
assertEquals(10L, notifications.iterator().next().getSequenceNumber());
}
-
- @ApplicationScoped
- @MBean(description = "my mbean")
- public static class MyMBean
- {
- @JmxManaged(description = "get counter")
- private int counter = 0;
-
- @Inject
- private JmxBroadcaster broadcaster;
-
- public int getCounter()
- {
- return counter;
- }
-
- public void setCounter(final int v)
- {
- counter = v;
- }
-
- public void resetTo(final int value)
- {
- counter = value;
- }
-
- @JmxManaged(description = "multiply counter")
- public int multiply(final int n)
- {
- return counter * n;
- }
-
- public void broadcast() {
- broadcaster.send(new Notification(String.class.getName(), this, 10L));
- }
- }
}