From owner-svn-soc-all@FreeBSD.ORG Sun Sep 8 11:30:15 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id F3761F75 for ; Sun, 8 Sep 2013 11:30:14 +0000 (UTC) (envelope-from mattbw@FreeBSD.org) Received: from socsvn.freebsd.org (socsvn.freebsd.org [IPv6:2001:1900:2254:206a::50:2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D14722911 for ; Sun, 8 Sep 2013 11:30:14 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r88BUE5j077217 for ; Sun, 8 Sep 2013 11:30:14 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r88BUEBV077206 for svn-soc-all@FreeBSD.org; Sun, 8 Sep 2013 11:30:14 GMT (envelope-from mattbw@FreeBSD.org) Date: Sun, 8 Sep 2013 11:30:14 GMT Message-Id: <201309081130.r88BUEBV077206@socsvn.freebsd.org> X-Authentication-Warning: socsvn.freebsd.org: www set sender to mattbw@FreeBSD.org using -f From: mattbw@FreeBSD.org To: svn-soc-all@FreeBSD.org Subject: socsvn commit: r257117 - soc2013/mattbw/backend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-soc-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the entire Summer of Code repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Sep 2013 11:30:15 -0000 Author: mattbw Date: Sun Sep 8 11:30:14 2013 New Revision: 257117 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257117 Log: Add new unit tests for pkgutils_pkg_matches_filters. These currently fail; will investigate now. Modified: soc2013/mattbw/backend/pkgutils_test.c Modified: soc2013/mattbw/backend/pkgutils_test.c ============================================================================== --- soc2013/mattbw/backend/pkgutils_test.c Sun Sep 8 11:20:44 2013 (r257116) +++ soc2013/mattbw/backend/pkgutils_test.c Sun Sep 8 11:30:14 2013 (r257117) @@ -178,6 +178,84 @@ pkg_free(package); } +ATF_TC(pkg_matches_filters_installed); +ATF_TC_HEAD(pkg_matches_filters_installed, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Test 'pkgutils_pkg_matches_filters' for the installed filter."); +} +ATF_TC_BODY(pkg_matches_filters_installed, tc) +{ + struct pkg *local; + struct pkg *remote; + PkBitfield filter; + + filter = pk_bitfield_from_enums(PK_FILTER_ENUM_INSTALLED); + + /* Locally installed -> accept */ + local = gen_pkg(PKG_INSTALLED); + ATF_REQUIRE(local != NULL); + ATF_CHECK(pkgutils_pkg_matches_filters(local, filter)); + pkg_free(local); + + remote = gen_pkg(PKG_REMOTE); + ATF_REQUIRE(remote != NULL); + + /* Old version newer -> reject */ + pkg_set(remote, PKG_OLD_VERSION, "1.2.3"); + ATF_CHECK(!pkgutils_pkg_matches_filters(remote, filter)); + + /* Old version the same -> accept */ + pkg_set(remote, PKG_OLD_VERSION, "1.1.4"); + ATF_CHECK(pkgutils_pkg_matches_filters(remote, filter)); + + /* Old version older -> reject */ + pkg_set(remote, PKG_OLD_VERSION, "1.0.0"); + ATF_CHECK(!pkgutils_pkg_matches_filters(remote, filter)); + + pkg_free(remote); +} + +ATF_TC(pkg_matches_filters_not_installed); +ATF_TC_HEAD(pkg_matches_filters_not_installed, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Test 'pkgutils_pkg_matches_filters' for the ~installed filter."); +} +ATF_TC_BODY(pkg_matches_filters_not_installed, tc) +{ + struct pkg *local; + struct pkg *remote; + PkBitfield filter; + + filter = pk_bitfield_from_enums(PK_FILTER_ENUM_NOT_INSTALLED); + + /* Locally installed -> reject */ + local = gen_pkg(PKG_INSTALLED); + ATF_REQUIRE(local != NULL); + ATF_CHECK(!pkgutils_pkg_matches_filters(local, filter)); + pkg_free(local); + + remote = gen_pkg(PKG_REMOTE); + ATF_REQUIRE(remote != NULL); + + /* Old version newer -> reject */ + pkg_set(remote, PKG_OLD_VERSION, "1.2.3"); + ATF_CHECK(pkgutils_pkg_matches_filters(remote, filter)); + + /* Old version the same -> accept */ + pkg_set(remote, PKG_OLD_VERSION, "1.1.4"); + ATF_CHECK(!pkgutils_pkg_matches_filters(remote, filter)); + + /* Old version older -> reject */ + pkg_set(remote, PKG_OLD_VERSION, "1.0.0"); + ATF_CHECK(pkgutils_pkg_matches_filters(remote, filter)); + + pkg_free(remote); +} + /* * TEST PACK */ @@ -190,6 +268,8 @@ ATF_TP_ADD_TC(tp, pkg_install_state); ATF_TP_ADD_TC(tp, pkg_current_state_local); ATF_TP_ADD_TC(tp, pkg_current_state_remote); + ATF_TP_ADD_TC(tp, pkg_matches_filters_installed); + ATF_TP_ADD_TC(tp, pkg_matches_filters_not_installed); return atf_no_error(); }