From owner-svn-src-projects@freebsd.org Wed Apr 13 16:29:00 2016 Return-Path: Delivered-To: svn-src-projects@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id B866CB0E26F for ; Wed, 13 Apr 2016 16:29:00 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 890EC1B19; Wed, 13 Apr 2016 16:29:00 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u3DGSxD6007668; Wed, 13 Apr 2016 16:28:59 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3DGSxYO007665; Wed, 13 Apr 2016 16:28:59 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201604131628.u3DGSxYO007665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Wed, 13 Apr 2016 16:28:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r297928 - in projects/zfsd/head: etc/mtree lib/libdevdctl/tests X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 13 Apr 2016 16:29:00 -0000 Author: asomers Date: Wed Apr 13 16:28:59 2016 New Revision: 297928 URL: https://svnweb.freebsd.org/changeset/base/297928 Log: Add some unit tests for the existing behavior of libdevdctl. Like zfsd's unit tests, these are written in googletest and will not be built on a system that does not have devel/googletest installed. Sponsored by: Spectra Logic Corp Added: projects/zfsd/head/lib/libdevdctl/tests/ projects/zfsd/head/lib/libdevdctl/tests/Makefile (contents, props changed) projects/zfsd/head/lib/libdevdctl/tests/libdevdctl_unittest.cc (contents, props changed) Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist Modified: projects/zfsd/head/etc/mtree/BSD.tests.dist ============================================================================== --- projects/zfsd/head/etc/mtree/BSD.tests.dist Wed Apr 13 16:19:50 2016 (r297927) +++ projects/zfsd/head/etc/mtree/BSD.tests.dist Wed Apr 13 16:28:59 2016 (r297928) @@ -302,6 +302,8 @@ .. libcrypt .. + libdevdctl + .. libmp .. libnv Added: projects/zfsd/head/lib/libdevdctl/tests/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/lib/libdevdctl/tests/Makefile Wed Apr 13 16:28:59 2016 (r297928) @@ -0,0 +1,21 @@ +# $FreeBSD$ + +TESTSDIR= ${TESTSBASE}/lib/libdevdctl + +.PATH: ${.CURDIR}/.. + +PLAIN_TESTS_CXX= libdevdctl_unittest + +SRCS.libdevdctl_unittest+= event_factory.cc \ + libdevdctl_unittest.cc \ + event.cc exception.cc \ + guid.cc +CFLAGS.libdevdctl_unittest+= -I ${LOCALBASE}/include -D_THREAD_SAFE -pthread +DPADD.libdevdctl_unittest+= ${LIBDEVDCTL} +LDADD.libdevdctl_unittest+= -L ${LOCALBASE}/lib -D_THREAD_SAFE -pthread -lgtest -lgtest_main + +# Googletest options +LOCALBASE?= /usr/local + +WARNS?= 3 +.include Added: projects/zfsd/head/lib/libdevdctl/tests/libdevdctl_unittest.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/zfsd/head/lib/libdevdctl/tests/libdevdctl_unittest.cc Wed Apr 13 16:28:59 2016 (r297928) @@ -0,0 +1,113 @@ +/*- + * Copyright (c) 2016 Spectra Logic Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions, and the following disclaimer, + * without modification. + * 2. Redistributions in binary form must reproduce at minimum a disclaimer + * substantially similar to the "NO WARRANTY" disclaimer below + * ("Disclaimer") and any redistribution must be conditioned upon + * including a substantially similar Disclaimer requirement for further + * binary redistribution. + * + * NO WARRANTY + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR + * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT + * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGES. + * + * Authors: Alan Somers (Spectra Logic Corporation) + */ + +#include + +#include +#include +#include + +#include +#include +#include + +using namespace DevdCtl; +using namespace std; +using namespace testing; + +#define NUM_ELEMENTS(x) (sizeof(x) / sizeof(*x)) + +class IsDiskDevTest : public TestWithParam >{ +protected: + virtual void SetUp() + { + m_factory = new EventFactory(); + } + + virtual void TearDown() + { + if (m_ev) delete m_ev; + if (m_factory) delete m_factory; + } + + EventFactory *m_factory; + Event *m_ev; + static EventFactory::Record s_registry[]; +}; + +DevdCtl::EventFactory::Record IsDiskDevTest::s_registry[] = { + { Event::NOTIFY, "DEVFS", &DevfsEvent::Builder } +}; + +TEST_P(IsDiskDevTest, TestIsDiskDev) { + pair param = GetParam(); + DevfsEvent *devfs_ev; + + m_factory->UpdateRegistry(s_registry, NUM_ELEMENTS(s_registry)); + string evString(param.second); + m_ev = Event::CreateEvent(*m_factory, evString); + devfs_ev = dynamic_cast(m_ev); + ASSERT_NE(nullptr, devfs_ev); + EXPECT_EQ(param.first, devfs_ev->IsDiskDev()); +} + +INSTANTIATE_TEST_CASE_P(IsDiskDevTestInstantiation, IsDiskDevTest, Values( + pair(true, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=da6\n"), + pair(false, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=cuau0\n"), + pair(true, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=ada6\n"), + pair(true, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=da6p1\n"), + pair(true, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=ada6p1\n"), + pair(true, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=da6s0p1\n"), + pair(true, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=ada6s0p1\n"), + /* + * Test physical path nodes. These are currently all set to false since + * physical path nodes are implemented with symlinks, and most CAM and + * ZFS operations can't use symlinked device nodes + */ + /* A SpectraBSD-style physical path node*/ + pair(false, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=enc@50030480019f53fd/elmtype@array_device/slot@18/da\n"), + pair(false, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=enc@50030480019f53fd/elmtype@array_device/slot@18/pass\n"), + /* A FreeBSD-style physical path node */ + pair(true, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=enc@n50030480019f53fd/type@0/slot@18/elmdesc@ArrayDevice18/da6\n"), + pair(false, + "!system=DEVFS subsystem=CDEV type=CREATE cdev=enc@n50030480019f53fd/type@0/slot@18/elmdesc@ArrayDevice18/pass6\n")); +);