You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2013/09/26 13:25:13 UTC
git commit: removing integration tests from SC
Updated Branches:
refs/heads/3.0.0-incubating 308cfb53b -> c230cb051
removing integration tests from SC
Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c230cb05
Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c230cb05
Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c230cb05
Branch: refs/heads/3.0.0-incubating
Commit: c230cb05159a70410f66724af52b2a2a89fb89c2
Parents: 308cfb5
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Thu Sep 26 17:00:13 2013 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Thu Sep 26 17:00:13 2013 +0530
----------------------------------------------------------------------
.../modules/integration/pom.xml | 163 -------------------
.../integration/tests/LoginLogoutTestCase.java | 49 ------
.../tests/SecurityVerificationTestCase.java | 27 ---
.../tests/StratosManagerTestServerManager.java | 54 ------
.../integration/tests/TenantMgtTestCase.java | 92 -----------
.../src/test/resources/instrumentation.txt | 2 -
.../src/test/resources/keys/wso2carbon.jks | Bin 33260 -> 0 bytes
.../integration/src/test/resources/testng.xml | 39 -----
products/stratos-controller/pom.xml | 1 -
9 files changed, 427 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/pom.xml b/products/stratos-controller/modules/integration/pom.xml
deleted file mode 100755
index c8b89b5..0000000
--- a/products/stratos-controller/modules/integration/pom.xml
+++ /dev/null
@@ -1,163 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.apache.stratos</groupId>
- <artifactId>stratos-controller-parent</artifactId>
- <version>3.0.0-incubating</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>integration</artifactId>
- <name>Apache Stratos - Manager Integration Tests</name>
- <packaging>jar</packaging>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-clean-plugin</artifactId>
- <executions>
- <execution>
- <id>auto-clean</id>
- <phase>initialize</phase>
- <goals>
- <goal>clean</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <inherited>false</inherited>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>src/test/resources/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- <!--includes>
- <include>**/*TestServerManager.java</include>
- <include>**/LoginLogoutTestCase.java</include>
- <include>**/TenantMgtTestCase.java</include>
- </includes-->
- <systemProperties>
- <maven.test.haltafterfailure>false</maven.test.haltafterfailure>
- <carbon.zip>
- ${basedir}/../distribution/target/apache-stratos-sc-${project.version}.zip
- </carbon.zip>
- <sec.verifier.dir>${basedir}/target/security-verifier/</sec.verifier.dir>
- <extracted.dir>stratos-controller-parent-${project.version}</extracted.dir>
- <emma.home>${basedir}/target/emma</emma.home>
- </systemProperties>
- <workingDirectory>${basedir}/target</workingDirectory>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>copy-emma-dependencies</id>
- <phase>compile</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/emma</outputDirectory>
- <includeTypes>jar</includeTypes>
- <includeArtifactIds>emma,org.wso2.carbon.integration.framework</includeArtifactIds>
- </configuration>
- </execution>
- <execution>
- <id>copy-secVerifier</id>
- <phase>compile</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${basedir}/target/security-verifier</outputDirectory>
- <includeTypes>aar</includeTypes>
- <includeArtifactIds>SecVerifier</includeArtifactIds>
- <stripVersion>true</stripVersion>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.integration.framework</artifactId>
- <version>${carbon.kernel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>6.1.1</version>
- </dependency>
- <!--dependency>
- <groupId>emma</groupId>
- <artifactId>emma</artifactId>
- <version>${emma.version}</version>
- </dependency-->
- <dependency>
- <groupId>org.apache.axis2.wso2</groupId>
- <artifactId>axis2-client</artifactId>
- <version>${axis2.osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.addressing</artifactId>
- <version>${carbon.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>org.wso2.carbon.integration.core</artifactId>
- <version>${carbon.version}</version>
- <classifier>tests</classifier>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stratos</groupId>
- <artifactId>org.apache.stratos.tenant.mgt.stub</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.wso2.carbon</groupId>
- <artifactId>SecVerifier</artifactId>
- <version>${carbon.version}</version>
- <type>aar</type>
- </dependency>
- </dependencies>
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/LoginLogoutTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/LoginLogoutTestCase.java b/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/LoginLogoutTestCase.java
deleted file mode 100755
index ae08489..0000000
--- a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/LoginLogoutTestCase.java
+++ /dev/null
@@ -1,49 +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.stratos.manager.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.annotations.Test;
-import org.wso2.carbon.integration.framework.ClientConnectionUtil;
-import org.wso2.carbon.integration.framework.LoginLogoutUtil;
-
-/**
- * A test case which tests logging in & logging out of a Carbon core server
- */
-public class LoginLogoutTestCase {
-
- private LoginLogoutUtil util = new LoginLogoutUtil();
- public static final Log log = LogFactory.getLog(LoginLogoutTestCase.class);
-
- @Test(groups = {"stratos.manager"})
- public void login() throws Exception {
- log.info("****************************** LoginLogoutTestCase Start ******************************");
- ClientConnectionUtil.waitForPort(9763);
- util.login();
- }
-
- @Test(groups = {"stratos.manager"})
- public void logout() throws Exception {
- ClientConnectionUtil.waitForPort(9763);
- util.logout();
- log.info("****************************** LoginLogoutTestCase End ******************************");
- }
-}
-
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/SecurityVerificationTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/SecurityVerificationTestCase.java b/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/SecurityVerificationTestCase.java
deleted file mode 100755
index 1cfa9e0..0000000
--- a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/SecurityVerificationTestCase.java
+++ /dev/null
@@ -1,27 +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.stratos.manager.integration.tests;
-
-import org.wso2.carbon.integration.framework.SecurityVerificationTest;
-
-/**
- * Test to ensure that the WSO2 Stratos Manager is properly secured
- */
-public class SecurityVerificationTestCase extends SecurityVerificationTest {
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/StratosManagerTestServerManager.java
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/StratosManagerTestServerManager.java b/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/StratosManagerTestServerManager.java
deleted file mode 100755
index 0a1c7e1..0000000
--- a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/StratosManagerTestServerManager.java
+++ /dev/null
@@ -1,54 +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.stratos.manager.integration.tests;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeSuite;
-import org.wso2.carbon.integration.framework.TestServerManager;
-
-import java.io.File;
-import java.io.IOException;
-
-/**
- * Prepares the WSO2 AS for test runs, starts the server, and stops the server after
- * test runs
- */
-public class StratosManagerTestServerManager extends TestServerManager {
- private static final Log log = LogFactory.getLog(StratosManagerTestServerManager.class);
-
- @Override
- @BeforeSuite(timeOut = 300000)
- public String startServer() throws IOException {
- String carbonHome = super.startServer();
- System.setProperty("carbon.home", carbonHome);
- return carbonHome;
- }
-
- @Override
- @AfterSuite(timeOut = 60000)
- public void stopServer() throws Exception {
- super.stopServer();
- }
-
- protected void copyArtifacts(String carbonHome) throws IOException {
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java b/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
deleted file mode 100755
index 963e0a1..0000000
--- a/products/stratos-controller/modules/integration/src/test/java/org/apache/stratos/manager/integration/tests/TenantMgtTestCase.java
+++ /dev/null
@@ -1,92 +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.stratos.manager.integration.tests;
-
-import org.apache.axis2.client.ServiceClient;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.testng.Assert;
-import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.Test;
-import org.wso2.carbon.integration.framework.utils.FrameworkSettings;
-import org.apache.stratos.tenant.mgt.stub.TenantMgtAdminServiceStub;
-import org.apache.stratos.tenant.mgt.stub.beans.xsd.TenantInfoBean;
-import org.wso2.carbon.utils.CarbonUtils;
-
-import java.util.Calendar;
-import java.util.Date;
-import java.util.GregorianCalendar;
-
-public class TenantMgtTestCase {
-
- private static String TenantMgtAdminServiceURL;
- private static String TestTenantDomain;
- public static final Log log = LogFactory.getLog(TenantMgtTestCase.class);
-
- @BeforeClass
- public void init() {
- log.info("****************************** TenantMgtTestCase Start ******************************");
- TestTenantDomain = "testcase.org";
- TenantMgtAdminServiceURL = "https://" + FrameworkSettings.HOST_NAME + ":" +
- FrameworkSettings.HTTPS_PORT + "/services/TenantMgtAdminService";
- }
-
- @Test(groups = {"stratos.manager"})
- public void addTenantTest() throws Exception {
- Calendar calender = new GregorianCalendar();
- calender.setTime(new Date());
-
- TenantInfoBean tenantInfoBean = new TenantInfoBean();
- tenantInfoBean.setActive(true);
- tenantInfoBean.setEmail("manager-test@wso2.com");
- tenantInfoBean.setAdmin("admin");
- tenantInfoBean.setAdminPassword("admin123");
- tenantInfoBean.setTenantDomain(TestTenantDomain);
- tenantInfoBean.setCreatedDate(calender);
- tenantInfoBean.setFirstname("Fname");
- tenantInfoBean.setLastname("Lname");
- tenantInfoBean.setSuccessKey("true");
- tenantInfoBean.setUsagePlan("Demo");
-
- TenantMgtAdminServiceStub stub = new TenantMgtAdminServiceStub(TenantMgtAdminServiceURL);
- ServiceClient client = stub._getServiceClient();
- CarbonUtils.setBasicAccessSecurityHeaders(FrameworkSettings.USER_NAME, FrameworkSettings.PASSWORD, client);
-
- String result = stub.addTenant(tenantInfoBean);
- Assert.assertTrue(stub.retrieveTenants()[0].getTenantDomain().equals(TestTenantDomain));
-
- }
-
- @Test(groups = {"stratos.manager"})
- public void activateTenantTest() throws Exception {
- TenantMgtAdminServiceStub stub = new TenantMgtAdminServiceStub(TenantMgtAdminServiceURL);
- ServiceClient client = stub._getServiceClient();
- CarbonUtils.setBasicAccessSecurityHeaders(FrameworkSettings.USER_NAME, FrameworkSettings.PASSWORD, client);
- stub.activateTenant(TestTenantDomain);
- Assert.assertTrue(stub.retrieveTenants()[0].getActive());
- }
-
- @AfterClass
- public void end(){
- log.info("****************************** TenantMgtTestCase End ******************************");
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/src/test/resources/instrumentation.txt
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/src/test/resources/instrumentation.txt b/products/stratos-controller/modules/integration/src/test/resources/instrumentation.txt
deleted file mode 100755
index a791db3..0000000
--- a/products/stratos-controller/modules/integration/src/test/resources/instrumentation.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-org.apache.stratos.tenant.mgt_
-org.apache.stratos.tenant.mgt.core_
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/src/test/resources/keys/wso2carbon.jks
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/src/test/resources/keys/wso2carbon.jks b/products/stratos-controller/modules/integration/src/test/resources/keys/wso2carbon.jks
deleted file mode 100755
index 7942c53..0000000
Binary files a/products/stratos-controller/modules/integration/src/test/resources/keys/wso2carbon.jks and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/modules/integration/src/test/resources/testng.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/modules/integration/src/test/resources/testng.xml b/products/stratos-controller/modules/integration/src/test/resources/testng.xml
deleted file mode 100644
index 0550eac..0000000
--- a/products/stratos-controller/modules/integration/src/test/resources/testng.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version='1.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.
-
--->
-
-<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" >
-<suite name="Apache Stratos Manager Test Suite">
- <test name="testing" preserve-order="true">
- <classes>
- <class name="org.apache.stratos.manager.integration.tests.StratosManagerTestServerManager"/>
- <class name="org.apache.stratos.manager.integration.tests.LoginLogoutTestCase"/>
- <class name="org.apache.stratos.manager.integration.tests.SecurityVerificationTestCase"/>
- <!--class name="org.apache.stratos.manager.integration.tests.TenantMgtTestCase">
- <methods>
- <include name="init"/>
- <include name="addTenantTest"/>
- <include name="activateTenantTest"/>
- </methods>
- </class-->
- </classes>
- </test>
-</suite>
http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c230cb05/products/stratos-controller/pom.xml
----------------------------------------------------------------------
diff --git a/products/stratos-controller/pom.xml b/products/stratos-controller/pom.xml
index e5acdc7..843dd3c 100755
--- a/products/stratos-controller/pom.xml
+++ b/products/stratos-controller/pom.xml
@@ -43,7 +43,6 @@
<module>modules/features-dashboard</module>
<module>resources/cloud-services-icons</module>
<module>modules/distribution</module>
- <module>modules/integration</module>
</modules>
<dependencyManagement>