From owner-svn-soc-all@FreeBSD.ORG Sun Sep 8 11:20:45 2013 Return-Path: Delivered-To: svn-soc-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 527EBDD7 for ; Sun, 8 Sep 2013 11:20:45 +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 3FD2328D4 for ; Sun, 8 Sep 2013 11:20:45 +0000 (UTC) Received: from socsvn.freebsd.org ([127.0.1.124]) by socsvn.freebsd.org (8.14.7/8.14.7) with ESMTP id r88BKjVw074034 for ; Sun, 8 Sep 2013 11:20:45 GMT (envelope-from mattbw@FreeBSD.org) Received: (from www@localhost) by socsvn.freebsd.org (8.14.7/8.14.6/Submit) id r88BKj8w074013 for svn-soc-all@FreeBSD.org; Sun, 8 Sep 2013 11:20:45 GMT (envelope-from mattbw@FreeBSD.org) Date: Sun, 8 Sep 2013 11:20:45 GMT Message-Id: <201309081120.r88BKj8w074013@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: r257116 - 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:20:45 -0000 Author: mattbw Date: Sun Sep 8 11:20:44 2013 New Revision: 257116 URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=257116 Log: Add some more pkgutils test cases. These test the package emission state enum deciding logic. Modified: soc2013/mattbw/backend/Makefile soc2013/mattbw/backend/pkgutils_test.c Modified: soc2013/mattbw/backend/Makefile ============================================================================== --- soc2013/mattbw/backend/Makefile Sun Sep 8 11:08:34 2013 (r257115) +++ soc2013/mattbw/backend/Makefile Sun Sep 8 11:20:44 2013 (r257116) @@ -125,7 +125,7 @@ pkgutils_test: pkgutils_test.o pkgutils.o namever.o testutils.o repo.o ${CC} ${LDFLAGS} ${TESTLDFLAGS} -o ${.TARGET} ${.ALLSRC} ${LIBS} ${TESTLIBS} -pkgutils_test.o: pkgutils_test.c repo.o +pkgutils_test.o: pkgutils_test.c ${CC} ${CFLAGS} ${TESTCFLAGS} -o ${.TARGET} -c ${.ALLSRC} namever_test: namever_test.o namever.o testutils.o Modified: soc2013/mattbw/backend/pkgutils_test.c ============================================================================== --- soc2013/mattbw/backend/pkgutils_test.c Sun Sep 8 11:08:34 2013 (r257115) +++ soc2013/mattbw/backend/pkgutils_test.c Sun Sep 8 11:20:44 2013 (r257116) @@ -93,6 +93,91 @@ g_free(package_id); } +ATF_TC(pkg_install_state); +ATF_TC_HEAD(pkg_install_state, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Test 'pkgutils_pkg_install_state'."); +} +ATF_TC_BODY(pkg_install_state, tc) +{ + struct pkg *package; + + package = gen_pkg(PKG_REMOTE); + ATF_REQUIRE(package != NULL); + + /* Old version newer -> downgrading */ + pkg_set(package, PKG_OLD_VERSION, "1.2.3"); + ATF_CHECK_EQ(pkgutils_pkg_install_state(package), + PK_INFO_ENUM_DOWNGRADING); + + /* Old version the same -> reinstalling */ + pkg_set(package, PKG_OLD_VERSION, "1.1.4"); + ATF_CHECK_EQ(pkgutils_pkg_install_state(package), + PK_INFO_ENUM_REINSTALLING); + + /* Old version older -> updating */ + pkg_set(package, PKG_OLD_VERSION, "1.0.0"); + ATF_CHECK_EQ(pkgutils_pkg_install_state(package), + PK_INFO_ENUM_UPDATING); + + pkg_free(package); +} + +ATF_TC(pkg_current_state_local); +ATF_TC_HEAD(pkg_current_state_local, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Test 'pkgutils_pkg_current_state' for installed packages."); +} +ATF_TC_BODY(pkg_current_state_local, tc) +{ + struct pkg *package; + + package = gen_pkg(PKG_INSTALLED); + ATF_REQUIRE(package != NULL); + + pkg_set(package, PKG_OLD_VERSION, "1.2.3"); + ATF_CHECK_EQ(pkgutils_pkg_current_state(package), + PK_INFO_ENUM_INSTALLED); + + pkg_free(package); +} + +ATF_TC(pkg_current_state_remote); +ATF_TC_HEAD(pkg_current_state_remote, tc) +{ + + atf_tc_set_md_var(tc, "descr", + "Test 'pkgutils_pkg_current_state' for remote packages."); +} +ATF_TC_BODY(pkg_current_state_remote, tc) +{ + struct pkg *package; + + package = gen_pkg(PKG_REMOTE); + ATF_REQUIRE(package != NULL); + + /* Old version newer -> available */ + pkg_set(package, PKG_OLD_VERSION, "1.2.3"); + ATF_CHECK_EQ(pkgutils_pkg_current_state(package), + PK_INFO_ENUM_AVAILABLE); + + /* Old version the same -> installed */ + pkg_set(package, PKG_OLD_VERSION, "1.1.4"); + ATF_CHECK_EQ(pkgutils_pkg_current_state(package), + PK_INFO_ENUM_INSTALLED); + + /* Old version older -> available */ + pkg_set(package, PKG_OLD_VERSION, "1.0.0"); + ATF_CHECK_EQ(pkgutils_pkg_current_state(package), + PK_INFO_ENUM_AVAILABLE); + + pkg_free(package); +} + /* * TEST PACK */ @@ -102,6 +187,9 @@ ATF_TP_ADD_TC(tp, pkg_to_id_valid_local); ATF_TP_ADD_TC(tp, pkg_to_id_valid_installed); ATF_TP_ADD_TC(tp, pkg_to_id_valid_remote); + 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); return atf_no_error(); }