Updated Branches: refs/heads/javelin 8e59b3acf -> 6a71110c7
add unit test Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6a71110c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6a71110c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6a71110c Branch: refs/heads/javelin Commit: 6a71110c756a22693f510bc88f6acac71be88a2d Parents: 8e59b3a Author: Edison Su <[email protected]> Authored: Fri Oct 19 17:31:28 2012 -0700 Committer: Edison Su <[email protected]> Committed: Fri Oct 19 17:31:28 2012 -0700 ---------------------------------------------------------------------- platform/storage/pom.xml | 1 + platform/storage/resources/storageContext.xml | 11 +++ .../storage/volume/VolumeServiceImpl.java | 59 +++++++++++++++ .../apache/cloudstack/storage/test/AllTests.java | 29 +++++++ .../cloudstack/storage/test/volumeServiceTest.java | 40 ++++++++++ 5 files changed, 140 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a71110c/platform/storage/pom.xml ---------------------------------------------------------------------- diff --git a/platform/storage/pom.xml b/platform/storage/pom.xml index 0ff3346..e964486 100644 --- a/platform/storage/pom.xml +++ b/platform/storage/pom.xml @@ -52,5 +52,6 @@ <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> + <testSourceDirectory>test</testSourceDirectory> </build> </project> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a71110c/platform/storage/resources/storageContext.xml ---------------------------------------------------------------------- diff --git a/platform/storage/resources/storageContext.xml b/platform/storage/resources/storageContext.xml new file mode 100644 index 0000000..35d18a6 --- /dev/null +++ b/platform/storage/resources/storageContext.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns:context="http://www.springframework.org/schema/context"; + xsi:schemaLocation="http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/context + http://www.springframework.org/schema/context/spring-context-3.0.xsd";> + <context:annotation-config /> + <context:component-scan base-package="org.apache.cloudstack.storage" /> + +</beans> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a71110c/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java new file mode 100644 index 0000000..8349437 --- /dev/null +++ b/platform/storage/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -0,0 +1,59 @@ +/* + * 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.cloudstack.storage.volume; + +import org.springframework.stereotype.Service; + +import com.cloud.api.commands.CreateVolumeCmd; +import com.cloud.storage.Volume; + +@Service +public class VolumeServiceImpl implements VolumeService { + + @Override + public Volume allocVolumeInDB(CreateVolumeCmd cmd) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Volume createVolume(CreateVolumeCmd cmd) { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean deleteVolume(long volumeId) { + // TODO Auto-generated method stub + return false; + } + + @Override + public Volume migrateVolume(Long volumeId, Long storagePoolId) { + // TODO Auto-generated method stub + return null; + } + + @Override + public Volume copyVolume(Long volumeId, Long destStoragePoolId) { + // TODO Auto-generated method stub + return null; + } + +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a71110c/platform/storage/test/org/apache/cloudstack/storage/test/AllTests.java ---------------------------------------------------------------------- diff --git a/platform/storage/test/org/apache/cloudstack/storage/test/AllTests.java b/platform/storage/test/org/apache/cloudstack/storage/test/AllTests.java new file mode 100644 index 0000000..dde4484 --- /dev/null +++ b/platform/storage/test/org/apache/cloudstack/storage/test/AllTests.java @@ -0,0 +1,29 @@ +/* + * 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.cloudstack.storage.test; + +import org.junit.runner.RunWith; +import org.junit.runners.Suite; +import org.junit.runners.Suite.SuiteClasses; + +@RunWith(Suite.class) +@SuiteClasses({ volumeServiceTest.class }) +public class AllTests { + +} http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a71110c/platform/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java ---------------------------------------------------------------------- diff --git a/platform/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java b/platform/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java new file mode 100644 index 0000000..1bc7d55 --- /dev/null +++ b/platform/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java @@ -0,0 +1,40 @@ +/* + * 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.cloudstack.storage.test; + +import static org.junit.Assert.*; + +import org.apache.cloudstack.storage.volume.VolumeService; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.test.context.ContextConfiguration; + +@ContextConfiguration(locations="resources/storageContext.xml") +public class volumeServiceTest { + + @Autowired + protected VolumeService volService; + @Test + public void test() { + volService.deleteVolume(1); + fail("Not yet implemented"); + } + +}
