Mercurial > hg > release > thermostat-0.13
changeset 203:8b2ff2a1aecb
Move ApplicationContextUtil from test to main sources.
Review-thread: http://icedtea.classpath.org/pipermail/thermostat/2012-April/000711.html
author | Roman Kennke <rkennke@redhat.com> |
---|---|
date | Thu, 05 Apr 2012 00:36:28 +0200 |
parents | 7d7f9dd102bb |
children | 1584e5cbe144 e2342d02286f |
files | common/src/main/java/com/redhat/thermostat/common/appctx/ApplicationContextUtil.java common/src/test/java/com/redhat/thermostat/common/appctx/ApplicationContextUtil.java |
diffstat | 2 files changed, 53 insertions(+), 53 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/common/src/main/java/com/redhat/thermostat/common/appctx/ApplicationContextUtil.java Thu Apr 05 00:36:28 2012 +0200 @@ -0,0 +1,53 @@ +/* + * Copyright 2012 Red Hat, Inc. + * + * This file is part of Thermostat. + * + * Thermostat is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 2, or (at your + * option) any later version. + * + * Thermostat is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with Thermostat; see the file COPYING. If not see + * <http://www.gnu.org/licenses/>. + * + * Linking this code with other modules is making a combined work + * based on this code. Thus, the terms and conditions of the GNU + * General Public License cover the whole combination. + * + * As a special exception, the copyright holders of this code give + * you permission to link this code with independent modules to + * produce an executable, regardless of the license terms of these + * independent modules, and to copy and distribute the resulting + * executable under terms of your choice, provided that you also + * meet, for each linked independent module, the terms and conditions + * of the license of that module. An independent module is a module + * which is not derived from or based on this code. If you modify + * this code, you may extend this exception to your version of the + * library, but you are not obligated to do so. If you do not wish + * to do so, delete this exception statement from your version. + */ + +package com.redhat.thermostat.common.appctx; + +import com.redhat.thermostat.common.appctx.ApplicationContext; + +public class ApplicationContextUtil { + + /** + * This is here to allow tests to reset the ApplicationContext, while + * preventing real code the same (ApplicationContext.reset() is package private). + * + * It is vital that tests call this from their setUp() and tearDown() methods, + * to avoid leaking mocks and stuff from test to test. + */ + public static void resetApplicationContext() { + ApplicationContext.reset(); + } +}
--- a/common/src/test/java/com/redhat/thermostat/common/appctx/ApplicationContextUtil.java Wed Apr 04 17:03:52 2012 -0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,53 +0,0 @@ -/* - * Copyright 2012 Red Hat, Inc. - * - * This file is part of Thermostat. - * - * Thermostat is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published - * by the Free Software Foundation; either version 2, or (at your - * option) any later version. - * - * Thermostat is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Thermostat; see the file COPYING. If not see - * <http://www.gnu.org/licenses/>. - * - * Linking this code with other modules is making a combined work - * based on this code. Thus, the terms and conditions of the GNU - * General Public License cover the whole combination. - * - * As a special exception, the copyright holders of this code give - * you permission to link this code with independent modules to - * produce an executable, regardless of the license terms of these - * independent modules, and to copy and distribute the resulting - * executable under terms of your choice, provided that you also - * meet, for each linked independent module, the terms and conditions - * of the license of that module. An independent module is a module - * which is not derived from or based on this code. If you modify - * this code, you may extend this exception to your version of the - * library, but you are not obligated to do so. If you do not wish - * to do so, delete this exception statement from your version. - */ - -package com.redhat.thermostat.common.appctx; - -import com.redhat.thermostat.common.appctx.ApplicationContext; - -public class ApplicationContextUtil { - - /** - * This is here to allow tests to reset the ApplicationContext, while - * preventing real code the same (ApplicationContext.reset() is package private). - * - * It is vital that tests call this from their setUp() and tearDown() methods, - * to avoid leaking mocks and stuff from test to test. - */ - public static void resetApplicationContext() { - ApplicationContext.reset(); - } -}