feature[ats_MZ2Q9]: Implement VectorCast 6.0 import code

Change-Id: Ifbca869812baafd5a64e63e7ca815f21f4e67a68

10 files changed, 780 insertions, 121 deletions

diff --git a/plugins/org.eclipse.osee.coverage.test/Coverage_Integration_TestSuite.launch b/plugins/org.eclipse.osee.coverage.test/Coverage_Integration_TestSuite.launch
new file mode 100644
index 00000000000..8ba921eb935
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage.test/Coverage_Integration_TestSuite.launch
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
+<setAttribute key="additional_plugins">
+<setEntry value="org.eclipse.core.runtime.compatibility:3.2.200.v20120521-2346:default:true"/>
+<setEntry value="org.eclipse.osee.ats.client.integration.tests:0.11.0.qualifier:default:false"/>
+<setEntry value="org.eclipse.osee.client.integration.tests:0.11.0.qualifier:default:false"/>
+<setEntry value="org.eclipse.osee.client.test.framework:0.11.0.qualifier:default:false"/>
+<setEntry value="org.eclipse.osee.coverage.demo:0.11.0.qualifier:default:true"/>
+</setAttribute>
+<booleanAttribute key="append.args" value="true"/>
+<booleanAttribute key="askclear" value="false"/>
+<booleanAttribute key="automaticAdd" value="false"/>
+<booleanAttribute key="automaticValidate" value="true"/>
+<stringAttribute key="bootstrap" value=""/>
+<stringAttribute key="checked" value="[NONE]"/>
+<booleanAttribute key="clearConfig" value="true"/>
+<booleanAttribute key="clearws" value="true"/>
+<booleanAttribute key="clearwslog" value="false"/>
+<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
+<booleanAttribute key="default" value="false"/>
+<stringAttribute key="featureDefaultLocation" value="workspace"/>
+<stringAttribute key="featurePluginResolution" value="workspace"/>
+<booleanAttribute key="includeOptional" value="false"/>
+<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-atsTest"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/AllCoverageTestSuite.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.coverage.AllCoverageTestSuite"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.coverage.test"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M&#13;&#10;-XX:MaxPermSize=256m&#13;&#10;-Dosee.log.default=WARNING&#13;&#10;-Dequinox.ds.debug=true &#13;&#10;-Dosee.application.server=http://localhost:8089&#13;&#10;-DeventDebug=log&#13;&#10;-DeventSystem=new&#13;&#10;-Dosee.is.in.db.init=true"/>
+<stringAttribute key="pde.version" value="3.3"/>
+<stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/>
+<booleanAttribute key="run_in_ui_thread" value="true"/>
+<setAttribute key="selected_features">
+<setEntry value="org.eclipse.osee.ats.client.demo.feature:default"/>
+<setEntry value="org.eclipse.osee.ats.feature:default"/>
+<setEntry value="org.eclipse.osee.client.demo.feature:default"/>
+<setEntry value="org.eclipse.osee.client.feature:default"/>
+<setEntry value="org.eclipse.osee.core.feature:default"/>
+<setEntry value="org.eclipse.osee.core.plugin.feature:default"/>
+<setEntry value="org.eclipse.osee.core.runtime.feature:default"/>
+<setEntry value="org.eclipse.osee.core.ui.feature:default"/>
+<setEntry value="org.eclipse.osee.coverage.feature:default"/>
+<setEntry value="org.eclipse.osee.define.feature:default"/>
+<setEntry value="org.eclipse.osee.external.feature:default"/>
+<setEntry value="org.eclipse.osee.framework.feature:default"/>
+<setEntry value="org.eclipse.osee.framework.ui.feature:default"/>
+<setEntry value="org.eclipse.sdk:default"/>
+</setAttribute>
+<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.collect@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.lowagie.text@default:default,com.ning.async-http-client@default:default,de.itemis.xtext.antlr@default:default,javax.activation@default:default,javax.mail.glassfish@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.generator@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec@default:default,org.apache.commons.el@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.net@default:default,org.apache.jasper@default:default,org.apache.log4j@default:default,org.apache.lucene*1.9.1.v201101211617@default:default,org.apache.lucene*2.9.1.v201101211721@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.oro@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.birt.core@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.update.core.win32@default:false,org.eclipse.update.core@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.junit4@default:default,org.mozilla.javascript@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/>
+<stringAttribute key="selected_workspace_plugins" value="jms.libraries@default:default,net.jini@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.client.demo@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.access.provider@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl.ui.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.support.test.util@default:default,org.mockito@default:default,org.objenesis@default:default"/>
+<booleanAttribute key="show_selected_only" value="true"/>
+<stringAttribute key="timestamp" value="1357689116311"/>
+<booleanAttribute key="tracing" value="false"/>
+<booleanAttribute key="useCustomFeatures" value="true"/>
+<booleanAttribute key="useDefaultConfig" value="true"/>
+<booleanAttribute key="useDefaultConfigArea" value="false"/>
+<booleanAttribute key="useProduct" value="true"/>
+</launchConfiguration>
diff --git a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF
index de337153002..fec36c1aba2 100644
--- a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Bundle-Vendor: Eclipse Open System Engineering Environment
 Fragment-Host: org.eclipse.osee.coverage
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit
-Import-Package: org.eclipse.osee.support.test.util
+Import-Package: org.eclipse.osee.framework.database.init,
+ org.eclipse.osee.support.test.util
 Export-Package: org.eclipse.osee.coverage,
  org.eclipse.osee.coverage.import01,
  org.eclipse.osee.coverage.import02,
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/AllCoverageTestSuite.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/AllCoverageTestSuite.java
new file mode 100644
index 00000000000..5db451130a9
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/AllCoverageTestSuite.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage;
+
+import org.eclipse.osee.coverage.model.CoverageItemTest;
+import org.eclipse.osee.coverage.model.CoverageOptionManagerTest;
+import org.eclipse.osee.coverage.model.CoverageUnitTest;
+import org.eclipse.osee.coverage.model.SimpleTestUnitProviderTest;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+
+/**
+ * @author Roberto E. Escobar
+ */
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+   SimpleTestUnitProviderTest.class,
+   CoverageItemTest.class,
+   CoverageUnitTest.class,
+   MatchTypeTest.class,
+   CoverageOptionManagerTest.class,
+   DbInitTest.class,
+   Coverage_Db_Suite.class})
+public class AllCoverageTestSuite {
+   // do nothing
+}
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java
index f1012bb0c7f..b4acd83feb4 100644
--- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/Coverage_Db_Suite.java
@@ -11,12 +11,15 @@
 package org.eclipse.osee.coverage;
 
 import static org.junit.Assert.assertTrue;
