read build information from MANIFEST file

Author: chewiebug

src/main/java/com/tagtraum/perf/gcviewer/util/BuildInfoReader.java

@@ -6,18 +6,20 @@
 
 /**
  * Small helper class to provide current version of GCViewer.
- * 
+ *
  * @author <a href="mailto:[email protected]">Joerg Wuethrich</a>
  * <p>created on: 14.07.2012</p>
  *
  */
 public class BuildInfoReader {
 
-    private final static String FILE_NAME = "build.info.properties";
-    
+    private final static String FILE_NAME = "META-INF/MANIFEST.MF";
+    private final static String BUILD_VERSION = "Implementation-Version";
+    private final static String BUILD_TIMESTAMP = "Implementation-Date";
+
     /**
      * Reads the value of a property from FILE_NAME (must be in classpath).
-     * 
+     *
      * @param propertyName name of the property to be read
      * @return "n/a" if it couldn't be found or the value
      */
@@ -28,30 +30,33 @@ private static String readPropertyValue(String propertyName) {
                 Properties props = new Properties();
                 props.load(in);
                 propertyValue = props.getProperty(propertyName);
+                if (propertyValue == null || propertyValue.length() == 0) {
+                    propertyValue = "n/a";
+                }
             }
-        } 
+        }
         catch (IOException e) {
             e.printStackTrace();
         }
 
         return propertyValue;
     }
-    
+
     /**
      * Read version from properties file in classpath if it can be found.
-     * 
+     *
      * @return version or "n/a" if not found.
      */
     public static String getVersion() {
-        return readPropertyValue("build.version");
+        return readPropertyValue(BUILD_VERSION);
     }
 
     /**
      * Read build date from properties file in classpath if it can be found.
-     * 
+     *
      * @return date or "n/a" if not found.
      */
     public static String getBuildDate() {
-        return readPropertyValue("build.date");
+        return readPropertyValue(BUILD_TIMESTAMP);
     }
 }

src/test/java/com/tagtraum/perf/gcviewer/TestBuildInfoReader.java

@@ -1,7 +1,9 @@
 package com.tagtraum.perf.gcviewer;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
+import static org.hamcrest.Matchers.isEmptyOrNullString;
+import static org.hamcrest.Matchers.not;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.junit.Assert.assertThat;
 
 import org.junit.Test;
 
@@ -10,7 +12,7 @@
 /**
  * Tests the class {@link BuildInfoReader} - makes sure that the properties from the file
  * can be read. 
- * 
+ *
  * @author <a href="mailto:[email protected]">Joerg Wuethrich</a>
  * <p>created on: 05.12.2012</p>
  */
@@ -19,14 +21,14 @@ public class TestBuildInfoReader {
     @Test
     public void readVersion() {
         String version = BuildInfoReader.getVersion();
-        assertNotNull("version", version);
-        assertFalse("must not be n/a", version.equals("n/a"));
+        assertThat("version", version, notNullValue());
+        assertThat("must not be empty", version, not(isEmptyOrNullString()));
     }
 
     @Test
     public void readBuildDate() {
         String buildDate = BuildInfoReader.getBuildDate();
-        assertNotNull("buildDate", buildDate);
-        assertFalse("must not be n/a", buildDate.equals("n/a"));
+        assertThat("buildDate", buildDate, notNullValue());
+        assertThat("must not be empty", buildDate, not(isEmptyOrNullString()));
     }
 }