Refactoring to remove superfluous traceability code and update trace …

…tests

cairis/core/MySQLDatabaseProxy.py

@@ -52,8 +52,6 @@
 from TaskParameters import TaskParameters
 from MisuseCaseParameters import MisuseCaseParameters
 from DomainPropertyParameters import DomainPropertyParameters
-import TraceParameters
-import UpdateTraceParameters
 import Trace
 from cairis.core.armid import *
 from DotTraceParameters import DotTraceParameters

cairis/core/ObjectFactory.py

@@ -70,8 +70,6 @@
 from CountermeasureParameters import CountermeasureParameters
 from TaskParameters import TaskParameters
 from MisuseCaseParameters import MisuseCaseParameters
-from TraceParameters import TraceParameters
-from UpdateTraceParameters import UpdateTraceParameters
 from DotTraceParameters import DotTraceParameters
 from EnvironmentParameters import EnvironmentParameters
 from RoleParameters import RoleParameters
@@ -151,12 +149,8 @@ def build(objtId,p):
     return UseCase(objtId,p.name(),p.author(),p.code(),p.actors(),p.description(),p.tags(),p.environmentProperties())
   if (p.__class__.__name__ == 'MisuseCaseParameters'):
     return MisuseCase(objtId,p.name(),p.environmentProperties(),p.risk())
-  if (p.__class__.__name__ == 'TraceParameters'):
-    return Trace(p.fromObject(),p.fromName(),p.fromId(),p.toObject(),p.toName(),p.toId())
   if (p.__class__.__name__ == 'DotTraceParameters'):
     return DotTrace(p.fromObject(),p.fromName(),p.toObject(),p.toName())
-  if (p.__class__.__name__ == 'UpdateTraceParameters'):
-    return Trace(p.fromObject(),p.fromName(),p.fromId(),p.toObject(),p.toName(),p.toId())
   if (p.__class__.__name__ == 'EnvironmentParameters'):
     return Environment(objtId,p.name(),p.shortCode(),p.description(),p.environments(),p.duplicateProperty(),p.overridingEnvironment(),p.tensions())
   if (p.__class__.__name__ == 'RoleParameters'):

cairis/gui/TraceDialog.py

@@ -18,8 +18,6 @@
 import wx
 from cairis.core.armid import *
 import WidgetFactory
-import cairis.core.TraceParameters
-import cairis.core.UpdateTraceParameters
 import TracePanel
 
 __author__ = 'Shamal Faily'
@@ -65,12 +63,3 @@ def onCommit(self,evt):
     self.theFromName = self.panel.theFromName
     self.theToName = self.panel.theToName
     self.EndModal(TRACE_BUTTONCOMMIT_ID)
-
-  def parameters(self):
-    parameters = 0
-    if (self.theOriginalFromObject == -1):
-      parameters = TraceParameters.TraceParameters(self.theFromObject,self.theFromId,self.theToObject,self.theToId,self.theFromName,self.theToName)
-    else:
-      parameters = UpdateTraceParameters.UpdateTraceParameters(self.theFromObject,self.theFromId,self.theToObject,self.theToId,self.theFromName,self.theToName,self.theOriginalFromId,self.theOriginalToId)
-    parameters.setId(-1)
-    return parameters

cairis/test/test_Trace.py

@@ -32,7 +32,23 @@ def setUp(self):
 
   def testTraces(self):
     b = Borg()  
-    b.dbProxy.removableTraces('Psychosis')
-
-
 
+    fromDims = b.dbProxy.getTraceDimensions('requirement',1)
+    self.assertEqual(len(fromDims),6)
+    toDims = b.dbProxy.getTraceDimensions('requirement',0)
+    self.assertEqual(len(toDims),5)
+
+    reqId = b.dbProxy.getDimensionId('AC-1','requirement')
+    vulId = b.dbProxy.getDimensionId('Certificate ubiquity','vulnerability')
+    b.dbProxy.addTrace('requirement_vulnerability',reqId,vulId)
+
+    traces = b.dbProxy.removableTraces('Psychosis')
+    self.assertEqual(len(traces),8)
+    self.assertEqual(traces[7][0],'requirement')
+    self.assertEqual(traces[7][1],'AC-1')
+    self.assertEqual(traces[7][2],'vulnerability')
+    self.assertEqual(traces[7][3],'Certificate ubiquity')
+
+    b.dbProxy.deleteTrace('requirement','AC-1','vulnerability','Certificate ubiquity')
+    traces = b.dbProxy.removableTraces('Psychosis')
+    self.assertEqual(len(traces),7)