+import org.eclipse.osee.coverage.internal.vcast.datastore.VCastDataStoreTest;
 import org.eclipse.osee.coverage.model.CoverageItemPersistTest;
 import org.eclipse.osee.coverage.model.CoverageOptionManagerStoreTest;
 import org.eclipse.osee.coverage.model.CoveragePreferencesTest;
 import org.eclipse.osee.coverage.model.CoverageUnitPersistTest;
 import org.eclipse.osee.coverage.test.store.ArtifactTestUnitStoreTest;
 import org.eclipse.osee.coverage.test.store.TestUnitCacheTest;
+import org.eclipse.osee.coverage.vcast.VCastAdaCoverage_V5_3_ImportOperationTest;
+import org.eclipse.osee.coverage.vcast.VCastAdaCoverage_V6_0_ImportOperationTest;
 import org.eclipse.osee.framework.core.client.ClientSessionManager;
 import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
 import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
@@ -33,12 +36,13 @@ import org.junit.runners.Suite;
    CoverageOptionManagerStoreTest.class,
    TestUnitCacheTest.class,
    ArtifactTestUnitStoreTest.class,
-   Coverage_Suite.class,
    CoverageParametersTest.class,
    CoverageItemPersistTest.class,
    CoverageUnitPersistTest.class,
    CoveragePackageImportTest.class,
