bug[ats_ZYKT8]: Fix SQLite import not finding file

Change-Id: I392974fe77f735c09aa016b2be0fc0f2fb4b16c1

2 files changed, 20 insertions, 14 deletions

diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/datastore/SqliteDbInfo.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/datastore/SqliteDbInfo.java
index 8a3bf9b5c1d..fbc81a7742d 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/datastore/SqliteDbInfo.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/datastore/SqliteDbInfo.java
@@ -37,7 +37,7 @@ public class SqliteDbInfo implements IDatabaseInfo {
 
    @Override
    public String getDatabaseName() {
-      return "sqlite.db";
+      return "cover.db";
    }
 
    @Override
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/operations/VCastAdaCoverage_V6_0_ImportOperation.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/operations/VCastAdaCoverage_V6_0_ImportOperation.java
index 1aa78c3dc11..3add71f7333 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/operations/VCastAdaCoverage_V6_0_ImportOperation.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/internal/vcast/operations/VCastAdaCoverage_V6_0_ImportOperation.java
@@ -69,23 +69,29 @@ public class VCastAdaCoverage_V6_0_ImportOperation extends AbstractOperation {
 
    @Override
    protected void doWork(IProgressMonitor monitor) throws Exception {
-      VCastDataStore dataStore = VCastDataStoreFactory.createDataStore(input.getVCastDbPath());
+      File file = new File(input.getVCastDirectory() + input.getVCastDbPath());
 
-      Map<String, CoverageUnit> fileNumToCoverageUnit = new HashMap<String, CoverageUnit>();
-      coverageImport.setCoverageUnitFileContentsProvider(new SimpleCoverageUnitFileContentsProvider());
+      if (file.exists() && file.canRead()) {
+         VCastDataStore dataStore = VCastDataStoreFactory.createDataStore(file.getAbsolutePath());
 
-      Collection<VCastInstrumentedFile> instrumentedFiles = getInstrumentedFiles(dataStore);
-      for (VCastInstrumentedFile instrumentedFile : instrumentedFiles) {
-         checkForCancelledStatus(monitor);
-         processInstrumented(monitor, dataStore, fileNumToCoverageUnit, instrumentedFile);
-      }
+         Map<String, CoverageUnit> fileNumToCoverageUnit = new HashMap<String, CoverageUnit>();
+         coverageImport.setCoverageUnitFileContentsProvider(new SimpleCoverageUnitFileContentsProvider());
 
-      Collection<VCastResult> results = getResultFiles(dataStore);
-      for (VCastResult result : results) {
-         checkForCancelledStatus(monitor);
-         processResult(monitor, fileNumToCoverageUnit, result);
+         Collection<VCastInstrumentedFile> instrumentedFiles = getInstrumentedFiles(dataStore);
+         for (VCastInstrumentedFile instrumentedFile : instrumentedFiles) {
+            checkForCancelledStatus(monitor);
+            processInstrumented(monitor, dataStore, fileNumToCoverageUnit, instrumentedFile);
+         }
+
+         Collection<VCastResult> results = getResultFiles(dataStore);
+         for (VCastResult result : results) {
+            checkForCancelledStatus(monitor);
+            processResult(monitor, fileNumToCoverageUnit, result);
+         }
+         monitor.worked(1);
+      } else {
+         throw new OseeCoreException("The db file [%s] does not exist or is not readable", file.getAbsolutePath());
       }
-      monitor.worked(1);
    }
 
    private void processInstrumented(IProgressMonitor monitor, VCastDataStore dataStore, Map<String, CoverageUnit> fileNumToCoverageUnit, VCastInstrumentedFile instrumentedFile) throws Exception {