--- a/client/core/src/main/java/com/redhat/thermostat/client/internal/ApplicationInfo.java	Wed Jun 13 21:33:48 2012 +0200
+++ b/client/core/src/main/java/com/redhat/thermostat/client/internal/ApplicationInfo.java	Wed Jun 13 21:34:41 2012 +0200
@@ -55,12 +55,14 @@
 
     private static final Logger logger = LoggingUtils.getLogger(ApplicationInfo.class);
 
+    private static final String APP_INFO = "/com/redhat/thermostat/client/app-info.properties";
+    
     private Properties appInfo;
 
     public ApplicationInfo() {
         appInfo = new Properties();
         // the properties file should be in the same package as this class
-        InputStream res = getClass().getResourceAsStream("app-info.properties");
+        InputStream res = getClass().getResourceAsStream(APP_INFO);
         if (res != null) {
             try {
                 appInfo.load(res);

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/client/core/src/test/java/com/redhat/thermostat/client/internal/ApplicationInfoTest.java	Wed Jun 13 21:34:41 2012 +0200
@@ -0,0 +1,70 @@
+/*
+ * 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.client.internal;
+
+import static com.redhat.thermostat.client.locale.Translate.localize;
+import static org.junit.Assert.*;
+
+import java.util.Locale;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.redhat.thermostat.client.locale.LocaleResources;
+
+public class ApplicationInfoTest {
+
+    private Locale locale;
+    
+    @Before
+    public void setUp() {
+        locale = Locale.getDefault();
+        Locale.setDefault(Locale.US);
+    }
+    
+    @Test
+    public void testProperties() {
+        ApplicationInfo appInfo = new ApplicationInfo();
+        assertFalse(appInfo.getName().compareTo(localize(LocaleResources.MISSING_INFO)) == 0);
+    }
+
+    @After
+    public void tearDown() {
+        Locale.setDefault(locale);
+    }
+}