From: Tony Tkacik Date: Fri, 19 Feb 2016 13:36:06 +0000 (+0100) Subject: Removed non-building code. X-Git-Tag: release/boron~330 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=96e9733ae6485092d37850bae80d182675bfa494 Removed non-building code. Change-Id: Ic7ddbb76b3485704ffc48602c3081122cdd03d72 Signed-off-by: Tony Tkacik --- diff --git a/itests/base-features-it/pom.xml b/itests/base-features-it/pom.xml deleted file mode 100644 index 046a427f40..0000000000 --- a/itests/base-features-it/pom.xml +++ /dev/null @@ -1,88 +0,0 @@ - - 4.0.0 - - org.opendaylight.controller - itests-controller - 1.7.0-SNAPSHOT - ../pom.xml - - base-features-it - base-features-it - jar - - - org.opendaylight.controller - base-features - ${project.version} - features - xml - - - org.slf4j - slf4j-api - - - - org.ops4j.pax.exam - pax-exam-container-karaf - test - - - org.ops4j.pax.exam - pax-exam-junit4 - test - - - org.ops4j.pax.exam - pax-exam - test - - - org.ops4j.pax.url - pax-url-aether - test - - - javax.inject - javax.inject - 1 - test - - - org.apache.karaf.features - org.apache.karaf.features.core - ${karaf.version} - test - - - org.osgi - org.osgi.core - test - - - junit - junit - test - - - - - - - - - - - diff --git a/itests/base-features-it/src/test/java/org/opendaylight/controller/base/BaseFeatureTest.java b/itests/base-features-it/src/test/java/org/opendaylight/controller/base/BaseFeatureTest.java deleted file mode 100644 index 62278f1885..0000000000 --- a/itests/base-features-it/src/test/java/org/opendaylight/controller/base/BaseFeatureTest.java +++ /dev/null @@ -1,74 +0,0 @@ -package org.opendaylight.controller.base; - -import static org.ops4j.pax.exam.CoreOptions.maven; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.configureConsole; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.karafDistributionConfiguration; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.keepRuntimeFolder; -import static org.ops4j.pax.exam.karaf.options.KarafDistributionOption.logLevel; - -import java.io.File; -import java.net.URI; -import java.util.EnumSet; - -import javax.inject.Inject; - -import org.junit.Assert; - -import org.apache.karaf.features.Feature; -import org.apache.karaf.features.FeaturesService; -import org.apache.karaf.features.Repository; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.ops4j.pax.exam.Configuration; -import org.ops4j.pax.exam.Option; -import org.ops4j.pax.exam.junit.PaxExam; -import org.ops4j.pax.exam.karaf.options.LogLevelOption.LogLevel; - - -@RunWith(PaxExam.class) -public class BaseFeatureTest { - @Inject - private FeaturesService featuresService; - @Configuration - public Option[] config() { - return new Option[] { - // Provision and launch a container based on a distribution of Karaf (Apache ServiceMix). - karafDistributionConfiguration() - .frameworkUrl( - maven() - .groupId("org.opendaylight.controller") - .artifactId("distribution.opendaylight-karaf") - .type("tar.gz") - .version("1.4.2-SNAPSHOT")) - .name("OpenDaylight") - .unpackDirectory(new File("target/pax")) - .useDeployFolder(false), - // It is really nice if the container sticks around after the test so you can check the contents - // of the data directory when things go wrong. - keepRuntimeFolder(), - // Don't bother with local console output as it just ends up cluttering the logs - configureConsole().ignoreLocalConsole(), - // Force the log level to INFO so we have more details during the test. It defaults to WARN. - logLevel(LogLevel.WARN), - // Remember that the test executes in another process. If you want to debug it, you need - // to tell Pax Exam to launch that process with debugging enabled. Launching the test class itself with - // debugging enabled (for example in Eclipse) will not get you the desired results. - //debugConfiguration("5000", true), - }; - } - - @Test - public void testAllFeatures() throws Exception { - featuresService.addRepository(new URI("mvn:org.opendaylight.controller/base-features/1.4.2-SNAPSHOT/xml/features")); - Repository repoUnderTest = featuresService.getRepository("base-1.4.2-SNAPSHOT"); - Assert.assertNotNull(repoUnderTest); - Feature[] featuresUnderTest = repoUnderTest.getFeatures(); - for(int i=0; i< featuresUnderTest.length; i++) - { - Feature feature = featuresUnderTest[i]; - featuresService.installFeature(feature,EnumSet.of(FeaturesService.Option.Verbose)); - System.out.println("Testing Feature:"+feature.getName()); - Assert.assertTrue(featuresService.isInstalled(feature)); - } - } -} \ No newline at end of file diff --git a/itests/pom.xml b/itests/pom.xml deleted file mode 100644 index b3d2dfd27d..0000000000 --- a/itests/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - 4.0.0 - - org.opendaylight.controller - commons.opendaylight - 1.7.0-SNAPSHOT - ../opendaylight/commons/opendaylight - - itests-controller - pom - - - base-features-it - -