Merge pull request #1039 from sinthuja/origin-wso2-master

Adding more testcases for analytics data publisher
revert-70aa11f8
Megala Uthayakumar 7 years ago committed by GitHub
commit 6563214160

@ -78,6 +78,10 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.securevault</artifactId> <artifactId>org.wso2.carbon.securevault</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
</dependency>
</dependencies> </dependencies>
<build> <build>

@ -79,4 +79,5 @@ public class DataPublisherConfigTest extends BaseAnalyticsDataPublisherTest {
Assert.assertEquals(analyticsConfiguration.getReceiverServerUrl(), "tcp://localhost:7615"); Assert.assertEquals(analyticsConfiguration.getReceiverServerUrl(), "tcp://localhost:7615");
Assert.assertTrue(analyticsConfiguration.isEnable()); Assert.assertTrue(analyticsConfiguration.isEnable());
} }
} }

@ -0,0 +1,67 @@
/*
* Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* WSO2 Inc. 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.wso2.carbon.device.mgt.analytics.data.publisher;
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.osgi.service.component.ComponentContext;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import org.wso2.carbon.device.mgt.analytics.data.publisher.internal.DataPublisherServiceComponent;
import org.wso2.carbon.device.mgt.analytics.data.publisher.util.TestComponentContext;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
/**
* This tesclass will be validating the behaviour of {@link DataPublisherServiceComponent}
*/
public class DataPublisherServiceComponentTest extends BaseAnalyticsDataPublisherTest {
private DataPublisherServiceComponent serviceComponent;
@BeforeClass
public void initTest() {
this.serviceComponent = new DataPublisherServiceComponent();
}
@Test (description = "Test bundle activation with exception thrown when service resgistration")
public void activateWithException() throws NoSuchMethodException, IllegalAccessException,
InvocationTargetException {
this.activate(new TestComponentContext());
}
@Test(dependsOnMethods = "activateWithException", description = "Test the bundle activation with succesful path")
public void activateWithoutException() throws NoSuchMethodException, InvocationTargetException,
IllegalAccessException {
this.activate(MockOsgi.newComponentContext());
}
@Test(dependsOnMethods = "activateWithoutException", description = "Test bundle deactivation")
public void deActivate() throws NoSuchMethodException, InvocationTargetException, IllegalAccessException {
Method method = this.serviceComponent.getClass().getDeclaredMethod("deactivate", ComponentContext.class);
method.setAccessible(true);
method.invoke(this.serviceComponent, MockOsgi.newComponentContext());
}
private void activate(ComponentContext componentContext) throws NoSuchMethodException, InvocationTargetException,
IllegalAccessException {
Method method = this.serviceComponent.getClass().getDeclaredMethod("activate", ComponentContext.class);
method.setAccessible(true);
method.invoke(this.serviceComponent, componentContext);
}
}

@ -29,9 +29,7 @@ import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublish
import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherService; import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherService;
import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherServiceImpl; import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherServiceImpl;
import java.io.File;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.net.URL;
/** /**
* This test class will test the methods that are exposed from {@link EventsPublisherService} * This test class will test the methods that are exposed from {@link EventsPublisherService}

@ -0,0 +1,81 @@
/*
* Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
* WSO2 Inc. 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.wso2.carbon.device.mgt.analytics.data.publisher.util;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.ComponentInstance;
import java.util.Dictionary;
/**
* Mock implementation for component context.
*/
public class TestComponentContext implements ComponentContext {
@Override
public Dictionary getProperties() {
return null;
}
@Override
public Object locateService(String s) {
return null;
}
@Override
public Object locateService(String s, ServiceReference serviceReference) {
return null;
}
@Override
public Object[] locateServices(String s) {
return new Object[0];
}
@Override
public BundleContext getBundleContext() {
return null;
}
@Override
public Bundle getUsingBundle() {
return null;
}
@Override
public ComponentInstance getComponentInstance() {
return null;
}
@Override
public void enableComponent(String s) {
}
@Override
public void disableComponent(String s) {
}
@Override
public ServiceReference getServiceReference() {
return null;
}
}

@ -25,6 +25,7 @@
<classes> <classes>
<class name="org.wso2.carbon.device.mgt.analytics.data.publisher.DataPublisherConfigTest"/> <class name="org.wso2.carbon.device.mgt.analytics.data.publisher.DataPublisherConfigTest"/>
<class name="org.wso2.carbon.device.mgt.analytics.data.publisher.EventPublisherServiceTest"/> <class name="org.wso2.carbon.device.mgt.analytics.data.publisher.EventPublisherServiceTest"/>
<class name="org.wso2.carbon.device.mgt.analytics.data.publisher.DataPublisherServiceComponentTest"/>
</classes> </classes>
</test> </test>
</suite> </suite>

@ -180,6 +180,9 @@
<fileset dir="${device.mgt.extensions}/${target}/${coverge-report}"> <fileset dir="${device.mgt.extensions}/${target}/${coverge-report}">
<include name="${individual.test.report.name}" /> <include name="${individual.test.report.name}" />
</fileset> </fileset>
<fileset dir="${device.mgt.analytics.data}/${target}/${coverge-report}">
<include name="${individual.test.report.name}" />
</fileset>
<!-- Need to list the newly added exec files here --> <!-- Need to list the newly added exec files here -->
</executiondata> </executiondata>

@ -403,6 +403,12 @@
<version>${carbon.kernel.version}</version> <version>${carbon.kernel.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.testing.osgi-mock</artifactId>
<version>${apache.osgi.mock.version}</version>
<scope>test</scope>
</dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.governance</groupId> <groupId>org.wso2.carbon.governance</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId> <artifactId>org.wso2.carbon.governance.api</artifactId>
@ -1964,6 +1970,9 @@
<!-- apache pdfbox version --> <!-- apache pdfbox version -->
<slf4j.simple.version>1.6.1</slf4j.simple.version> <slf4j.simple.version>1.6.1</slf4j.simple.version>
<!--apache osgi mock version-->
<apache.osgi.mock.version>2.3.2</apache.osgi.mock.version>
<!-- api-mgt handler version properties --> <!-- api-mgt handler version properties -->
<org.apache.synapse.version>2.1.7-wso2v7</org.apache.synapse.version> <org.apache.synapse.version>2.1.7-wso2v7</org.apache.synapse.version>
<org.apache.ws.security.wso2.version>1.5.11.wso2v15</org.apache.ws.security.wso2.version> <org.apache.ws.security.wso2.version>1.5.11.wso2v15</org.apache.ws.security.wso2.version>

Loading…
Cancel
Save