Remove bundle tests

Bundles are already tested in features, so we do not need these
hard-to-maintain tests.

Change-Id: I9c03b841892aa8d8f28417c910de15d4cd407d2a
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
deleted file mode 100644 (file)
index 8ebfb2b..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/AbstractBundleTest.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.ops4j.pax.exam.CoreOptions.junitBundles;
-import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
-import static org.ops4j.pax.exam.CoreOptions.systemPackages;
-import static org.ops4j.pax.exam.CoreOptions.systemProperty;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import javax.inject.Inject;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.opendaylight.controller.test.sal.binding.it.TestHelper;
-import org.ops4j.pax.exam.Configuration;
-import org.ops4j.pax.exam.Option;
-import org.ops4j.pax.exam.junit.PaxExam;
-import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
-import org.ops4j.pax.exam.spi.reactors.PerMethod;
-import org.ops4j.pax.exam.util.Filter;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleException;
-
-//FIXME: merge with org.opendaylight.controller.test.sal.binding.it.AbstractTest ?
-@RunWith(PaxExam.class)
-@ExamReactorStrategy(PerMethod.class)
-public abstract class AbstractBundleTest {
-    private static final String GROUP = "org.opendaylight.bgpcep";
-
-    @Inject
-    @Filter(timeout = 60 * 1000)
-    BundleContext ctx;
-
-    abstract protected Collection<String> prerequisiteBundles();
-
-    abstract protected Collection<String> requiredBundles();
-
-    private List<Option> coreBundles() {
-        final List<Option> ret = new ArrayList<>();
-
-        ret.add(mavenBundle("com.google.guava", "guava").versionAsInProject());
-        ret.add(mavenBundle("commons-codec", "commons-codec").versionAsInProject());
-        ret.add(mavenBundle("org.apache.commons", "commons-lang3").versionAsInProject());
-        ret.add(mavenBundle("commons-io", "commons-io").versionAsInProject());
-
-        TestHelper.configMinumumBundles();
-
-        ret.add(mavenBundle("org.opendaylight.yangtools", "concepts").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "object-cache-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "util").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-binding").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-common").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-data-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-data-impl").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-data-util").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-model-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-model-util").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-parser-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "yang-parser-impl").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "binding-data-codec").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-spi").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-util").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "binding-generator-impl").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "binding-model-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools", "binding-type-provider").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools.model", "ietf-inet-types").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools.model", "ietf-yang-types").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools.model", "ietf-topology").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools.model", "yang-ext").versionAsInProject());
-
-        ret.add(mavenBundle("org.opendaylight.tcpmd5", "tcpmd5-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.tcpmd5", "tcpmd5-netty").versionAsInProject());
-
-        ret.add(mavenBundle("org.javassist", "javassist").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "config-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "netty-config-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "protocol-framework").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-common-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-core-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-core-spi").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-api").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-broker-impl").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-inmemory-datastore").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-config").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-binding-util").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-broker-impl").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-common").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-common-impl").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.controller", "sal-common-util").versionAsInProject());
-        ret.add(mavenBundle("org.opendaylight.yangtools.thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
-
-        ret.add(mavenBundle("com.lmax", "disruptor").versionAsInProject());
-
-        ret.add(systemProperty("pax.exam.osgi.unresolved.fail").value("true"));
-
-        ret.add(mavenBundle("org.slf4j", "slf4j-api").versionAsInProject());
-        ret.add(mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject());
-        ret.add(mavenBundle("ch.qos.logback", "logback-core").versionAsInProject());
-        ret.add(mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject());
-        ret.add(mavenBundle("org.openexi", "nagasena").versionAsInProject());
-
-        ret.add(mavenBundle("io.netty", "netty-common").versionAsInProject());
-        ret.add(mavenBundle("io.netty", "netty-buffer").versionAsInProject());
-        ret.add(mavenBundle("io.netty", "netty-handler").versionAsInProject());
-        ret.add(mavenBundle("io.netty", "netty-codec").versionAsInProject());
-        ret.add(mavenBundle("io.netty", "netty-transport").versionAsInProject());
-
-        return ret;
-    }
-
-    private Bundle getBundle(final String name) {
-        final String bn = GROUP + "." + name;
-        for (Bundle b : ctx.getBundles()) {
-            if (bn.equals(b.getSymbolicName())) {
-                return b;
-            }
-        }
-        return null;
-    }
-
-    private void testBundle(final String name) {
-        final Bundle b = getBundle(name);
-        assertNotNull("Bundle '" + name + "' not found", b);
-        assertEquals("Bundle '" + name + "' is not in ACTIVE state", Bundle.ACTIVE, b.getState());
-    }
-
-    @Configuration
-    public final Option[] config() {
-        final List<Option> options = coreBundles();
-
-        for (final String s : prerequisiteBundles()) {
-            options.add(mavenBundle(GROUP, s).versionAsInProject());
-        }
-
-        for (final String s : requiredBundles()) {
-            options.add(mavenBundle(GROUP, s).versionAsInProject());
-        }
-
-        options.addAll(Arrays.asList(junitBundles()));
-        options.add(systemPackages("sun.nio.ch", "sun.misc"));
-        return options.toArray(new Option[0]);
-    }
-
-    @Test
-    public final void testBundleActivation() throws BundleException {
-        for (final String s : requiredBundles()) {
-            testBundle(s);
-        }
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpConceptsBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpConceptsBundleTest.java
deleted file mode 100644 (file)
index 969fdaa..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpConceptsBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpConceptsBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("util", "concepts");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-concepts");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpLinkstateBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpLinkstateBundleTest.java
deleted file mode 100644 (file)
index 4540e76..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpLinkstateBundleTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpLinkstateBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("bgp-concepts", "bgp-parser-api", "bgp-parser-spi", "bgp-rib-api", "bgp-rib-spi", "concepts", "rsvp-api",
-                "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-linkstate");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserApiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserApiBundleTest.java
deleted file mode 100644 (file)
index 0930f15..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserApiBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpParserApiBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("bgp-concepts", "bgp-util", "concepts", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-parser-api");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserImplBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserImplBundleTest.java
deleted file mode 100644 (file)
index 2855824..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserImplBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpParserImplBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("bgp-concepts", "bgp-parser-api", "bgp-parser-spi", "bgp-util", "concepts", "rsvp-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-parser-impl");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserMockBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserMockBundleTest.java
deleted file mode 100644 (file)
index e904f99..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserMockBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpParserMockBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "bgp-concepts", "bgp-parser-api", "bgp-parser-spi", "bgp-parser-impl", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-parser-mock");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserSpiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserSpiBundleTest.java
deleted file mode 100644 (file)
index 1cb1d6b..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpParserSpiBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpParserSpiBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("bgp-concepts", "bgp-parser-api", "bgp-util", "concepts", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-parser-spi");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibApiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibApiBundleTest.java
deleted file mode 100644 (file)
index 8a9ba63..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibApiBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpRibApiBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "bgp-concepts", "bgp-parser-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-rib-api");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
deleted file mode 100644 (file)
index 50997c9..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibImplBundleTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpRibImplBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "bgp-concepts", "bgp-linkstate", "bgp-parser-api", "bgp-parser-impl", "bgp-parser-spi",
-                "bgp-rib-api", "bgp-rib-spi", "bgp-util", "rsvp-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-rib-impl");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
deleted file mode 100644 (file)
index bd3316a..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibMockBundleTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpRibMockBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "bgp-concepts", "bgp-linkstate", "bgp-parser-api", "bgp-parser-impl", "bgp-parser-spi",
-                "bgp-rib-api", "bgp-rib-impl", "bgp-rib-spi", "bgp-util", "rsvp-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-rib-mock");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibSpiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibSpiBundleTest.java
deleted file mode 100644 (file)
index d267e91..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpRibSpiBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpRibSpiBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("bgp-concepts", "bgp-parser-api", "bgp-rib-api", "concepts", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-rib-spi");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpUtilBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpUtilBundleTest.java
deleted file mode 100644 (file)
index 9085ee9..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/BgpUtilBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class BgpUtilBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "bgp-concepts", "bgp-parser-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("bgp-util");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/ConceptsBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/ConceptsBundleTest.java
deleted file mode 100644 (file)
index 3388538..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/ConceptsBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-import java.util.Collection;
-import java.util.Collections;
-
-public final class ConceptsBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Collections.emptyList();
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("concepts");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepApiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepApiBundleTest.java
deleted file mode 100644 (file)
index bc70a87..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepApiBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class PcepApiBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "rsvp-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("pcep-api");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java
deleted file mode 100644 (file)
index 66089bf..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepImplBundleTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-import java.util.Collection;
-
-public final class PcepImplBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "pcep-api", "pcep-spi", "pcep-ietf-stateful02", "pcep-ietf-stateful07",
-                "pcep-topology-api", "pcep-tunnel-api", "rsvp-api", "programming-api", "programming-topology-api", "topology-api",
-                "topology-tunnel-api", "programming-tunnel-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("pcep-impl");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepSpiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepSpiBundleTest.java
deleted file mode 100644 (file)
index de70dcb..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/PcepSpiBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class PcepSpiBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "pcep-api", "rsvp-api", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("pcep-spi");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/RsvpApiBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/RsvpApiBundleTest.java
deleted file mode 100644 (file)
index 493d893..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/RsvpApiBundleTest.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-
-import java.util.Collection;
-
-public final class RsvpApiBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts", "util");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("rsvp-api");
-    }
-}

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/UtilBundleTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/UtilBundleTest.java
deleted file mode 100644 (file)
index 7ba8c53..0000000
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/UtilBundleTest.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.protocol.integration;
-
-import com.google.common.collect.Lists;
-import java.util.Collection;
-
-public final class UtilBundleTest extends AbstractBundleTest {
-    @Override
-    protected Collection<String> prerequisiteBundles() {
-        return Lists.newArrayList("concepts");
-    }
-
-    @Override
-    protected Collection<String> requiredBundles() {
-        return Lists.newArrayList("util");
-    }
-}