-   VectorCastImportTest.class})
+   VCastDataStoreTest.class,
+   VCastAdaCoverage_V5_3_ImportOperationTest.class,
+   VCastAdaCoverage_V6_0_ImportOperationTest.class})
 /**
  * @author Donald G. Dunne
  */
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/DbInitTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/DbInitTest.java
new file mode 100644
index 00000000000..a80db683942
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/DbInitTest.java
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage;
+
+import static org.junit.Assert.assertTrue;
+import java.util.List;
+import java.util.logging.Level;
+import org.eclipse.osee.framework.core.client.ClientSessionManager;
+import org.eclipse.osee.framework.core.exception.OseeStateException;
+import org.eclipse.osee.framework.database.init.DatabaseInitOpFactory;
+import org.eclipse.osee.framework.jdk.core.util.OseeProperties;
+import org.eclipse.osee.framework.logging.OseeLog;
+import org.eclipse.osee.framework.logging.SevereLoggingMonitor;
+import org.eclipse.osee.framework.skynet.core.UserManager;
+import org.eclipse.osee.framework.ui.skynet.render.RenderingUtil;
+import org.eclipse.osee.support.test.util.TestUtil;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+
+/**
+ * @author Donald G. Dunne
+ */
+public class DbInitTest {
+   private static boolean wasDbInitSuccessful = false;
+
+   @BeforeClass
+   public static void setup() throws Exception {
+      OseeProperties.setIsInTest(true);
+      assertTrue("Demo Application Server must be running",
+         ClientSessionManager.getAuthenticationProtocols().contains("demo"));
+      RenderingUtil.setPopupsAllowed(false);
+   }
+
+   @org.junit.Test
+   public void testDbInit() throws Exception {
+      System.out.println("\nBegin database initialization...");
+
+      List<String> protocols = ClientSessionManager.getAuthenticationProtocols();
+      Assert.assertTrue("Application Server must be running." + protocols, protocols.contains("demo"));
+
+      OseeLog.log(DbInitTest.class, Level.INFO, "Begin Database Initialization...");
+
+      SevereLoggingMonitor monitorLog = TestUtil.severeLoggingStart();
+      OseeLog.registerLoggerListener(monitorLog);
+
+      DatabaseInitOpFactory.executeWithoutPrompting("OSEE_COVERAGE_DEMO");
+
+      TestUtil.severeLoggingEnd(monitorLog);
+      OseeLog.log(DbInitTest.class, Level.INFO, "Completed database initialization");
+      wasDbInitSuccessful = true;
+
+      if (wasDbInitSuccessful) {
+         TestUtil.setDbInitSuccessful(true);
+
+         // Re-authenticate so we can continue and NOT be bootstrap
+         ClientSessionManager.releaseSession();
+         ClientSessionManager.getSession();
+         UserManager.releaseUser();
+
+         if (UserManager.getUser().getUserId().equals("bootstrap")) {
+            throw new OseeStateException("Should not be bootstrap user here");
+         }
+      }
+
+      System.out.println("End database initialization...\n");
+   }
+}
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/internal/vcast/datastore/VCastDataStoreTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/internal/vcast/datastore/VCastDataStoreTest.java
new file mode 100644
index 00000000000..9242751a7b1
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/internal/vcast/datastore/VCastDataStoreTest.java
@@ -0,0 +1,340 @@
+/*******************************************************************************
+ * Copyright (c) 2012 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage.internal.vcast.datastore;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Collection;
+import org.eclipse.osee.coverage.internal.vcast.VCastDataStore;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastBranchCoverage;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastBranchData;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastCoverageType;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastFunction;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastInstrumentedFile;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastMcdcCoverage;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastMcdcCoverageCondition;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastMcdcCoveragePair;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastMcdcCoveragePairRow;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastMcdcData;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastMcdcDataCondition;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastProject;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastProjectFile;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastResult;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastSetting;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastSourceFile;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastStatementCoverage;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastStatementData;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastVersion;
+import org.eclipse.osee.coverage.internal.vcast.model.VCastWritable;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+
+/**
+ * @author Shawn F. Cook
+ */
+public class VCastDataStoreTest {
+   private static String sqliteUtilTestDbFileName = "vCastSqliteUtilityTest.db";
+   private static VCastDataStore dataStore = null;
+
+   @org.junit.Rule
+   public TemporaryFolder tempFolder = new TemporaryFolder();
+
+   @Before
+   public void setUp() throws Exception {
+      File outfile = tempFolder.newFile(sqliteUtilTestDbFileName);
+
+      copyResource("vCastSqliteUtilityTest.db", outfile);
+
+      dataStore = VCastDataStoreFactory.createDataStore(outfile.getAbsolutePath());
+   }
+
+   private static void copyResource(String resource, File output) throws IOException {
+      OutputStream outputStream = null;
+      InputStream inputStream = null;
+      try {
+         outputStream = new BufferedOutputStream(new FileOutputStream(output));
+         inputStream = new BufferedInputStream(VCastDataStoreTest.class.getResourceAsStream(resource));
+         Lib.inputStreamToOutputStream(inputStream, outputStream);
+      } finally {
+         Lib.close(inputStream);
+         Lib.close(outputStream);
+      }
+   }
+
+   @Test
+   public void testGetAllBranchCoverages() throws Exception {
+      Collection<VCastBranchCoverage> data = dataStore.getAllBranchCoverages();
+      int i = 1;
+      for (VCastBranchCoverage dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getFunctionId());
+         Assert.assertEquals(i, dataItem.getLine());
+         Assert.assertEquals(i, dataItem.getNumConditions());
+         Assert.assertEquals(i, dataItem.getTrueCount());
+         Assert.assertEquals(i, dataItem.getFalseCount());
+         Assert.assertEquals(i, dataItem.getMaxTrueCount());
+         Assert.assertEquals(i, dataItem.getMaxFalseCount());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllBranchData() throws Exception {
+      Collection<VCastBranchData> data = dataStore.getAllBranchData();
+      int i = 1;
+      for (VCastBranchData dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getBranchId());
+         Assert.assertEquals(i, dataItem.getResultId());
+         Assert.assertEquals(i, dataItem.getResultLine());
+         Assert.assertTrue(dataItem.getTaken().booleanValue());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllFunctions() throws Exception {
+      Collection<VCastFunction> data = dataStore.getAllFunctions();
+      int i = 1;
+      for (VCastFunction dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getInstrumentedFileId());
+         Assert.assertEquals(i, dataItem.getFindex());
+         Assert.assertTrue(dataItem.getName().equalsIgnoreCase("name" + i));
+         Assert.assertTrue(dataItem.getCanonicalName().equalsIgnoreCase("canonical_name" + i));
+         Assert.assertEquals(i, dataItem.getTotalLines());
+         Assert.assertEquals(i, dataItem.getComplexity());
+         Assert.assertEquals(i, dataItem.getNumPairsOrPaths());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllInstrumentedFiles() throws Exception {
+      Collection<VCastInstrumentedFile> data = dataStore.getAllInstrumentedFiles();
+      int i = 1;
+      for (VCastInstrumentedFile dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getSourceFileId());
+         Assert.assertEquals(i, dataItem.getProjectId());
+         Assert.assertEquals(i, dataItem.getUnitIndex());
+         Assert.assertEquals(VCastCoverageType.STATEMENT, dataItem.getCoverageType());
+         Assert.assertTrue(dataItem.getLISFile().equalsIgnoreCase("LIS_file" + i));
+         Assert.assertEquals(i, dataItem.getChecksum());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllMcdcCoverages() throws Exception {
+      Collection<VCastMcdcCoverage> data = dataStore.getAllMcdcCoverages();
+      int i = 1;
+      for (VCastMcdcCoverage dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getFunctionId());
+         Assert.assertEquals(i, dataItem.getLine());
+         Assert.assertEquals(i, dataItem.getSourceLine());
+         Assert.assertEquals(i, dataItem.getNumConditions());
+         Assert.assertTrue(dataItem.getActualExpr().equalsIgnoreCase("actual_expr" + i));
+         Assert.assertTrue(dataItem.getSimplifiedExpr().equalsIgnoreCase("simplified_expr" + i));
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllMcdcCoverageConditions() throws Exception {
+      Collection<VCastMcdcCoverageCondition> data = dataStore.getAllMcdcCoverageConditions();
+      int i = 1;
+      for (VCastMcdcCoverageCondition dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getMcdcId());
+         Assert.assertEquals(i, dataItem.getCondIndex());
+         Assert.assertEquals(i, dataItem.getTrueCount());
+         Assert.assertEquals(i, dataItem.getFalseCount());
+         Assert.assertEquals(i, dataItem.getMaxTrueCount());
+         Assert.assertEquals(i, dataItem.getMaxFalseCount());
+         Assert.assertTrue(dataItem.getCondVariable().equalsIgnoreCase("cond_variable" + i));
+         Assert.assertTrue(dataItem.getCondExpr().equalsIgnoreCase("cond_expr" + i));
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllMcdcCoveragePairRows() throws Exception {
+      Collection<VCastMcdcCoveragePairRow> data = dataStore.getAllMcdcCoveragePairRows();
+      int i = 1;
+      for (VCastMcdcCoveragePairRow dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getMcdcId());
+         Assert.assertEquals(i, dataItem.getRowValue());
+         Assert.assertEquals(i, dataItem.getRowResult());
+         Assert.assertEquals(i, dataItem.getHitCount());
+         Assert.assertEquals(i, dataItem.getMaxHitCount());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllMcdcCoveragePairs() throws Exception {
+      Collection<VCastMcdcCoveragePair> data = dataStore.getAllMcdcCoveragePairs();
+      int i = 1;
+      for (VCastMcdcCoveragePair dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getMcdcCondId());
+         Assert.assertEquals(i, dataItem.getPairRow1());
+         Assert.assertEquals(i, dataItem.getPairRow2());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllMcdcData() throws Exception {
+      Collection<VCastMcdcData> data = dataStore.getAllMcdcData();
+      int i = 1;
+      for (VCastMcdcData dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getMcdcId());
+         Assert.assertEquals(i, dataItem.getResultId());
+         Assert.assertEquals(i, dataItem.getPairValue());
+         Assert.assertEquals(i, dataItem.getUsedValue());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllMcdcDataConditions() throws Exception {
+      Collection<VCastMcdcDataCondition> data = dataStore.getAllMcdcDataConditions();
+      int i = 1;
+      for (VCastMcdcDataCondition dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getMcdcDataId());
+         Assert.assertEquals(i, dataItem.getCondIndex());
+         Assert.assertTrue(dataItem.getCondValue());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllProjectFiles() throws Exception {
+      Collection<VCastProjectFile> data = dataStore.getAllProjectFiles();
+      int i = 1;
+      for (VCastProjectFile dataItem : data) {
+         Assert.assertEquals(i, dataItem.getProjectId());
+         Assert.assertEquals(i, dataItem.getSourceFileId());
+         Assert.assertEquals(i, dataItem.getInstrumentedFileId());
+         Assert.assertEquals(i, dataItem.getTimestamp());
+         Assert.assertTrue(dataItem.getBuildMd5Sum().equalsIgnoreCase("build_md5sum" + i));
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllProjects() throws Exception {
+      Collection<VCastProject> data = dataStore.getAllProjects();
+      int i = 1;
+      for (VCastProject dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertTrue(dataItem.getName().equalsIgnoreCase("name" + i));
+         Assert.assertTrue(dataItem.getPath().equalsIgnoreCase("path" + i));
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllResults() throws Exception {
+      Collection<VCastResult> data = dataStore.getAllResults();
+      int i = 1;
+      for (VCastResult dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertTrue(dataItem.getName().equalsIgnoreCase("name" + i));
+         Assert.assertEquals(i, dataItem.getProjectId());
+         Assert.assertTrue(dataItem.getPath().equalsIgnoreCase("path" + i));
+         Assert.assertTrue(dataItem.getFullname().equalsIgnoreCase("fullname" + i));
+         Assert.assertTrue(dataItem.isEnabled());
+         Assert.assertTrue(dataItem.isImported());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllSettings() throws Exception {
+      Collection<VCastSetting> data = dataStore.getAllSettings();
+      int i = 1;
+      for (VCastSetting dataItem : data) {
+         Assert.assertTrue(dataItem.getSetting().equalsIgnoreCase("setting" + i));
+         Assert.assertTrue(dataItem.getValue().equalsIgnoreCase("value" + i));
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllSourceFiles() throws Exception {
+      Collection<VCastSourceFile> data = dataStore.getAllSourceFiles();
+      int i = 1;
+      for (VCastSourceFile dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertTrue(dataItem.getPath().equalsIgnoreCase("path" + i));
+         Assert.assertTrue(dataItem.getDisplayName().equalsIgnoreCase("display_name" + i));
+         Assert.assertEquals(i, dataItem.getChecksum());
+         Assert.assertTrue(dataItem.getDisplayPath().equalsIgnoreCase("display_path" + i));
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllStatementCoverages() throws Exception {
+      Collection<VCastStatementCoverage> data = dataStore.getAllStatementCoverages();
+      int i = 1;
+      for (VCastStatementCoverage dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getFunctionId());
+         Assert.assertEquals(i, dataItem.getLine());
+         Assert.assertEquals(i, dataItem.getHitCount());
+         Assert.assertEquals(i, dataItem.getMaxHitCount());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetAllStatementData() throws Exception {
+      Collection<VCastStatementData> data = dataStore.getAllStatementData();
+      int i = 1;
+      for (VCastStatementData dataItem : data) {
+         Assert.assertEquals(i, dataItem.getId());
+         Assert.assertEquals(i, dataItem.getStatementId());
+         Assert.assertEquals(i, dataItem.getResultId());
+         Assert.assertEquals(i, dataItem.getResultLine());
+         Assert.assertTrue(dataItem.getHit());
+         i++;
+      }
+   }
+
+   @Test
+   public void testGetVersion() throws Exception {
+      VCastVersion version = dataStore.getVersion();
+      Assert.assertEquals(1, version.getVersion());
+      Assert.assertTrue(version.getDateCreated().equalsIgnoreCase("date_created1"));
+   }
+
+   @Test
+   public void testGetWritable() throws Exception {
+      VCastWritable writable = dataStore.getWritable();
+      Assert.assertEquals(1, writable.getIsWritable());
+   }
+}
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/internal/vcast/datastore/vCastSqliteUtilityTest.db b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/internal/vcast/datastore/vCastSqliteUtilityTest.db
new file mode 100644
index 00000000000..be39521257f
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/internal/vcast/datastore/vCastSqliteUtilityTest.db
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/VCastAdaCoverage_V5_3_ImportOperationTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/VCastAdaCoverage_V5_3_ImportOperationTest.java
new file mode 100644
index 00000000000..6c4835ec29b
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/VCastAdaCoverage_V5_3_ImportOperationTest.java
@@ -0,0 +1,193 @@
+/*******************************************************************************
+ * Copyright (c) 2010 Boeing.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Boeing - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.osee.coverage.vcast;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
+import org.eclipse.osee.coverage.event.CoverageEventType;
+import org.eclipse.osee.coverage.event.CoveragePackageEvent;
+import org.eclipse.osee.coverage.internal.vcast.operations.VCastAdaCoverage_V5_3_ImportOperation;
+import org.eclipse.osee.coverage.model.CoverageImport;
+import org.eclipse.osee.coverage.model.CoverageOptionManager;
+import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault;
+import org.eclipse.osee.coverage.model.CoveragePackage;
+import org.eclipse.osee.coverage.model.SimpleWorkProductTaskProvider;
+import org.eclipse.osee.coverage.store.OseeCoveragePackageStore;
+import org.eclipse.osee.coverage.util.CoverageTestUtil;
+import org.eclipse.osee.coverage.util.CoverageUtil;
+import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.IOperation;
+import org.eclipse.osee.framework.core.operation.Operations;
+import org.eclipse.osee.framework.core.util.Result;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
+import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
+import org.eclipse.osee.framework.skynet.core.rule.OseeHousekeepingRule;
+import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
+import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.junit.rules.TestName;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Test Case for {@link VCastAdaCoverage_V5_3_ImportOperation}
+ * 
+ * @author Donald G. Dunne
+ */
+public class VCastAdaCoverage_V5_3_ImportOperationTest {
+
+   @Rule
+   public TemporaryFolder tempFolder = new TemporaryFolder();
+
+   @Rule
+   public TestName testName = new TestName();
+   @Rule
+   public OseeHousekeepingRule houseKeepingRule = new OseeHousekeepingRule();
+
+   @BeforeClass
+   public static void setUp() throws OseeCoreException {
+      CoverageUtil.setIsInTest(true);
+      testCleanup();
+   }
+
+   @AfterClass
+   public static void cleanUp() throws OseeCoreException {
+      try {
+         testCleanup();
+      } finally {
+         CoverageUtil.setIsInTest(false);
+      }
+   }
+
+   private static void testCleanup() throws OseeCoreException {
+      CoverageUtil.setNavigatorSelectedBranch(CoverageTestUtil.getTestBranch());
+      CoverageTestUtil.cleanupCoverageTests();
+   }
+
+   private void createVCastFileset() throws IOException {
+      Bundle bundle = FrameworkUtil.getBundle(this.getClass());
+
+      //@formatter:off
+      File rootFolder = tempFolder.getRoot();
+      copyResource(getURL(bundle, "vcast.vcp"), rootFolder, "vcast.vcp");
+      copyResource(getURL(bundle, "CCAST_.CFG"), rootFolder, "CCAST_.CFG");
+
+      File vcastFolder = tempFolder.newFolder("vcast");
+      copyResource(getURL(bundle, "vcast_aggregate_coverage_report.html"), vcastFolder, "vcast_aggregate_coverage_report.html");
+      copyResource(getURL(bundle, "vcast/build_info.xml"), vcastFolder, "build_info.xml");
+      copyResource(getURL(bundle, "vcast/test_main.2.LIS"), vcastFolder, "test_main.2.LIS");
+      copyResource(getURL(bundle, "vcast/test_main.2.xml"), vcastFolder, "test_main.2.xml");
+      copyResource(getURL(bundle, "vcast/test_scheduler.2.LIS"), vcastFolder, "test_scheduler.2.LIS");
+      copyResource(getURL(bundle, "vcast/test_scheduler.2.xml"), vcastFolder, "test_scheduler.2.xml");
+
+      File resultsFolder = tempFolder.newFolder("vcast/results");
+      copyResource(getURL(bundle, "vcast/results/test_unit_1.dat"), resultsFolder, "test_unit_1.dat");
+      copyResource(getURL(bundle, "vcast/results/test_unit_2.dat"), resultsFolder, "test_unit_2.dat");
+      copyResource(getURL(bundle, "vcast/results/test_unit_3.dat"), resultsFolder, "test_unit_3.dat");
+      //@formatter:on
+   }
+
+   private URL getURL(Bundle bundle, String resource) {
+      String fullPath = String.format("support/vcastData/%s", resource);
+      return bundle.getEntry(fullPath);
+   }
+
+   private static void copyResource(URL source, File folder, String destinationName) throws IOException {
+      OutputStream outputStream = null;
+      InputStream inputStream = null;
+      try {
+         inputStream = new BufferedInputStream(source.openStream());
+
+         File destination = new File(folder, destinationName);
+         outputStream = new BufferedOutputStream(new FileOutputStream(destination));
+         Lib.inputStreamToOutputStream(inputStream, outputStream);
+      } finally {
+         Lib.close(inputStream);
+         Lib.close(outputStream);
+      }
+   }
+
+   @Test
+   public void testAdaVCast53ImportOp() throws Exception {
+      createVCastFileset();
+
+      String coverageInputDir = tempFolder.getRoot().getAbsolutePath();
+      CoverageImportData params = new CoverageImportData(coverageInputDir, false) {
+
+         @Override
+         public String getFileNamespace(String filename) {
+            return "test";
+         }
+      };
+      CoverageImport coverageImport = new CoverageImport("VectorCast Import");
+
+      IOperation operation = CoverageImportFactory.createAdaVCast53ImportOp(params, coverageImport);
+      Operations.executeWorkAndCheckStatus(operation);
+
+      Assert.assertFalse(coverageImport.getLog().isErrors());
+
+      CoverageOptionManager optionManager = CoverageOptionManagerDefault.instance();
+      CoveragePackage coveragePackage =
+         new CoveragePackage("Test Coverage Package", optionManager, new SimpleWorkProductTaskProvider());
+
+      OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, CoverageTestUtil.getTestBranch());
+      SkynetTransaction transaction =
+         TransactionManager.createTransaction(CoverageTestUtil.getTestBranch(),
+            String.format("%s: %s.%s", getClass().getSimpleName(), "Coverage Package Save ", testName.getMethodName()));
+      CoveragePackageEvent coverageEvent = new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified);
+      store.save(transaction, coverageEvent, coveragePackage.getCoverageOptionManager());
+      store.getArtifact(false).persist(transaction);
+
+      // Test Load of Coverage Package
+      Artifact artifact = ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageTestUtil.getTestBranch());
+      CoverageTestUtil.registerAsTestArtifact(artifact);
+      artifact.persist(transaction);
+
+      OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact);
+      Assert.assertNotNull(packageStore.getArtifact(false));
+      packageStore.getArtifact(false).persist(transaction);
+      transaction.execute();
+
+      store = OseeCoveragePackageStore.get(coveragePackage, CoverageTestUtil.getTestBranch());
+      String txComment =
+         String.format("Save Import Record: %s.%s", getClass().getSimpleName(), testName.getMethodName());
+      transaction = TransactionManager.createTransaction(CoverageTestUtil.getTestBranch(), txComment);
+      Result result = store.saveImportRecord(transaction, coverageImport);
+      Assert.assertTrue(result.isTrue());
+      transaction.execute();
+
+      Artifact packageArt =
+         ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageTestUtil.getTestBranch());
+      Artifact foundRecordArt = null;
+      for (Artifact art : packageArt.getChildren()) {
+         if (art.getName().equals(OseeCoveragePackageStore.IMPORT_RECORD_NAME)) {
+            foundRecordArt = art;
+            CoverageTestUtil.registerAsTestArtifact(foundRecordArt);
+            foundRecordArt.persist(getClass().getSimpleName());
+         }
+      }
+      Assert.assertNotNull(foundRecordArt);
+      Assert.assertEquals("General Document", foundRecordArt.getArtifactTypeName());
+   }
+
+}
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/VectorCastImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/VCastAdaCoverage_V6_0_ImportOperationTest.java
index 9260fed69ca..3f9ddec1665 100644
--- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/VectorCastImportTest.java
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/VCastAdaCoverage_V6_0_ImportOperationTest.java
@@ -8,14 +8,20 @@
  * Contributors:
  *     Boeing - initial API and implementation
  *******************************************************************************/
-package org.eclipse.osee.coverage;
+package org.eclipse.osee.coverage.vcast;
 
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URL;
 import java.util.Collection;
 import org.eclipse.osee.coverage.event.CoverageEventType;
 import org.eclipse.osee.coverage.event.CoveragePackageEvent;
-import org.eclipse.osee.coverage.internal.Activator;
+import org.eclipse.osee.coverage.internal.vcast.operations.VCastAdaCoverage_V6_0_ImportOperation;
 import org.eclipse.osee.coverage.merge.IMergeItem;
 import org.eclipse.osee.coverage.merge.MergeImportManager;
 import org.eclipse.osee.coverage.merge.MergeManager;
@@ -32,15 +38,14 @@ import org.eclipse.osee.coverage.store.OseeCoverageStore;
 import org.eclipse.osee.coverage.util.CoverageTestUtil;
 import org.eclipse.osee.coverage.util.CoverageUtil;
 import org.eclipse.osee.coverage.util.ISaveable;
-import org.eclipse.osee.coverage.vcast.IVectorCastCoverageImportProvider;
-import org.eclipse.osee.coverage.vcast.VectorCastAdaCoverageImporter;
 import org.eclipse.osee.framework.core.data.IOseeBranch;
 import org.eclipse.osee.framework.core.exception.OseeCoreException;
+import org.eclipse.osee.framework.core.operation.IOperation;
+import org.eclipse.osee.framework.core.operation.Operations;
 import org.eclipse.osee.framework.core.util.Result;
 import org.eclipse.osee.framework.core.util.XResultData;
+import org.eclipse.osee.framework.jdk.core.util.Lib;
 import org.eclipse.osee.framework.jdk.core.util.Strings;
-import org.eclipse.osee.framework.plugin.core.PluginUtil;
-import org.eclipse.osee.framework.plugin.core.util.OseeData;
 import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
 import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
 import org.eclipse.osee.framework.skynet.core.rule.OseeHousekeepingRule;
@@ -51,12 +56,20 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Rule;
 import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
 import org.junit.rules.TestName;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
 
 /**
+ * Test Case for {@link VCastAdaCoverage_V6_0_ImportOperation}
+ * 
  * @author Donald G. Dunne
  */
-public class VectorCastImportTest {
+public class VCastAdaCoverage_V6_0_ImportOperationTest {
+
+   @org.junit.Rule
+   public TemporaryFolder tempFolder = new TemporaryFolder();
 
    @Rule
    public TestName testName = new TestName();
@@ -68,11 +81,8 @@ public class VectorCastImportTest {
    private static boolean testWithDb = true;
 
    @BeforeClass
-   public static void setUp() throws OseeCoreException, IOException, InterruptedException {
+   public static void setUp() throws OseeCoreException {
       CoverageUtil.setIsInTest(true);
-      createVCastFileset();
-      // give time for copied files to be closed and recognized by filesystem
-      Thread.sleep(2000);
       testCleanup();
    }
 
@@ -91,32 +101,44 @@ public class VectorCastImportTest {
       }
    }
 
+   private URL getURL(Bundle bundle, String resource) {
+      String fullPath = String.format("support/vcastData/%s", resource);
+      return bundle.getEntry(fullPath);
+   }
+
+   private static void copyResource(URL source, File destination) throws IOException {
+      OutputStream outputStream = null;
+      InputStream inputStream = null;
+      try {
+         inputStream = new BufferedInputStream(source.openStream());
+
+         outputStream = new BufferedOutputStream(new FileOutputStream(destination));
+         Lib.inputStreamToOutputStream(inputStream, outputStream);
+      } finally {
+         Lib.close(inputStream);
+         Lib.close(outputStream);
+      }
+   }
+
    @Test
-   public void testImport() throws Exception {
-      // Store file as CoverageUnit
-      File file = OseeData.getFolder("vcast.wrk").getLocation().toFile();
-      final String coverageInputDir = file.getAbsolutePath();
-      Assert.assertTrue(file.exists());
-
-      VectorCastAdaCoverageImporter vectorCastImporter =
-         new VectorCastAdaCoverageImporter(new IVectorCastCoverageImportProvider() {
-
-            @Override
-            public boolean isResolveExceptionHandling() {
-               return false;
-            }
-
-            @Override
-            public String getVCastDirectory() {
-               return coverageInputDir;
-            }
-
-            @Override
-            public String getFileNamespace(String filename) {
-               return "test";
-            }
-         });
-      coverageImport = vectorCastImporter.run(null);
+   public void testAdaVCast60ImportOp() throws Exception {
+      File dbFile = tempFolder.newFile("vCastImportTest.db");
+      File resultsFolder = tempFolder.newFolder("results");
+
+      Bundle bundle = FrameworkUtil.getBundle(this.getClass());
+      copyResource(getURL(bundle, "vcast/vCastImportTest.db"), dbFile);
+      copyResource(getURL(bundle, "vcast/test_main.2.LIS"), tempFolder.newFile("test_main.2.LIS"));
+      copyResource(getURL(bundle, "vcast/test_scheduler.2.LIS"), tempFolder.newFile("test_scheduler.2.LIS"));
+      copyResource(getURL(bundle, "vcast/results/test_unit_1.dat"), new File(resultsFolder, "test_unit_1.dat"));
+      copyResource(getURL(bundle, "vcast/results/test_unit_2.dat"), new File(resultsFolder, "test_unit_2.dat"));
+      copyResource(getURL(bundle, "vcast/results/test_unit_3.dat"), new File(resultsFolder, "test_unit_3.dat"));
+
+      VCast60Params params =
+         new VCast60Params(tempFolder.getRoot().getAbsolutePath(), "test", false, dbFile.getAbsolutePath());
+      coverageImport = new CoverageImport("VectorCast Import");
+      IOperation operation = CoverageImportFactory.createAdaVCast60ImportOp(params, coverageImport);
+      Operations.executeWorkAndCheckStatus(operation);
+
       Assert.assertNotNull(coverageImport);
       Assert.assertFalse(coverageImport.getLog().isErrors());
 
@@ -224,9 +246,10 @@ public class VectorCastImportTest {
       if (testWithDb) {
          // Test Persist of CoveragePackage
          OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, CoverageTestUtil.getTestBranch());
+         String txComment =
+            String.format("Coverage Package Save: %s.%s", getClass().getSimpleName(), testName.getMethodName());
          SkynetTransaction transaction =
-            TransactionManager.createTransaction(CoverageTestUtil.getTestBranch(), String.format("%s: %s.%s",
-               VectorCastImportTest.class.getSimpleName(), "Coverage Package Save ", testName.getMethodName()));
+            TransactionManager.createTransaction(CoverageTestUtil.getTestBranch(), txComment);
          CoveragePackageEvent coverageEvent = new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified);
          store.save(transaction, coverageEvent, coveragePackage.getCoverageOptionManager());
          store.getArtifact(false).persist(transaction);
@@ -255,84 +278,4 @@ public class VectorCastImportTest {
       Assert.assertEquals(7, loadedCp.getCoverageItemsCount(CoverageOptionManager.Test_Unit));
       Assert.assertEquals(5, loadedCp.getCoverageItemsCount(CoverageOptionManager.Not_Covered));
    }
-
-   @Test
-   public void testImportRecord() throws Exception {
-      File file = OseeData.getFolder("vcast.wrk").getLocation().toFile();
-      final String coverageInputDir = file.getAbsolutePath();
-      Assert.assertTrue(file.exists());
-
-      VectorCastAdaCoverageImporter vectorCastImporter =
-         new VectorCastAdaCoverageImporter(new IVectorCastCoverageImportProvider() {
-
-            @Override
-            public boolean isResolveExceptionHandling() {
-               return false;
-            }
-
-            @Override
-            public String getVCastDirectory() {
-               return coverageInputDir;
-            }
-
-            @Override
-            public String getFileNamespace(String filename) {
-               return "test";
-            }
-         });
-      coverageImport = vectorCastImporter.run(null);
-
-      OseeCoveragePackageStore store = OseeCoveragePackageStore.get(coveragePackage, CoverageTestUtil.getTestBranch());
-      SkynetTransaction transaction =
-         TransactionManager.createTransaction(CoverageTestUtil.getTestBranch(), "Save Import Record");
-      Result result = store.saveImportRecord(transaction, coverageImport);
-      Assert.assertTrue(result.isTrue());
-      transaction.execute();
-
-      Artifact packageArt =
-         ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageTestUtil.getTestBranch());
-      Artifact foundRecordArt = null;
-      for (Artifact artifact : packageArt.getChildren()) {
-         if (artifact.getName().equals(OseeCoveragePackageStore.IMPORT_RECORD_NAME)) {
-            foundRecordArt = artifact;
-            CoverageTestUtil.registerAsTestArtifact(foundRecordArt);
-            foundRecordArt.persist(getClass().getSimpleName());
-         }
-      }
-      Assert.assertNotNull(foundRecordArt);
-      Assert.assertEquals("General Document", foundRecordArt.getArtifactTypeName());
-
-   }
-
-   /**
-    * Create dir structure for importer to read
-    * 
-    * @throws InterruptedException
-    */
-   private static void createVCastFileset() throws OseeCoreException, IOException {
-      PluginUtil helper = new PluginUtil(Activator.PLUGIN_ID);
-      OseeData.getFolder("vcast.wrk").getLocation().toFile();
-      helper.copyPluginFileToOseeData("support/vcastData/vcast.vcp", "vcast.wrk/vcast.vcp");
-      helper.copyPluginFileToOseeData("support/vcastData/CCAST_.CFG", "vcast.wrk/CCAST_.CFG");
-
-      // create vcast dir and files within
-      OseeData.getFolder("vcast.wrk/vcast").getLocation().toFile();
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/build_info.xml", "vcast.wrk/vcast/build_info.xml");
-      helper.copyPluginFileToOseeData("support/vcastData/vcast_aggregate_coverage_report.html",
-         "vcast.wrk/vcast/vcast_aggregate_coverage_report.html");
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/test_main.2.LIS", "vcast.wrk/vcast/test_main.2.LIS");
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/test_main.2.xml", "vcast.wrk/vcast/test_main.2.xml");
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/test_scheduler.2.LIS",
-         "vcast.wrk/vcast/test_scheduler.2.LIS");
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/test_scheduler.2.xml",
-         "vcast.wrk/vcast/test_scheduler.2.xml");
-      OseeData.getFolder("vcast.wrk/vcast/results").getLocation().toFile();
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/results/test_unit_1.DAT",
-         "vcast.wrk/vcast/results/test_unit_1.DAT");
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/results/test_unit_2.DAT",
-         "vcast.wrk/vcast/results/test_unit_2.DAT");
-      helper.copyPluginFileToOseeData("support/vcastData/vcast/results/test_unit_3.DAT",
-         "vcast.wrk/vcast/results/test_unit_3.DAT");
-   }
-
 }
diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/vCastImportTest.db b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/vCastImportTest.db
new file mode 100644
index 00000000000..f5b63b22ca1
--- /dev/null
+++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/vcast/vCastImportTest.db