Return-Path: X-Original-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-cloudstack-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2CC18DEB7 for ; Mon, 5 Nov 2012 17:23:45 +0000 (UTC) Received: (qmail 44442 invoked by uid 500); 5 Nov 2012 17:23:44 -0000 Delivered-To: apmail-incubator-cloudstack-commits-archive@incubator.apache.org Received: (qmail 44148 invoked by uid 500); 5 Nov 2012 17:23:44 -0000 Mailing-List: contact cloudstack-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cloudstack-dev@incubator.apache.org Delivered-To: mailing list cloudstack-commits@incubator.apache.org Received: (qmail 43664 invoked by uid 99); 5 Nov 2012 17:23:43 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 05 Nov 2012 17:23:43 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id DBCA444132; Mon, 5 Nov 2012 17:23:42 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ahuang@apache.org To: cloudstack-commits@incubator.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [11/18] Added engine Message-Id: <20121105172342.DBCA444132@tyr.zones.apache.org> Date: Mon, 5 Nov 2012 17:23:42 +0000 (UTC) http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a6df8a5b/engine/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java ---------------------------------------------------------------------- diff --git a/engine/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java b/engine/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java new file mode 100644 index 0000000..8771d02 --- /dev/null +++ b/engine/storage/test/org/apache/cloudstack/storage/test/volumeServiceTest.java @@ -0,0 +1,128 @@ +/* + * 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 java.awt.List; +import java.util.LinkedList; + +import javax.inject.Inject; + +import org.apache.cloudstack.storage.datastore.DefaultPrimaryDataStoreImpl; +import org.apache.cloudstack.storage.datastore.provider.DefaultPrimaryDatastoreProviderImpl; +import org.apache.cloudstack.storage.datastore.provider.PrimaryDataStoreProvider; +import org.apache.cloudstack.storage.image.format.ISO; +import org.apache.cloudstack.storage.image.format.ImageFormat; +import org.apache.cloudstack.storage.image.format.ImageFormatHelper; +import org.apache.cloudstack.storage.image.format.OVA; +import org.apache.cloudstack.storage.image.format.Unknown; +import org.apache.cloudstack.storage.volume.VolumeMotionService; +import org.apache.cloudstack.storage.volume.VolumeService; +import org.apache.cloudstack.storage.volume.db.VolumeDao; +import org.apache.cloudstack.storage.volume.disktype.QCOW2; +import org.apache.cloudstack.storage.volume.disktype.VHD; +import org.apache.cloudstack.storage.volume.disktype.VMDK; +import org.apache.cloudstack.storage.volume.disktype.VolumeDiskType; +import org.apache.cloudstack.storage.volume.disktype.VolumeDiskTypeHelper; +import org.apache.cloudstack.storage.volume.type.Iso; +import org.apache.cloudstack.storage.volume.type.VolumeTypeHelper; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.config.AutowireCapableBeanFactory; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.mockito.Mockito.*; + + +import com.cloud.utils.component.ComponentInject; +import com.cloud.utils.db.DB; + + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations="storageContext.xml") +public class volumeServiceTest { + @Autowired + protected VolumeService volService; + @Inject + protected VolumeDao volumeDao; + @Autowired + protected VolumeMotionService vmotion; + @Before + public void setUp() { + Mockito.when(vmotion.copyVolume(null, null)).thenReturn(false); + } + + @DB + public void test() { + assertTrue(volService.deleteVolume(1) != false); + assertNotNull(volumeDao); + //VolumeVO vol = new VolumeVO(Volume.Type.DATADISK, "test", 1, 2, 2, 1, 1); + //volumeDao.persist(vol); + /* + VolumeVO volume = new VolumeVO(); + String name = "test"; + long size = 100; + volume.setName(name); + volume.setSize(size); + volumeDao.persist(volume); + VolumeVO newVol = volumeDao.getVolumeByName(name); + assertTrue(newVol.getSize() == volume.getSize()); + */ + + fail("Not yet implemented"); + } + + @Test + public void test1() { + System.out.println(VolumeTypeHelper.getType("Root")); + System.out.println(VolumeDiskTypeHelper.getDiskType("vmdk")); + System.out.println(ImageFormatHelper.getFormat("ova")); + assertFalse(new VMDK().equals(new VHD())); + VMDK vmdk = new VMDK(); + assertTrue(vmdk.equals(vmdk)); + VMDK newvmdk = new VMDK(); + assertTrue(vmdk.equals(newvmdk)); + + ImageFormat ova = new OVA(); + ImageFormat iso = new ISO(); + assertTrue(ova.equals(new OVA())); + assertFalse(ova.equals(iso)); + assertTrue(ImageFormatHelper.getFormat("test").equals(new Unknown())); + + VolumeDiskType qcow2 = new QCOW2(); + ImageFormat qcow2format = new org.apache.cloudstack.storage.image.format.QCOW2(); + assertFalse(qcow2.equals(qcow2format)); + + } + + //@Test + public void testStaticBean() { + DefaultPrimaryDatastoreProviderImpl provider = ComponentInject.inject(DefaultPrimaryDatastoreProviderImpl.class); + assertNotNull(provider.dataStoreDao); + + DefaultPrimaryDataStoreImpl dpdsi = new DefaultPrimaryDataStoreImpl(null, null, null); + ComponentInject.inject(dpdsi); + //assertNotNull(dpdsi.volumeDao); + } +}