From: Chris Jaekl <cejaekl@yahoo.com>
Date: Wed, 30 Dec 2015 07:25:11 +0000 (+0900)
Subject: Avoid unit test failures when cfb.properties is not found in the classpath.
X-Git-Url: https://jaekl.net/gitweb/?a=commitdiff_plain;h=a59aa887766f250ba0ad0948c54e1a8d9a590a23;p=cfb.git

Avoid unit test failures when cfb.properties is not found in the classpath.
---

diff --git a/prod/net/jaekl/cfb/CfbException.java b/prod/net/jaekl/cfb/CfbException.java
index b8a14c0..6b46797 100644
--- a/prod/net/jaekl/cfb/CfbException.java
+++ b/prod/net/jaekl/cfb/CfbException.java
@@ -3,6 +3,10 @@ package net.jaekl.cfb;
 public class CfbException extends Exception {
 	private static final long serialVersionUID = 1L;
 
+	public CfbException() {
+		super();
+	}
+	
 	public CfbException(String msg) {
 		super(msg);
 	}
diff --git a/prod/net/jaekl/cfb/store/DbStore.java b/prod/net/jaekl/cfb/store/DbStore.java
index ed22291..e50f740 100644
--- a/prod/net/jaekl/cfb/store/DbStore.java
+++ b/prod/net/jaekl/cfb/store/DbStore.java
@@ -3,9 +3,7 @@ package net.jaekl.cfb.store;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
-import java.util.Locale;
 
-import net.jaekl.cfb.CfbBundle;
 import net.jaekl.cfb.analyze.Analysis;
 import net.jaekl.cfb.db.CfbSchema;
 import net.jaekl.cfb.db.Column;
@@ -47,8 +45,6 @@ public class DbStore {
 	}
 	
 	public boolean put(Analysis analysis) throws SQLException, TypeMismatchException, StoreException {
-		CfbBundle bundle = CfbBundle.getInst(Locale.getDefault());
-		
 		if (null == analysis) {
 			return false;
 		}
@@ -89,10 +85,10 @@ public class DbStore {
 			Location thirdLoc  = (locs.size() > 2) ? locs.get(2) : null;
 			
 			if (BugPattern.UNKNOWN.getId() == bugId) {
-				throw new StoreException(bundle.get(CfbBundle.BUG_TYPE_UNKNOWN, ""+bug.getType()));
+				throw new StoreException(StoreException.Type.UNKNOWN_PATTERN, ""+bug.getType());
 			}
 			if (BugCategory.UNKNOWN.getId() == categoryId) {
-				throw new StoreException(bundle.get(CfbBundle.BUG_CATEGORY_UNKNOWN, ""+bug.getCategory()));
+				throw new StoreException(StoreException.Type.UNKNOWN_CATEGORY, ""+bug.getCategory());
 			}
 			
 			values[row][0] = foundId;
diff --git a/prod/net/jaekl/cfb/store/StoreException.java b/prod/net/jaekl/cfb/store/StoreException.java
index 5b7544d..5c0caf4 100644
--- a/prod/net/jaekl/cfb/store/StoreException.java
+++ b/prod/net/jaekl/cfb/store/StoreException.java
@@ -1,11 +1,29 @@
 package net.jaekl.cfb.store;
 
+import java.util.Arrays;
+
 import net.jaekl.cfb.CfbException;
 
 public class StoreException extends CfbException {
+	public enum Type {
+		UNKNOWN_PATTERN,	// bug pattern type is not found in the message collection 
+		UNKNOWN_CATEGORY	// bug category is not found in the message collection
+	}
+	
+	private Type m_type;
+	private String[] m_info;
+	
 	private static final long serialVersionUID = 1L;
 	
-	public StoreException(String msg) {
-		super(msg);
+	public StoreException(Type type, String... info) {
+		super();
+		
+		m_type = type;
+		m_info = info;
+	}
+	
+	@Override
+	public String toString() {
+		return "" + getClass().getName() + ": " + m_type + ": " + Arrays.toString(m_info);
 	}
 }