Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/Attic/ToolDataAccessTestCase.java,v
diff -u -r1.14 -r1.15
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	10 May 2005 23:54:56 -0000	1.14
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	5 Jul 2005 06:16:51 -0000	1.15
@@ -53,6 +53,11 @@
     
     //Test tool id - survey tool
     protected final Long TEST_TOOL_ID = new Long(6);
+    protected final String TEST_TOOL_SIG = "survey_signature";
+    protected final String TEST_TOOL_SERVICE_NAME = "surveyService";
+    protected final String TEST_TOOL_DISPLAY_NAME = "Survey";
+    protected final long TEST_TOOL_DEFAULT_CONTENT_ID = 6;
+
     protected Tool testTool;
     protected ToolSession ngToolSession;
     protected ToolSession gToolSession;
Index: lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/dao/Attic/TestToolDAO.java,v
diff -u -r1.8 -r1.9
--- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java	29 Jun 2005 02:13:00 -0000	1.8
+++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java	5 Jul 2005 06:14:16 -0000	1.9
@@ -51,17 +51,17 @@
 
     public void testGetToolBySignature()
     {
-    	Tool Tool = toolDao.getToolBySignature("chat_signature");
-        assertEquals(new Long(8),testTool.getToolId());
+    	testTool = toolDao.getToolBySignature(TEST_TOOL_SIG);
+        assertEquals(TEST_TOOL_ID,testTool.getToolId());
     }
 
     public void testGetToolByID()
     {
         testTool = toolDao.getToolByID(super.TEST_TOOL_ID);
-        assertEquals("verify signature","survey_signature",testTool.getToolSignature());
-        assertEquals("verify service name","surveyService",testTool.getServiceName());
-        assertEquals("verify display name","Survey",testTool.getToolDisplayName());
-        assertEquals("verify default content id",6,testTool.getDefaultToolContentId());
+        assertEquals("verify signature",TEST_TOOL_SIG,testTool.getToolSignature());
+        assertEquals("verify service name",TEST_TOOL_SERVICE_NAME,testTool.getServiceName());
+        assertEquals("verify display name",TEST_TOOL_DISPLAY_NAME,testTool.getToolDisplayName());
+        assertEquals("verify default content id",TEST_TOOL_DEFAULT_CONTENT_ID,testTool.getDefaultToolContentId());
         assertTrue("verify support define later",testTool.getSupportsDefineLater());
     }