From a0ba8765fdabfca3f2d22011e58f6e3dbfd8736f Mon Sep 17 00:00:00 2001 From: Valentin Mahrwald Date: Fri, 5 Nov 2010 14:05:06 +0000 Subject: [PATCH] ARIES-482: Move tests to shared pax-exam level git-svn-id: https://svn.apache.org/repos/asf/incubator/aries/trunk/jmx@1031569 13f79535-47bb-0310-9956-ffa450edef68 --- jmx-whiteboard/pom.xml | 5 -- .../integration/helper/MyTinyBundle.java | 57 ------------------- 2 files changed, 62 deletions(-) delete mode 100644 jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java diff --git a/jmx-whiteboard/pom.xml b/jmx-whiteboard/pom.xml index b9965f17b5..da3f28f282 100644 --- a/jmx-whiteboard/pom.xml +++ b/jmx-whiteboard/pom.xml @@ -133,31 +133,26 @@ junit junit - 4.6 test org.ops4j.pax.exam pax-exam - 0.6.0 test org.ops4j.pax.exam pax-exam-junit - 0.6.0 test org.ops4j.pax.exam pax-exam-container-default - 0.6.0 test org.ops4j.pax.swissbox pax-swissbox-tinybundles - 1.0.0 test diff --git a/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java b/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java deleted file mode 100644 index df48ee5b77..0000000000 --- a/jmx-whiteboard/src/test/java/org/apache/aries/jmx/whiteboard/integration/helper/MyTinyBundle.java +++ /dev/null @@ -1,57 +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.aries.jmx.whiteboard.integration.helper; - -import java.net.URL; -import java.util.HashMap; -import java.util.Map; - -import org.ops4j.pax.swissbox.tinybundles.core.BuildableBundle; -import org.ops4j.pax.swissbox.tinybundles.core.TinyBundle; -import org.ops4j.pax.swissbox.tinybundles.core.metadata.RawBuilder; - -public class MyTinyBundle implements TinyBundle { - - private Map m_resources = new HashMap(); - - @SuppressWarnings("unchecked") - public TinyBundle addClass( Class clazz ) - { - String name = clazz.getName().replaceAll( "\\.", "/" ) + ".class"; - addResource( name, clazz.getResource( "/" + name ) ); - return this; - } - - public TinyBundle addResource( String name, URL url ) - { - m_resources.put( name, url ); - return this; - } - - public BuildableBundle prepare( BuildableBundle builder ) - { - return builder.setResources( m_resources ); - } - - public BuildableBundle prepare() - { - return new RawBuilder().setResources( m_resources ); - } - -} \ No newline at end of file