diff options
87 files changed, 832 insertions, 202 deletions
diff --git a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF index 1472916352d..4bd9f7f00b0 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.client.integration.tests/META-INF/MANIFEST.MF @@ -10,15 +10,16 @@ Import-Package: org.eclipse.core.runtime, org.eclipse.osee.ats.config.demo, org.eclipse.osee.ats.test, org.eclipse.osee.coverage.test, - org.eclipse.osee.coverage.test.import1, - org.eclipse.osee.coverage.test.import2, - org.eclipse.osee.coverage.test.import3, - org.eclipse.osee.coverage.test.import4, - org.eclipse.osee.coverage.test.import5, - org.eclipse.osee.coverage.test.import6, - org.eclipse.osee.coverage.test.import7, - org.eclipse.osee.coverage.test.import8, - org.eclipse.osee.coverage.test.import9, + org.eclipse.osee.coverage.test.import01, + org.eclipse.osee.coverage.test.import02, + org.eclipse.osee.coverage.test.import03, + org.eclipse.osee.coverage.test.import04, + org.eclipse.osee.coverage.test.import05, + org.eclipse.osee.coverage.test.import06, + org.eclipse.osee.coverage.test.import07, + org.eclipse.osee.coverage.test.import08, + org.eclipse.osee.coverage.test.import09, + org.eclipse.osee.coverage.test.import10, org.eclipse.osee.coverage.test.model, org.eclipse.osee.coverage.test.navigate, org.eclipse.osee.define, diff --git a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch index 1028acdf4d1..19c80ce2181 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch +++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbInit.launch @@ -35,8 +35,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.sdk.ide"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="org.mortbay.jetty.util@default:default,org.apache.xml.resolver@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.update.configurator@3:true,org.eclipse.core.jobs@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.zest.core@default:default,org.apache.lucene@default:default,org.eclipse.equinox.http.registry@default:default,org.objectweb.asm@default:default,org.eclipse.equinox.p2.director@default:default,org.apache.commons.httpclient@default:default,org.eclipse.ltk.core.refactoring@default:default,de.itemis.xtext.antlr@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.rcp@default:default,org.eclipse.team.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.update.core.win32@default:false,org.mortbay.jetty.server@default:default,org.apache.ant@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.compare.win32@default:default,org.apache.commons.lang@default:default,org.eclipse.equinox.p2.operations@default:default,com.jcraft.jsch@default:default,org.eclipse.core.resources@default:default,org.eclipse.debug.ui@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.help@default:default,org.eclipse.equinox.preferences@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.equinox.frameworkadmin@default:default,org.antlr.runtime@default:default,javax.activation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.platform@default:default,org.h2@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.concurrent@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.eclipse.xpand@default:default,org.sat4j.core@default:default,javax.servlet@default:default,org.apache.commons.cli@default:default,org.eclipse.core.databinding@default:default,org.apache.batik.xml@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.apache.log4j@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.apache.jasper@default:default,org.eclipse.jdt.core@default:default,org.eclipse.core.runtime@default:true,org.eclipse.ui.editors@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.jdt.compiler.apt@default:false,javax.servlet.jsp@default:default,org.eclipse.ant.ui@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.debug.core@default:default,org.eclipse.pde.launching@default:default,org.apache.batik.css@default:default,org.eclipse.core.variables@default:default,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.xtext.builder@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ui.views@default:default,org.eclipse.ui.intro.universal@default:default,org.apache.batik.dom@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.apache.commons.net@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jsch.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.common@default:default,org.w3c.dom.svg@default:default,org.eclipse.xtext.generator@default:default,org.hamcrest.core@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.jface.databinding@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.help.base@default:default,org.eclipse.ant.launching@default:default,org.eclipse.pde.ui@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.emf.ecore@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.compare@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.core.expressions@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ant.core@default:default,org.junit4@default:default,org.eclipse.pde@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.birt.chart.engine@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.w3c.dom.smil@default:default,org.eclipse.cvs@default:default,org.eclipse.core.net@default:default,org.eclipse.team.svn@default:default,org.eclipse.equinox.p2.repository@default:default,org.apache.xml.serializer@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.help.appserver@default:default,org.eclipse.emf.compare.match@default:default,com.lowagie.text@default:default,org.apache.batik.util.gui@default:default,org.eclipse.update.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.gef@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.intro@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.compare.core@default:default,org.eclipse.jface.text@default:default,org.apache.commons.el@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.xtext.logging@default:false,org.eclipse.platform.doc.isv@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.apache.batik.pdf@default:default,org.mozilla.javascript@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.equinox.common@2:true,javax.xml@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.help.ui@default:default,org.eclipse.xtext@default:default,org.eclipse.core.databinding.observable@default:default,org.antlr.gen@default:default,org.apache.batik.bridge@default:default,org.sat4j.pb@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jdt.debug@default:default,org.apache.batik.svggen@default:default,org.eclipse.search@default:default,org.apache.batik.parser@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.osgi.services@default:default,org.eclipse.ui.console@default:default,org.eclipse.ecf.filetransfer@default:default,com.google.collect@default:default,org.eclipse.osgi@-1:true,org.eclipse.jdt.apt.core@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.sdk@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.emf.mwe.core@default:default,org.eclipse.birt.chart.device.extension@default:default,org.eclipse.core.externaltools@default:default,org.aopalliance@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.jface@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.security.win32.x86@default:false,org.apache.oro@default:default,org.apache.batik.util@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.equinox.util@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.osgi.util@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.xtext.util@default:default,org.eclipse.ui.cheatsheets@default:default,com.google.inject@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.http.servlet@default:default,org.apache.commons.codec@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.workbench@default:default,com.ibm.icu@default:default,org.eclipse.emf.edit@default:default,org.eclipse.text@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ecf@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.jdt.core.manipulation@default:default,org.apache.batik.ext.awt@default:default,org.eclipse.swt@default:default,org.eclipse.equinox.security@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.core.boot@default:default,org.w3c.css.sac@default:default,org.eclipse.birt.core@default:default,org.eclipse.core.contenttype@default:default,org.apache.xerces@default:default,org.eclipse.core.commands@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.team.core@default:default,org.eclipse.pde.build@default:default,org.eclipse.update.core@default:default,org.eclipse.pde.core@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.xtend@default:default,javax.wsdl@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.jdt.junit@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.team.cvs.ssh2@default:default,javax.mail.glassfish@default:default,org.eclipse.birt.chart.device.swt@default:default,org.apache.batik.transcoder@default:default,org.eclipse.xtext.ui@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.svn@default:default,jms.libraries@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.support.test.util@default:default,org.postgresql.driver@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.ats.help.ui@default:default,net.jini@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.define@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.team.svn@default:default,org.apache.xerces@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.junit.core@default:default,org.polarion.eclipse.team.svn.connector.svnkit16@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.gef@default:default,org.apache.lucene.analysis@default:default,org.w3c.dom.smil@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.emf.compare@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.ui.ide@default:default,org.apache.batik.xml@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.security.ui@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,javax.wsdl@default:default,org.apache.batik.util@default:default,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.help.appserver@default:default,org.eclipse.compare@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.debug.ui@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.apache.commons.net@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.util@default:default,org.eclipse.pde.launching@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.operations@default:default,org.apache.batik.bridge@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.emf.mwe.core@default:default,org.apache.jasper@default:default,org.aopalliance@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.core.jobs@default:default,org.eclipse.help.base@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.filesystem@default:default,org.w3c.css.sac@default:default,javax.xml@default:default,org.eclipse.equinox.common@2:true,org.eclipse.pde.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jface.databinding@default:default,org.apache.commons.httpclient@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.commons.lang@default:default,org.eclipse.ui.forms@default:default,javax.servlet.jsp@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.common@default:default,org.eclipse.birt.chart.device.svg@default:default,org.antlr.gen@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi.util@default:default,org.eclipse.update.configurator@3:true,org.apache.batik.util.gui@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.birt.chart.device.swt@default:default,org.junit4@default:default,org.apache.batik.css@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.sdk@default:default,org.eclipse.team.svn.help@default:default,org.apache.xml.resolver@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.equinox.ds@default:true,org.eclipse.ui.views.log@default:default,org.eclipse.compare.win32@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.browser@default:default,org.apache.batik.dom.svg@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.eclipse.text@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.compare.ui@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.ltk.core.refactoring@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.apache.batik.parser@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.apache.commons.cli@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.log4j@default:default,org.w3c.dom.svg@default:default,javax.mail.glassfish@default:default,org.eclipse.xtend@default:default,org.eclipse.core.boot@default:default,org.eclipse.ui.views@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.pde.build@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.help@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.antlr.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.ant.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.xtext.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.team.svn.core@default:default,org.sat4j.pb@default:default,org.eclipse.team.core@default:default,org.apache.lucene@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.platform@default:default,org.eclipse.swt@default:default,org.eclipse.ui.win32@default:false,org.eclipse.xtext.ui@default:default,org.eclipse.core.net@default:default,org.eclipse.ecf.filetransfer@default:default,org.apache.batik.ext.awt@default:default,org.apache.commons.el@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.core@default:default,javax.servlet@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jsch.core@default:default,org.eclipse.birt.chart.device.extension@default:default,org.apache.batik.pdf@default:default,org.eclipse.xtext@default:default,org.eclipse.jface@default:default,org.eclipse.ui.ide.application@default:default,com.jcraft.jsch@default:default,org.eclipse.pde@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ant.core@default:default,com.google.collect@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.core.expressions@default:default,org.objectweb.asm@default:default,org.mozilla.javascript@default:default,com.lowagie.text@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.doc.isv@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.mwe2.launch@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.apache.ant@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.compiler.tool@default:false,org.apache.batik.svggen@default:default,org.apache.oro@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.help.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.sat4j.core@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.debug.core@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.pde.core@default:default,org.apache.batik.transcoder@default:default,org.apache.commons.codec@default:default,org.eclipse.birt.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.rcp@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.osgi.services@default:default,org.eclipse.update.ui@default:default,org.eclipse.jdt.doc.user@default:default,javax.activation@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.ant.launching@default:default,org.h2@default:default,org.apache.xml.serializer@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.emf.edit@default:default,org.apache.batik.dom@default:default,org.eclipse.xpand@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.team.ui@default:default,org.eclipse.jdt.junit4.runtime@default:default,com.ibm.icu@default:default,org.eclipse.zest.core@default:default,org.eclipse.ui.externaltools@default:default,com.google.inject@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.equinox.p2.ui@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.messaging.event.skynet@default:default,jms.libraries@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.ats.help.ui@default:default,net.jini@default:default,org.postgresql.driver@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.messaging.test@default:false"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> diff --git a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch index dbeae76a3bd..96696a27063 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch +++ b/plugins/org.eclipse.osee.client.integration.tests/MasterTestSuite_DemoDbTests.launch @@ -35,8 +35,8 @@ <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"/> -<stringAttribute key="selected_target_plugins" value="org.eclipse.team.cvs.ui@default:default,javax.xml@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.ant.core@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.platform.doc.isv@default:default,org.mortbay.jetty.util@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.jdt@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.boot@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtend@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.ui@default:default,org.apache.commons.httpclient@default:default,org.apache.ant@default:default,org.eclipse.jsch.core@default:default,org.eclipse.help.ui@default:default,org.eclipse.ant.launching@default:default,com.ibm.icu@default:default,org.eclipse.platform@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.ui.intro@default:default,org.eclipse.help@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.ui.console@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.core.net@default:default,org.eclipse.equinox.util@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.help.appserver@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.equinox.security@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.debug.core@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.p2.updatesite@default:default,com.google.collect@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.pde.core@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.osgi@-1:true,org.apache.xml.serializer@default:default,org.mozilla.javascript@default:default,org.eclipse.compare.core@default:default,org.eclipse.xtext@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.apache.lucene@default:default,org.eclipse.core.runtime@default:true,org.eclipse.jdt.debug.ui@default:default,org.eclipse.ant.ui@default:default,org.mortbay.jetty.server@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.equinox.concurrent@default:default,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.team.svn@default:default,org.apache.commons.cli@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.pde.ui@default:default,org.eclipse.equinox.security.win32.x86@default:false,javax.servlet@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.emf.mwe.utils@default:default,org.aopalliance@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.ui.win32@default:false,org.eclipse.team.svn.help@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.sdk@default:default,org.eclipse.ui.net@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.apache.xml.resolver@default:default,org.eclipse.ui@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.cvs@default:default,org.apache.commons.net@default:default,org.sat4j.pb@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.team.svn.core@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.core.expressions@default:default,org.eclipse.osgi.services@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.eclipse.jdt.junit@default:default,org.apache.lucene.analysis@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.search@default:default,org.antlr.gen@default:default,org.eclipse.birt.core@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.swt@default:default,org.h2@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.draw2d@default:default,org.eclipse.ui.browser@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.xtext.ui@default:default,javax.servlet.jsp@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.update.core@default:default,com.jcraft.jsch@default:default,org.eclipse.core.resources@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.osgi.util@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.ui.navigator.resources@default:default,org.apache.xerces@default:default,org.hamcrest.core@default:default,org.eclipse.update.ui@default:default,org.apache.log4j@default:default,org.eclipse.help.base@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.compare@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.equinox.app@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.equinox.http.servlet@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.core.jobs@default:default,org.eclipse.jdt.core@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.core.commands@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.emf.compare.ui@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,com.google.inject@default:default,org.eclipse.ui.forms@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.jdt.apt.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.equinox.p2.core@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.ui.views@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jsch.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.core.runtime.compatibility@default:default,javax.mail.glassfish@default:default,org.eclipse.emf.common@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.apache.commons.lang@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xpand@default:default,org.eclipse.pde@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.team.core@default:default,com.lowagie.text@default:default,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.xtext.logging@default:false,org.eclipse.jface@default:default,org.apache.oro@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.ui.editors@default:default,javax.activation@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.sat4j.core@default:default,org.eclipse.team.ui@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.zest.core@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.pde.build@default:default,org.apache.jasper@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.pde.launching@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jface.text@default:default,org.apache.commons.el@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.rcp@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.core.databinding@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.core.variables@default:default,org.eclipse.help.webapp@default:default,org.eclipse.gef@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.equinox.ds@1:true,org.antlr.runtime@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.debug.ui@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.core.filesystem@default:default,org.eclipse.update.configurator@3:true,org.junit4@default:default,org.eclipse.text@default:default,org.apache.commons.codec@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.jdt.doc.user@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.framework.messaging.event.skynet@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.core.model.test@default:false,net.jini@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.core.dsl.edit@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.ats.config.demo@default:default,jms.libraries@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,jms.activemq.launch@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.ats@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.postgresql.driver@default:default"/> +<stringAttribute key="selected_target_plugins" value="org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.team.svn@default:default,org.apache.xerces@default:default,org.eclipse.jface.text@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.ui.net@default:default,org.eclipse.core.commands@default:default,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.gef@default:default,org.apache.lucene.analysis@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.emf.compare@default:default,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.core.resources@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.ui.ide@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.equinox.launcher@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.osgi@-1:true,org.eclipse.equinox.security.ui@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.osee.framework.svn@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.p2.metadata.generator@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.help.appserver@default:default,org.eclipse.compare@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.debug.ui@default:default,org.eclipse.update.core.win32@default:false,org.eclipse.core.filesystem.win32.x86@default:false,org.eclipse.jdt@default:default,org.eclipse.core.resources.win32.x86@default:false,org.eclipse.equinox.security@default:default,org.apache.commons.net@default:default,org.mortbay.jetty.util@default:default,org.eclipse.equinox.util@default:default,org.eclipse.pde.launching@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.search@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,org.apache.jasper@default:default,org.aopalliance@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.core.jobs@default:default,org.eclipse.help.base@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.core.filesystem@default:default,javax.xml@default:default,org.eclipse.equinox.common@2:true,org.eclipse.pde.ui@default:default,org.eclipse.core.runtime.compatibility.auth@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.pde.ui.templates@default:default,org.apache.commons.httpclient@default:default,de.itemis.xtext.antlr@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.apache.commons.lang@default:default,org.eclipse.ui.forms@default:default,javax.servlet.jsp@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.common@default:default,org.antlr.gen@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.osgi.util@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xtext.ui.shared@default:default,org.eclipse.pde.runtime@default:default,org.junit4@default:default,org.eclipse.swt.win32.win32.x86@default:false,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.sdk@default:default,org.eclipse.team.svn.help@default:default,org.apache.xml.resolver@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.ui.views.log@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.equinox.security.win32.x86@default:false,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.ui.browser@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.equinox.app@default:default,org.eclipse.text@default:default,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.emf.compare.ui@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.ltk.core.refactoring@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.apache.commons.cli@default:default,org.eclipse.update.core@default:default,org.eclipse.equinox.concurrent@default:default,org.apache.log4j@default:default,javax.mail.glassfish@default:default,org.eclipse.xtend@default:default,org.eclipse.core.boot@default:default,org.eclipse.ui.views@default:default,org.eclipse.zest.layouts@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.pde.build@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.help@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.antlr.runtime@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.ant.ui@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.mortbay.jetty.server@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.xtext.util@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.team.svn.core@default:default,org.sat4j.pb@default:default,org.eclipse.team.core@default:default,org.apache.lucene@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ecf@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.platform@default:default,org.eclipse.swt@default:default,org.eclipse.ui.win32@default:false,org.eclipse.xtext.ui@default:default,org.eclipse.ui.workbench.compatibility@default:false,org.eclipse.core.net@default:default,org.eclipse.ecf.filetransfer@default:default,org.apache.commons.el@default:default,org.eclipse.compare.core@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.equinox.p2.core@default:default,javax.servlet@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jsch.core@default:default,org.eclipse.xtext@default:default,org.eclipse.jface@default:default,org.eclipse.ui.ide.application@default:default,com.jcraft.jsch@default:default,org.eclipse.pde@default:default,org.eclipse.core.databinding@default:default,org.eclipse.ant.core@default:default,com.google.collect@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.core.expressions@default:default,org.mozilla.javascript@default:default,com.lowagie.text@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.update.scheduler@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.jdt.doc.isv@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.core.runtime@default:true,org.eclipse.emf.mwe2.launch@default:default,org.apache.commons.logging*1.1.1.v201005080502@default:default,org.eclipse.jsch.ui@default:default,org.apache.ant@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.ui.console@default:default,org.eclipse.jdt.compiler.tool@default:false,org.apache.oro@default:default,org.eclipse.ui.editors@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.help.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.junit*3.8.2.v3_8_2_v20100427-1100@default:default,org.sat4j.core@default:default,org.hamcrest.core@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.debug.core@default:default,org.eclipse.draw2d@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.xtext.xtend@default:default,org.eclipse.pde.core@default:default,org.apache.commons.codec@default:default,org.eclipse.birt.core@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.rcp@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.osgi.services@default:default,org.eclipse.update.ui@default:default,org.eclipse.jdt.doc.user@default:default,javax.activation@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.ant.launching@default:default,org.h2@default:default,org.apache.xml.serializer@default:default,org.junit*4.8.1.v4_8_1_v20100427-1100@default:default,org.eclipse.emf.edit@default:default,org.eclipse.xpand@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.ui.presentations.r21@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.team.ui@default:default,org.eclipse.jdt.junit4.runtime@default:default,com.ibm.icu@default:default,org.eclipse.zest.core@default:default,org.eclipse.ui.externaltools@default:default,com.google.inject@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.equinox.p2.ui@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.ote.message@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.core.dsl.ui@default:default,org.eclipse.osee.demo.db.connection@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.ui.jdk@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.messaging.event.skynet@default:default,jms.libraries@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.nebula.widgets.xviewer.tests@default:false,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.ats.config.demo@default:default,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.ote.connection.service@default:default,jms.activemq.launch@default:default,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.framework.postgresql@default:default,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.framework.core.dsl.edit@default:default,org.eclipse.osee.support.test.util@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.ui.service.control@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.ats.help.ui@default:default,net.jini@default:default,org.postgresql.driver@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.coverage@default:default,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.jdbcodbc@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.framework.messaging.test@default:false"/> <booleanAttribute key="show_selected_only" value="false"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="false"/> 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 65a5c71700e..3beea82d415 100644 --- a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF @@ -9,14 +9,15 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit Import-Package: org.eclipse.osee.support.test.util Export-Package: org.eclipse.osee.coverage.test, - org.eclipse.osee.coverage.test.import1, - org.eclipse.osee.coverage.test.import2, - org.eclipse.osee.coverage.test.import3, - org.eclipse.osee.coverage.test.import4, - org.eclipse.osee.coverage.test.import5, - org.eclipse.osee.coverage.test.import6, - org.eclipse.osee.coverage.test.import7, - org.eclipse.osee.coverage.test.import8, - org.eclipse.osee.coverage.test.import9, + org.eclipse.osee.coverage.test.import01, + org.eclipse.osee.coverage.test.import02, + org.eclipse.osee.coverage.test.import03, + org.eclipse.osee.coverage.test.import04, + org.eclipse.osee.coverage.test.import05, + org.eclipse.osee.coverage.test.import06, + org.eclipse.osee.coverage.test.import07, + org.eclipse.osee.coverage.test.import08, + org.eclipse.osee.coverage.test.import09, + org.eclipse.osee.coverage.test.import10, org.eclipse.osee.coverage.test.model, org.eclipse.osee.coverage.test.navigate diff --git a/plugins/org.eclipse.osee.coverage.test/build.properties b/plugins/org.eclipse.osee.coverage.test/build.properties index deeb6751392..7fd566a5492 100644 --- a/plugins/org.eclipse.osee.coverage.test/build.properties +++ b/plugins/org.eclipse.osee.coverage.test/build.properties @@ -3,16 +3,17 @@ output.. = bin/ bin.includes = META-INF/,\ .,\ fragment.xml,\ - src/org/eclipse/osee/coverage/test/import1/apu/,\ - src/org/eclipse/osee/coverage/test/import1/com/,\ - src/org/eclipse/osee/coverage/test/import1/epu/,\ - src/org/eclipse/osee/coverage/test/import1/nav/,\ - src/org/eclipse/osee/coverage/test/import2/com/,\ - src/org/eclipse/osee/coverage/test/import2/epu/,\ - src/org/eclipse/osee/coverage/test/import3/epu/,\ - src/org/eclipse/osee/coverage/test/import4/epu/,\ - src/org/eclipse/osee/coverage/test/import5/nav/,\ - src/org/eclipse/osee/coverage/test/import6/epu/,\ - src/org/eclipse/osee/coverage/test/import7/apu/,\ - src/org/eclipse/osee/coverage/test/import8/nav/,\ - src/org/eclipse/osee/coverage/test/import9/nav/ + src/org/eclipse/osee/coverage/test/import01/apu/,\ + src/org/eclipse/osee/coverage/test/import01/com/,\ + src/org/eclipse/osee/coverage/test/import01/epu/,\ + src/org/eclipse/osee/coverage/test/import01/nav/,\ + src/org/eclipse/osee/coverage/test/import02/com/,\ + src/org/eclipse/osee/coverage/test/import02/epu/,\ + src/org/eclipse/osee/coverage/test/import03/epu/,\ + src/org/eclipse/osee/coverage/test/import04/epu/,\ + src/org/eclipse/osee/coverage/test/import05/nav/,\ + src/org/eclipse/osee/coverage/test/import06/epu/,\ + src/org/eclipse/osee/coverage/test/import07/apu/,\ + src/org/eclipse/osee/coverage/test/import08/nav/,\ + src/org/eclipse/osee/coverage/test/import09/nav/,\ + src/org/eclipse/osee/coverage/test/import10/nav/ diff --git a/plugins/org.eclipse.osee.coverage.test/fragment.xml b/plugins/org.eclipse.osee.coverage.test/fragment.xml index 448224ec6ea..69ab40fc688 100644 --- a/plugins/org.eclipse.osee.coverage.test/fragment.xml +++ b/plugins/org.eclipse.osee.coverage.test/fragment.xml @@ -10,55 +10,61 @@ <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam"> + className="org.eclipse.osee.coverage.test.import01.CoverageImport1TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import2.CoverageImport2TestBlam"> + className="org.eclipse.osee.coverage.test.import02.CoverageImport2TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import3.CoverageImport3TestBlam"> + className="org.eclipse.osee.coverage.test.import03.CoverageImport3TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import4.CoverageImport4TestBlam"> + className="org.eclipse.osee.coverage.test.import04.CoverageImport4TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import5.CoverageImport5TestBlam"> + className="org.eclipse.osee.coverage.test.import05.CoverageImport5TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import6.CoverageImport6TestBlam"> + className="org.eclipse.osee.coverage.test.import06.CoverageImport6TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import7.CoverageImport7TestBlam"> + className="org.eclipse.osee.coverage.test.import07.CoverageImport7TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import8.CoverageImport8TestBlam"> + className="org.eclipse.osee.coverage.test.import08.CoverageImport8TestBlam"> </Operation> </extension> <extension point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> <Operation - className="org.eclipse.osee.coverage.test.import9.CoverageImport9TestBlam"> + className="org.eclipse.osee.coverage.test.import09.CoverageImport9TestBlam"> + </Operation> + </extension> + <extension + point="org.eclipse.osee.framework.ui.skynet.BlamOperation"> + <Operation + className="org.eclipse.osee.coverage.test.import10.CoverageImport10TestBlam"> </Operation> </extension> diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java index c624ed0c8a5..487e16b87ae 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageManagerTest.java @@ -14,7 +14,7 @@ import static org.junit.Assert.fail; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.osee.coverage.CoverageManager; -import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam; +import org.eclipse.osee.coverage.test.import01.CoverageImport1TestBlam; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.IHealthStatus; import org.eclipse.osee.framework.logging.OseeLog; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java index 7709eee7740..72af685870d 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java @@ -12,7 +12,6 @@ package org.eclipse.osee.coverage.test; import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import java.util.Collection; -import org.junit.Assert; import org.eclipse.osee.coverage.event.CoverageEventType; import org.eclipse.osee.coverage.event.CoveragePackageEvent; import org.eclipse.osee.coverage.merge.IMergeItem; @@ -31,15 +30,16 @@ import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.model.SimpleWorkProductTaskProvider; import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; import org.eclipse.osee.coverage.store.OseeCoverageStore; -import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam; -import org.eclipse.osee.coverage.test.import2.CoverageImport2TestBlam; -import org.eclipse.osee.coverage.test.import3.CoverageImport3TestBlam; -import org.eclipse.osee.coverage.test.import4.CoverageImport4TestBlam; -import org.eclipse.osee.coverage.test.import5.CoverageImport5TestBlam; -import org.eclipse.osee.coverage.test.import6.CoverageImport6TestBlam; -import org.eclipse.osee.coverage.test.import7.CoverageImport7TestBlam; -import org.eclipse.osee.coverage.test.import8.CoverageImport8TestBlam; -import org.eclipse.osee.coverage.test.import9.CoverageImport9TestBlam; +import org.eclipse.osee.coverage.test.import01.CoverageImport1TestBlam; +import org.eclipse.osee.coverage.test.import02.CoverageImport2TestBlam; +import org.eclipse.osee.coverage.test.import03.CoverageImport3TestBlam; +import org.eclipse.osee.coverage.test.import04.CoverageImport4TestBlam; +import org.eclipse.osee.coverage.test.import05.CoverageImport5TestBlam; +import org.eclipse.osee.coverage.test.import06.CoverageImport6TestBlam; +import org.eclipse.osee.coverage.test.import07.CoverageImport7TestBlam; +import org.eclipse.osee.coverage.test.import08.CoverageImport8TestBlam; +import org.eclipse.osee.coverage.test.import09.CoverageImport9TestBlam; +import org.eclipse.osee.coverage.test.import10.CoverageImport10TestBlam; import org.eclipse.osee.coverage.test.util.CoverageTestUtil; import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.coverage.util.ISaveable; @@ -55,6 +55,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.ui.plugin.util.Result; import org.eclipse.osee.framework.ui.skynet.results.XResultData; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -639,7 +640,8 @@ public class CoveragePackageImportTest { Assert.assertEquals(1, mergeManager.getMergeItems(null).size()); Assert.assertTrue(mergeManager.getMergeItems(null).iterator().next() instanceof MergeItemGroup); Assert.assertTrue(((MergeItemGroup) mergeManager.getMergeItems(null).iterator().next()).getMergeType() == MergeType.CI_Changes); - Assert.assertEquals(2, ((MergeItemGroup) mergeManager.getMergeItems(null).iterator().next()).getMergeItems().size()); + Assert.assertEquals(2, + ((MergeItemGroup) mergeManager.getMergeItems(null).iterator().next()).getMergeItems().size()); MergeImportManager importManager = new MergeImportManager(mergeManager); XResultData resultData = importManager.importItems(new ISaveable() { @@ -1280,6 +1282,211 @@ public class CoveragePackageImportTest { } + @Test + // Re-import; Test Improvement to resolving coverage method differences + public void testImport10() throws Exception { + CoverageImport10TestBlam coverageImport10TestBlam = new CoverageImport10TestBlam(); + coverageImport = coverageImport10TestBlam.run(null); + Assert.assertNotNull(coverageImport); + + if (testWithDb) { + // Test Load of Coverage Package + Artifact artifact = + ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageTestUtil.getTestBranch()); + CoverageTestUtil.registerAsTestArtifact(artifact); + artifact.persist(); + OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact); + Assert.assertNotNull(packageStore.getArtifact(false)); + coveragePackage = packageStore.getCoveragePackage(); + } + + // Change NavigateButton1.java methods to insert user disposition item as Coverage_Method for 2 items + Result result = setupCoveragePackageForImport10(coveragePackage); + Assert.assertTrue(result.getText(), result.isTrue()); + + // reload coverage package from store + if (testWithDb) { + // Test Load of Coverage Package + Artifact artifact = + ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageTestUtil.getTestBranch()); + CoverageTestUtil.registerAsTestArtifact(artifact); + artifact.persist(); + OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact); + Assert.assertNotNull(packageStore.getArtifact(false)); + coveragePackage = packageStore.getCoveragePackage(); + } + + // Confirm that programatic changes were recorded + // Two items were changed to Deactivated, one was not covered, other test covered, no net gain of 1 item covered + Assert.assertEquals(71, coveragePackage.getCoverageItemsCovered().size()); + Assert.assertEquals(134, coveragePackage.getCoverageItems().size()); + Assert.assertEquals(52, coveragePackage.getCoveragePercent().intValue()); + Assert.assertEquals(2, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Deactivated_Code).size()); + Assert.assertEquals(0, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Exception_Handling).size()); + Assert.assertEquals(69, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Test_Unit).size()); + Assert.assertEquals(63, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Not_Covered).size()); + + CoverageItem item = getNavigateButton2getImageLine3CoverageItem(coveragePackage); + Assert.assertEquals("This is the rationale", item.getRationale()); + + // Test MergeManager + Assert.assertNotNull(coveragePackage); + MergeManager mergeManager = new MergeManager(coveragePackage, coverageImport); + Assert.assertEquals(1, mergeManager.getMergeItems(null).size()); + Assert.assertTrue(mergeManager.getMergeItems(null).iterator().next() instanceof MergeItemGroup); + int numUpdateMethod = 0; + for (IMergeItem mergeItem : ((MergeItemGroup) mergeManager.getMergeItems(null).iterator().next()).getMergeItems()) { + if (mergeItem.getMergeType() == MergeType.CI_Method_Update) { + numUpdateMethod++; + } else { + throw new OseeStateException("Unexpected merge type [%s] for CI_Changes group", mergeItem.getMergeType()); + } + } + Assert.assertEquals(2, numUpdateMethod); + + MergeImportManager importManager = new MergeImportManager(mergeManager); + XResultData resultData = importManager.importItems(new ISaveable() { + + @Override + public Result isEditable() { + return Result.TrueResult; + } + + @Override + public Result save() { + return Result.TrueResult; + } + + @Override + public Result save(Collection<ICoverage> coverages) { + return Result.TrueResult; + } + + @Override + public Result saveImportRecord(SkynetTransaction transaction, CoverageImport coverageImport) { + return Result.TrueResult; + } + + @Override + public Branch getBranch() { + return CoverageTestUtil.getTestBranch(); + } + + }, mergeManager.getMergeItems(null)); + Assert.assertEquals(0, resultData.getNumErrors()); + + // CoveragePackage should now have imported results + Assert.assertEquals(70, coveragePackage.getCoverageItemsCovered().size()); + Assert.assertEquals(134, coveragePackage.getCoverageItems().size()); + Assert.assertEquals(52, coveragePackage.getCoveragePercent().intValue()); + Assert.assertEquals(1, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Deactivated_Code).size()); + Assert.assertEquals(0, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Exception_Handling).size()); + Assert.assertEquals(69, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Test_Unit).size()); + Assert.assertEquals(64, coveragePackage.getCoverageItemsCovered(CoverageOptionManager.Not_Covered).size()); + + // Rationale should have been cleared + CoverageItem item1 = getNavigateButton2getImageLine3CoverageItem(coveragePackage); + Assert.assertEquals("", item1.getRationale()); + + CoveragePackage loadedCp = null; + if (testWithDb) { + // Test Persist of CoveragePackage + OseeCoverageStore store = OseeCoveragePackageStore.get(coveragePackage, CoverageTestUtil.getTestBranch()); + SkynetTransaction transaction = + new SkynetTransaction(CoverageTestUtil.getTestBranch(), "Coverage Package Save"); + store.save(transaction, getTestCoveragePackageEvent()); + transaction.execute(); + + // Test Load of Coverage Package + Artifact artifact = + ArtifactQuery.getArtifactFromId(coveragePackage.getGuid(), CoverageTestUtil.getTestBranch()); + CoverageTestUtil.registerAsTestArtifact(artifact); + artifact.persist(); + + OseeCoveragePackageStore packageStore = new OseeCoveragePackageStore(artifact); + Assert.assertNotNull(packageStore.getArtifact(false)); + loadedCp = packageStore.getCoveragePackage(); + } else { + loadedCp = coveragePackage; + } + + Assert.assertEquals(70, loadedCp.getCoverageItemsCovered().size()); + Assert.assertEquals(134, loadedCp.getCoverageItems().size()); + Assert.assertEquals(52, loadedCp.getCoveragePercent().intValue()); + Assert.assertEquals(1, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Deactivated_Code).size()); + Assert.assertEquals(0, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Exception_Handling).size()); + Assert.assertEquals(69, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Test_Unit).size()); + Assert.assertEquals(64, loadedCp.getCoverageItemsCovered(CoverageOptionManager.Not_Covered).size()); + + // Rationale should have been cleared + CoverageItem item2 = getNavigateButton2getImageLine3CoverageItem(loadedCp); + Assert.assertEquals("", item2.getRationale()); + } + + public static CoverageItem getNavigateButton2getTextLine3CoverageItem(CoveragePackage coveragePackage) { + ICoverage coverage = CoverageTestUtil.getFirstCoverageByName(coveragePackage, "NavigationButton2.java"); + CoverageUnit coverageUnit = (CoverageUnit) coverage; + for (CoverageUnit childCU : coverageUnit.getCoverageUnits()) { + if (childCU.getName().equals("getText")) { + for (CoverageItem item : childCU.getCoverageItems()) { + if (item.getOrderNumber().equals("3")) { + return item; + } + } + } + } + return null; + } + + public static CoverageItem getNavigateButton2getImageLine3CoverageItem(CoveragePackage coveragePackage) { + ICoverage coverage = CoverageTestUtil.getFirstCoverageByName(coveragePackage, "NavigationButton2.java"); + CoverageUnit coverageUnit = (CoverageUnit) coverage; + for (CoverageUnit childCU : coverageUnit.getCoverageUnits()) { + if (childCU.getName().equals("getImage")) { + for (CoverageItem item : childCU.getCoverageItems()) { + if (item.getOrderNumber().equals("3")) { + return item; + } + } + } + } + return null; + } + + /** + * Setup test by changing two lines in NavigateButton2.java to be user dispositioned and getText line 3 rationale + */ + public static Result setupCoveragePackageForImport10(CoveragePackage coveragePackage) { + String errStr = ""; + + CoverageItem item = getNavigateButton2getTextLine3CoverageItem(coveragePackage); + if (item == null) { + errStr = "NavigationButton.java/getText/line 3 not found\n"; + } else { + item.setCoverageMethod(CoverageOptionManager.Deactivated_Code); + } + + item = getNavigateButton2getImageLine3CoverageItem(coveragePackage); + if (item == null) { + errStr += "NavigationButton.java/getImage/line 3 not found"; + } else { + item.setCoverageMethod(CoverageOptionManager.Deactivated_Code); + item.setRationale("This is the rationale"); + } + + if (!errStr.isEmpty()) { + return new Result(errStr); + } + + if (testWithDb) { + OseeCoveragePackageStore packageStore = + new OseeCoveragePackageStore(coveragePackage, CoverageTestUtil.getTestBranch()); + packageStore.save(); + } + + return Result.TrueResult; + } + private CoveragePackageEvent getTestCoveragePackageEvent() { return new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java index f5a63f1efe6..0eab2ecf159 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java @@ -21,7 +21,7 @@ import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.store.OseeCoverageUnitStore; -import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam; +import org.eclipse.osee.coverage.test.import01.CoverageImport1TestBlam; import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.jdk.core.type.Pair; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/CoverageImport1TestBlam.java index 953fe343734..e93675ffc14 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoverageImport1TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/CoverageImport1TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1; +package org.eclipse.osee.coverage.test.import01; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -23,18 +23,18 @@ public class CoverageImport1TestBlam extends CoverageImportTestBlam { public CoverageImport1TestBlam() { super(NAME, Arrays.asList( // - "import1/com/screenA/ComScrnAButton1.java", - "import1/com/screenA/ComScrnAButton2.java", + "import01/com/screenA/ComScrnAButton1.java", + "import01/com/screenA/ComScrnAButton2.java", // - "import1/com/screenB/ScreenBButton1.java", "import1/com/screenB/ScreenBButton2.java", - "import1/com/screenB/ScreenBButton3.java", + "import01/com/screenB/ScreenBButton1.java", "import01/com/screenB/ScreenBButton2.java", + "import01/com/screenB/ScreenBButton3.java", // - "import1/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java", + "import01/epu/PowerUnit1.java", "import01/epu/PowerUnit2.java", // - "import1/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java", + "import01/apu/AuxPowerUnit1.java", "import01/apu/AuxPowerUnit2.java", // - "import1/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java", - "import1/nav/NavigationButton3.java" + "import01/nav/NavigationButton1.java", "import01/nav/NavigationButton2.java", + "import01/nav/NavigationButton3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/CoveragePackage1Import1.java index ffeff8c96ef..7e504d03291 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/CoveragePackage1Import1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1; +package org.eclipse.osee.coverage.test.import01; import org.eclipse.osee.coverage.test.util.CpCreateAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1B.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/CoveragePackage1Import1B.java index 505182b1380..6060eaa88ce 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/CoveragePackage1Import1B.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/CoveragePackage1Import1B.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1; +package org.eclipse.osee.coverage.test.import01; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/apu/AuxPowerUnit1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/apu/AuxPowerUnit1.java index 9f0ff989d7d..04e0bf85260 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/apu/AuxPowerUnit1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/apu/AuxPowerUnit1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.apu; +package org.eclipse.osee.coverage.test.import01.apu; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/apu/AuxPowerUnit2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/apu/AuxPowerUnit2.java index 6b6bdb8d490..3c64c97bbe6 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/apu/AuxPowerUnit2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/apu/AuxPowerUnit2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.apu; +package org.eclipse.osee.coverage.test.import01.apu; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Composite; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenA/ComScrnAButton1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenA/ComScrnAButton1.java index cf1126070bf..e2f3cd5ede2 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenA/ComScrnAButton1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenA/ComScrnAButton1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.com.screenA; +package org.eclipse.osee.coverage.test.import01.com.screenA; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenA/ComScrnAButton2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenA/ComScrnAButton2.java index 46b6bf76e5d..29587dba85f 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenA/ComScrnAButton2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenA/ComScrnAButton2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.com.screenA; +package org.eclipse.osee.coverage.test.import01.com.screenA; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenB/ScreenBButton1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenB/ScreenBButton1.java index c09f4108088..27504aa3fa2 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenB/ScreenBButton1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenB/ScreenBButton1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.com.screenB; +package org.eclipse.osee.coverage.test.import01.com.screenB; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenB/ScreenBButton2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenB/ScreenBButton2.java index ee6ea8ea3bb..ff97c13d387 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenB/ScreenBButton2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenB/ScreenBButton2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.com.screenB; +package org.eclipse.osee.coverage.test.import01.com.screenB; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenB/ScreenBButton3.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenB/ScreenBButton3.java index b87c4f8ffa5..e9b5a881312 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/com/screenB/ScreenBButton3.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/com/screenB/ScreenBButton3.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.com.screenB; +package org.eclipse.osee.coverage.test.import01.com.screenB; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/epu/PowerUnit1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/epu/PowerUnit1.java index 6f2d63047cd..a55e7ccfbd7 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/epu/PowerUnit1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/epu/PowerUnit1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.epu; +package org.eclipse.osee.coverage.test.import01.epu; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; @@ -51,16 +51,12 @@ public class PowerUnit1 extends Table { try { if (getStyle() == 4) { // 2, 1, TestUnit2 System.out.println("clear it"); // 2, 2, n - } else { - for (int x = 0; x < 34; x++) { - System.err.println("clear");// 2, 2, n - } } } catch (IllegalArgumentException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n + OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 3, n } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 5, n + OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n } } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/epu/PowerUnit2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/epu/PowerUnit2.java index d6a7e62dde3..04fdc09a7a2 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/epu/PowerUnit2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/epu/PowerUnit2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.epu; +package org.eclipse.osee.coverage.test.import01.epu; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/nav/NavigationButton1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/nav/NavigationButton1.java index c29223e713a..1e8a71ac491 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/nav/NavigationButton1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/nav/NavigationButton1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.nav; +package org.eclipse.osee.coverage.test.import01.nav; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/nav/NavigationButton2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/nav/NavigationButton2.java index ae3b3b88cc9..079712ed14c 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/nav/NavigationButton2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/nav/NavigationButton2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.nav; +package org.eclipse.osee.coverage.test.import01.nav; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/nav/NavigationButton3.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/nav/NavigationButton3.java index 14fe303c0ce..a792e7677f1 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import1/nav/NavigationButton3.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import01/nav/NavigationButton3.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import1.nav; +package org.eclipse.osee.coverage.test.import01.nav; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/CoverageImport2TestBlam.java index 7b401eea47d..5efa7b81748 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoverageImport2TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/CoverageImport2TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import2; +package org.eclipse.osee.coverage.test.import02; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -23,19 +23,19 @@ public class CoverageImport2TestBlam extends CoverageImportTestBlam { public CoverageImport2TestBlam() { super(NAME, Arrays.asList( // - "import1/com/screenA/ComScrnAButton1.java", - "import1/com/screenA/ComScrnAButton2.java", - "import2/com/screenA/ComScrnAButton3.java", + "import01/com/screenA/ComScrnAButton1.java", + "import01/com/screenA/ComScrnAButton2.java", + "import02/com/screenA/ComScrnAButton3.java", // - "import1/com/screenB/ScreenBButton1.java", "import1/com/screenB/ScreenBButton2.java", - "import1/com/screenB/ScreenBButton3.java", + "import01/com/screenB/ScreenBButton1.java", "import01/com/screenB/ScreenBButton2.java", + "import01/com/screenB/ScreenBButton3.java", // - "import1/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java", "import2/epu/PowerUnit3.java", + "import01/epu/PowerUnit1.java", "import01/epu/PowerUnit2.java", "import02/epu/PowerUnit3.java", // - "import1/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java", + "import01/apu/AuxPowerUnit1.java", "import01/apu/AuxPowerUnit2.java", // - "import1/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java", - "import1/nav/NavigationButton3.java" + "import01/nav/NavigationButton1.java", "import01/nav/NavigationButton2.java", + "import01/nav/NavigationButton3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoveragePackage1Import2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/CoveragePackage1Import2.java index ae058cd0430..f565c0ef033 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/CoveragePackage1Import2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/CoveragePackage1Import2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import2; +package org.eclipse.osee.coverage.test.import02; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/com/screenA/ComScrnAButton3.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/com/screenA/ComScrnAButton3.java index 276d867209f..4f59d36ca99 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/com/screenA/ComScrnAButton3.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/com/screenA/ComScrnAButton3.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import2.com.screenA; +package org.eclipse.osee.coverage.test.import02.com.screenA; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/epu/PowerUnit3.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/epu/PowerUnit3.java index 04cad2186c1..22ae5fcd204 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import2/epu/PowerUnit3.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import02/epu/PowerUnit3.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import2.epu; +package org.eclipse.osee.coverage.test.import02.epu; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import03/CoverageImport3TestBlam.java index 3a29a47d6d9..84d07199e27 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoverageImport3TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import03/CoverageImport3TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import3; +package org.eclipse.osee.coverage.test.import03; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -25,7 +25,7 @@ public class CoverageImport3TestBlam extends CoverageImportTestBlam { public CoverageImport3TestBlam() { super(NAME, Arrays.asList( // - "import3/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java", "import2/epu/PowerUnit3.java" + "import03/epu/PowerUnit1.java", "import01/epu/PowerUnit2.java", "import02/epu/PowerUnit3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoveragePackage1Import3.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import03/CoveragePackage1Import3.java index f9c9ffeda2f..2ece248ba0a 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/CoveragePackage1Import3.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import03/CoveragePackage1Import3.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import3; +package org.eclipse.osee.coverage.test.import03; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/epu/PowerUnit1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import03/epu/PowerUnit1.java index e002f1787b0..d6c8ff7bea6 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import3/epu/PowerUnit1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import03/epu/PowerUnit1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import3.epu; +package org.eclipse.osee.coverage.test.import03.epu; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; @@ -51,16 +51,12 @@ public class PowerUnit1 extends Table { try { if (getStyle() == 4) { // 2, 1, TestUnit2 System.out.println("clear it"); // 2, 2, n - } else { - for (int x = 0; x < 34; x++) { - System.err.println("clear");// 2, 2, n - } } } catch (IllegalArgumentException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n + OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 3, n } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 5, n + OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n } } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import4/CoverageImport4TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import04/CoverageImport4TestBlam.java index 49eb316fd95..e36b6cd9bb2 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import4/CoverageImport4TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import04/CoverageImport4TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import4; +package org.eclipse.osee.coverage.test.import04; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -25,7 +25,7 @@ public class CoverageImport4TestBlam extends CoverageImportTestBlam { public CoverageImport4TestBlam() { super(NAME, Arrays.asList( // - "import4/epu/PowerUnit1.java", "import1/epu/PowerUnit2.java", "import2/epu/PowerUnit3.java" + "import04/epu/PowerUnit1.java", "import01/epu/PowerUnit2.java", "import02/epu/PowerUnit3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import4/CoveragePackage1Import4.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import04/CoveragePackage1Import4.java index 61deb14cf1b..9bced94f9f6 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import4/CoveragePackage1Import4.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import04/CoveragePackage1Import4.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import4; +package org.eclipse.osee.coverage.test.import04; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import4/epu/PowerUnit1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import04/epu/PowerUnit1.java index 3acbd70d1f7..8e073836b15 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import4/epu/PowerUnit1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import04/epu/PowerUnit1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import4.epu; +package org.eclipse.osee.coverage.test.import04.epu; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; @@ -51,16 +51,12 @@ public class PowerUnit1 extends Table { try { if (getStyle() == 4) { // 2, 1, TestUnit2 System.out.println("clear it"); // 2, 2, n - } else { - for (int x = 0; x < 34; x++) { - System.err.println("clear");// 2, 2, n - } } } catch (IllegalArgumentException ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n + OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 3, n } catch (Exception ex) { - OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 5, n + OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n } } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import5/CoverageImport5TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import05/CoverageImport5TestBlam.java index f1e31701a01..bb867df79b9 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import5/CoverageImport5TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import05/CoverageImport5TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import5; +package org.eclipse.osee.coverage.test.import05; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -25,8 +25,8 @@ public class CoverageImport5TestBlam extends CoverageImportTestBlam { public CoverageImport5TestBlam() { super(NAME, Arrays.asList( // - "import5/nav/NavigationButton1.java", "import1/nav/NavigationButton2.java", - "import1/nav/NavigationButton3.java" + "import05/nav/NavigationButton1.java", "import01/nav/NavigationButton2.java", + "import01/nav/NavigationButton3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import5/CoveragePackage1Import5.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import05/CoveragePackage1Import5.java index 796ccb11397..7b77c584c58 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import5/CoveragePackage1Import5.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import05/CoveragePackage1Import5.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import5; +package org.eclipse.osee.coverage.test.import05; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import5/nav/NavigationButton1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import05/nav/NavigationButton1.java index 14e4e7cb827..40468ba5a81 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import5/nav/NavigationButton1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import05/nav/NavigationButton1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import5.nav; +package org.eclipse.osee.coverage.test.import05.nav; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import6/CoverageImport6TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import06/CoverageImport6TestBlam.java index 400faeb1499..8b00e42d528 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import6/CoverageImport6TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import06/CoverageImport6TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import6; +package org.eclipse.osee.coverage.test.import06; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -25,7 +25,7 @@ public class CoverageImport6TestBlam extends CoverageImportTestBlam { public CoverageImport6TestBlam() { super(NAME, Arrays.asList( // - "import4/epu/PowerUnit1.java", "import6/epu/PowerUnit2.java", "import2/epu/PowerUnit3.java" + "import04/epu/PowerUnit1.java", "import06/epu/PowerUnit2.java", "import02/epu/PowerUnit3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import6/CoveragePackage1Import6.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import06/CoveragePackage1Import6.java index 73e40a3785f..4feeb3de724 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import6/CoveragePackage1Import6.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import06/CoveragePackage1Import6.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import6; +package org.eclipse.osee.coverage.test.import06; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import6/epu/PowerUnit2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import06/epu/PowerUnit2.java index e265130b38a..b06e847ca17 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import6/epu/PowerUnit2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import06/epu/PowerUnit2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import6.epu; +package org.eclipse.osee.coverage.test.import06.epu; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import7/CoverageImport7TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import07/CoverageImport7TestBlam.java index 446a841e58b..dbbc9bb4d8b 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import7/CoverageImport7TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import07/CoverageImport7TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import7; +package org.eclipse.osee.coverage.test.import07; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -25,7 +25,7 @@ public class CoverageImport7TestBlam extends CoverageImportTestBlam { public CoverageImport7TestBlam() { super(NAME, Arrays.asList( // - "import7/apu/AuxPowerUnit1.java", "import1/apu/AuxPowerUnit2.java" + "import07/apu/AuxPowerUnit1.java", "import01/apu/AuxPowerUnit2.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import7/CoveragePackage1Import7.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import07/CoveragePackage1Import7.java index 5a54da6fb8f..a894d886b62 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import7/CoveragePackage1Import7.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import07/CoveragePackage1Import7.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import7; +package org.eclipse.osee.coverage.test.import07; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import7/apu/AuxPowerUnit1.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import07/apu/AuxPowerUnit1.java index e17755d9095..b31186727ec 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import7/apu/AuxPowerUnit1.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import07/apu/AuxPowerUnit1.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import7.apu; +package org.eclipse.osee.coverage.test.import07.apu; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import8/CoverageImport8TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import08/CoverageImport8TestBlam.java index f4cbc54e386..de684b8a330 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import8/CoverageImport8TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import08/CoverageImport8TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import8; +package org.eclipse.osee.coverage.test.import08; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -25,8 +25,8 @@ public class CoverageImport8TestBlam extends CoverageImportTestBlam { public CoverageImport8TestBlam() { super(NAME, Arrays.asList( // - "import5/nav/NavigationButton1.java", "import8/nav/NavigationButton2.java", - "import1/nav/NavigationButton3.java" + "import05/nav/NavigationButton1.java", "import08/nav/NavigationButton2.java", + "import01/nav/NavigationButton3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import8/CoveragePackage1Import8.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import08/CoveragePackage1Import8.java index 0bf83fd5227..087b5c2f61b 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import8/CoveragePackage1Import8.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import08/CoveragePackage1Import8.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import8; +package org.eclipse.osee.coverage.test.import08; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import8/nav/NavigationButton2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import08/nav/NavigationButton2.java index dbfd114f44f..f5f0d19a14e 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import8/nav/NavigationButton2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import08/nav/NavigationButton2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import8.nav; +package org.eclipse.osee.coverage.test.import08.nav; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoverageImport9TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import09/CoverageImport9TestBlam.java index 32dc9ff5f3d..2318b5bf4a6 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoverageImport9TestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import09/CoverageImport9TestBlam.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import9; +package org.eclipse.osee.coverage.test.import09; import java.util.Arrays; import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; @@ -25,8 +25,8 @@ public class CoverageImport9TestBlam extends CoverageImportTestBlam { public CoverageImport9TestBlam() { super(NAME, Arrays.asList( // - "import5/nav/NavigationButton1.java", "import9/nav/NavigationButton2.java", - "import1/nav/NavigationButton3.java" + "import05/nav/NavigationButton1.java", "import09/nav/NavigationButton2.java", + "import01/nav/NavigationButton3.java" // )); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoveragePackage1Import9.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import09/CoveragePackage1Import9.java index 55f2e9f4f84..18d20eb83e5 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/CoveragePackage1Import9.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import09/CoveragePackage1Import9.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import9; +package org.eclipse.osee.coverage.test.import09; import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/nav/NavigationButton2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import09/nav/NavigationButton2.java index 8312c17fda2..280080574de 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import9/nav/NavigationButton2.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import09/nav/NavigationButton2.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.coverage.test.import9.nav; +package org.eclipse.osee.coverage.test.import09.nav; import java.util.logging.Level; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoverageImport10TestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoverageImport10TestBlam.java new file mode 100644 index 00000000000..fa9d610d896 --- /dev/null +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoverageImport10TestBlam.java @@ -0,0 +1,40 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.test.import10; + +import java.util.Arrays; +import org.eclipse.osee.coverage.test.util.CoverageImportTestBlam; + +/** + * Improvement to resolving coverage method differences<br> + * - If coverage item CM is Test_Unit and import item is Not_Covered, overwrite with Not_Covered <br> + * - If coverage item CM is a custom disposition and import is Not_Covered, do NOT overwrite coverage item <br> + * - If coverage item CM is a custom disposition and import is Test_Unit, overwrite with Test_Unit and clear out + * rationale <br> + * <br> + * See comments in NavigationButton2.java file for details + * + * @author Donald G. Dunne + */ +public class CoverageImport10TestBlam extends CoverageImportTestBlam { + + public static String NAME = "Test Import 10"; + + public CoverageImport10TestBlam() { + super(NAME, Arrays.asList( + // + "import05/nav/NavigationButton1.java", "import10/nav/NavigationButton2.java", + "import01/nav/NavigationButton3.java" + // + )); + } + +}
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoveragePackage1Import10.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoveragePackage1Import10.java new file mode 100644 index 00000000000..e3eca759324 --- /dev/null +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoveragePackage1Import10.java @@ -0,0 +1,34 @@ +/******************************************************************************* + * Copyright (c) 2004, 2007 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.test.import10; + +import org.eclipse.osee.coverage.test.util.CpSelectAndImportItem; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; + +/** + * Improvement to resolving coverage method differences<br> + * - If coverage item CM is Test_Unit and import item is Not_Covered, overwrite with Not_Covered <br> + * - If coverage item CM is a custom disposition and import is Not_Covered, do NOT overwrite coverage item <br> + * - If coverage item CM is a custom disposition and import is Test_Unit, overwrite with Test_Unit and clear out + * rationale<br> + * <br> + * See comments in NavigationButton2.java file for details + * + * @author Donald G. Dunne + */ +public class CoveragePackage1Import10 extends CpSelectAndImportItem { + + public CoveragePackage1Import10(XNavigateItem parent) { + super(parent, "Open CP 1 - Import 10 - Improvement to resolving coverage method differences", + CoverageImport10TestBlam.NAME); + } + +} diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoveragePackage1Import10a.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoveragePackage1Import10a.java new file mode 100644 index 00000000000..eed70830e6a --- /dev/null +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/CoveragePackage1Import10a.java @@ -0,0 +1,50 @@ +/* + * Created on Apr 4, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.coverage.test.import10; + +import org.eclipse.osee.coverage.editor.CoverageEditor; +import org.eclipse.osee.coverage.editor.CoverageEditorInput; +import org.eclipse.osee.coverage.model.CoveragePackage; +import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; +import org.eclipse.osee.coverage.test.CoveragePackageImportTest; +import org.eclipse.osee.coverage.test.util.CoverageTestUtil; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.plugin.util.Result; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; +import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; + +/** + * @author Donald G. Dunne + */ +public class CoveragePackage1Import10a extends XNavigateItem { + + public CoveragePackage1Import10a(XNavigateItem parent) { + super(parent, "Open CP 1 - Import 10a - Setup coverage methods for Import 10", null); + } + + @Override + public void run(TableLoadOption... tableLoadOptions) throws Exception { + super.run(tableLoadOptions); + + CoverageUtil.setNavigatorSelectedBranch(CoverageTestUtil.getTestBranch()); + Artifact coveragePackageArtifact = CoverageTestUtil.getSelectedCoveragePackageFromDialog(); + if (coveragePackageArtifact == null) { + return; + } + CoveragePackage coveragePackage = new OseeCoveragePackageStore(coveragePackageArtifact).getCoveragePackage(); + + Result result = CoveragePackageImportTest.setupCoveragePackageForImport10(coveragePackage); + if (result.isFalse()) { + result.popup(); + } + + CoverageEditor.open(new CoverageEditorInput(coveragePackage.getName(), coveragePackageArtifact, coveragePackage, + true)); + + } + +} diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/nav/NavigationButton2.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/nav/NavigationButton2.java new file mode 100644 index 00000000000..11068b59812 --- /dev/null +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/import10/nav/NavigationButton2.java @@ -0,0 +1,70 @@ +/******************************************************************************* + * 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.test.import10.nav; + +import java.util.logging.Level; +import org.eclipse.osee.coverage.internal.Activator; +import org.eclipse.osee.framework.logging.OseeLog; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Button; +import org.eclipse.swt.widgets.Composite; + +/** + * @author Donald G. Dunne + */ +public class NavigationButton2 extends Button { + + public Image image; + + public NavigationButton2(Composite parent, int style, Image image) { + super(parent, style); + } + + @Override + public String getText() { + try { + if (getStyle() == 4) { // 1, 1, TestUnit2 + } + } catch (Exception ex) { + OseeLog.log(Activator.class, Level.SEVERE, ex); // 1, 2, n + } + // - If coverage item CM is a custom disposition and import is Not_Covered, DO NOT overwrite coverage item + // Note: CoveragePackage will have to be changed programatically in test for this case cause can't import disposition item + // Note: This line was n in import09 + // After test setup, stored coverage package, this line will be Deactivated_Code + // After import10, this line will be Deactivated_Code (no change from test setup) + return "Navigate"; // 1, 3, n + } + + @Override + public Image getImage() { + try { + if (getStyle() == 4) { // 2, 1, TestUnit2 + // - If coverage item CM is Test_Unit and import item is Not_Covered, overwrite with Not_Covered + // Note: This line was TestUnit2 in import09 + // After test setup, stored coverage package will be TestUnit2 (no change from import09) + // After import10, this line will be Not_Covered (one less # covered item, one less Test_Unit, one more Not_Covered) + return this.image; // 2, 2, n + } else { + // - If coverage item CM is a custom disposition and import is Test_Unit, overwrite with Test_Unit and clear rationale + // Note: CoveragePackage will have to be changed programatically in test for this case cause can't import disposition item + // Note: This line was TestUnit2 in import09 + // After test setup, stored coverage package, this line will be Deactivated_Code + // After import10, this line will be Test_Unit, (same # covered items, one less Deactived_Code, one more Test_Unit) + return super.getImage(); // 2, 3, TestUnit2 + } + } catch (IllegalArgumentException ex) { + OseeLog.log(Activator.class, Level.SEVERE, ex); // 2, 4, n + } + return null; // 2, 5, TestUnit2 + } + +} diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java index 9e0d95000cc..2a87324327f 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitPersistTest.java @@ -30,7 +30,7 @@ import org.eclipse.osee.coverage.model.SimpleWorkProductTaskProvider; import org.eclipse.osee.coverage.store.CoverageArtifactTypes; import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; import org.eclipse.osee.coverage.test.SampleJavaFileParser; -import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam; +import org.eclipse.osee.coverage.test.import01.CoverageImport1TestBlam; import org.eclipse.osee.coverage.test.util.CoverageTestUtil; import org.eclipse.osee.coverage.util.CoverageUtil; import org.eclipse.osee.coverage.util.ISaveable; @@ -56,7 +56,7 @@ public class CoverageUnitPersistTest { public static CoverageItem ci = null; public static String parentGuid = null; public static String guid = null; - public static String PATH = "../../../../../../../src/org/eclipse/osee/coverage/test/import1/"; + public static String PATH = "../../../../../../../src/org/eclipse/osee/coverage/test/import01/"; public static CoverageImport coverageImport; public static CoveragePackage saveCoveragePackage; public static CoveragePackage loadCoveragePackage; @@ -86,7 +86,7 @@ public class CoverageUnitPersistTest { URL url = CoverageImport1TestBlam.class.getResource(PATH + filename); CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url, coverageImport.getCoverageUnitFileContentsProvider()); - String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import1.", ""); + String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import01.", ""); coverageUnit.setNamespace(namespace); CoverageUnit parentCoverageUnit = coverageImport.getOrCreateParent(namespace); if (parentCoverageUnit != null) { diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java index 98e897f4f89..9cd780db01b 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/navigate/CoverageTestNavigateViews.java @@ -13,16 +13,18 @@ package org.eclipse.osee.coverage.test.navigate; import java.util.ArrayList; import java.util.List; import org.eclipse.osee.coverage.navigate.ICoverageNavigateItem; -import org.eclipse.osee.coverage.test.import1.CoveragePackage1Import1; -import org.eclipse.osee.coverage.test.import1.CoveragePackage1Import1B; -import org.eclipse.osee.coverage.test.import2.CoveragePackage1Import2; -import org.eclipse.osee.coverage.test.import3.CoveragePackage1Import3; -import org.eclipse.osee.coverage.test.import4.CoveragePackage1Import4; -import org.eclipse.osee.coverage.test.import5.CoveragePackage1Import5; -import org.eclipse.osee.coverage.test.import6.CoveragePackage1Import6; -import org.eclipse.osee.coverage.test.import7.CoveragePackage1Import7; -import org.eclipse.osee.coverage.test.import8.CoveragePackage1Import8; -import org.eclipse.osee.coverage.test.import9.CoveragePackage1Import9; +import org.eclipse.osee.coverage.test.import01.CoveragePackage1Import1; +import org.eclipse.osee.coverage.test.import01.CoveragePackage1Import1B; +import org.eclipse.osee.coverage.test.import02.CoveragePackage1Import2; +import org.eclipse.osee.coverage.test.import03.CoveragePackage1Import3; +import org.eclipse.osee.coverage.test.import04.CoveragePackage1Import4; +import org.eclipse.osee.coverage.test.import05.CoveragePackage1Import5; +import org.eclipse.osee.coverage.test.import06.CoveragePackage1Import6; +import org.eclipse.osee.coverage.test.import07.CoveragePackage1Import7; +import org.eclipse.osee.coverage.test.import08.CoveragePackage1Import8; +import org.eclipse.osee.coverage.test.import09.CoveragePackage1Import9; +import org.eclipse.osee.coverage.test.import10.CoveragePackage1Import10a; +import org.eclipse.osee.coverage.test.import10.CoveragePackage1Import10; import org.eclipse.osee.coverage.test.package1.CoveragePackage1; import org.eclipse.osee.framework.ui.plugin.OseeUiActivator; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateItem; @@ -56,6 +58,8 @@ public class CoverageTestNavigateViews implements ICoverageNavigateItem { items.add(new CoveragePackage1Import7(null)); items.add(new CoveragePackage1Import8(null)); items.add(new CoveragePackage1Import9(null)); + items.add(new CoveragePackage1Import10a(null)); + items.add(new CoveragePackage1Import10(null)); items.add(new CreateWorkProductAction(null)); return items; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java index a093bb83817..92c8b5e6120 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageImportTestBlam.java @@ -22,7 +22,7 @@ import org.eclipse.osee.coverage.model.CoverageImport; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.SimpleCoverageUnitFileContentsProvider; import org.eclipse.osee.coverage.test.SampleJavaFileParser; -import org.eclipse.osee.coverage.test.import1.CoverageImport1TestBlam; +import org.eclipse.osee.coverage.test.import01.CoverageImport1TestBlam; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; @@ -90,7 +90,7 @@ public class CoverageImportTestBlam extends AbstractCoverageBlam implements ICov URL url = CoverageImport1TestBlam.class.getResource(PATH + filename); CoverageUnit coverageUnit = SampleJavaFileParser.createCodeUnit(url, coverageImport.getCoverageUnitFileContentsProvider()); - String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import..", ""); + String namespace = coverageUnit.getNamespace().replaceFirst("org.eclipse.osee.coverage.test.import...", ""); coverageUnit.setNamespace(namespace); CoverageUnit parentCoverageUnit = coverageImport.getOrCreateParent(namespace); if (parentCoverageUnit != null) { diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java index 590a83c81a8..14a129e8e41 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CoverageTestUtil.java @@ -21,6 +21,9 @@ import org.eclipse.osee.coverage.model.CoveragePackageBase; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.store.CoverageArtifactTypes; +import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; +import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -113,4 +116,19 @@ public class CoverageTestUtil { } return null; } + + public static Artifact getSelectedCoveragePackageFromDialog() throws OseeCoreException { + CoveragePackageArtifactListDialog dialog = + new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package"); + if (!CoverageUtil.getBranchFromUser(false)) { + return null; + } + dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts(CoverageUtil.getBranch())); + if (dialog.open() != 0) { + return null; + } + Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0]; + return coveragePackageArtifact; + } + } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java index e8af1323fa8..e69564a0df0 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/util/CpSelectAndImportItem.java @@ -15,7 +15,6 @@ import org.eclipse.osee.coverage.editor.CoverageEditorInput; import org.eclipse.osee.coverage.model.CoveragePackage; import org.eclipse.osee.coverage.store.OseeCoveragePackageStore; import org.eclipse.osee.coverage.util.CoverageUtil; -import org.eclipse.osee.coverage.util.dialog.CoveragePackageArtifactListDialog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.xnavigate.XNavigateComposite.TableLoadOption; @@ -37,16 +36,7 @@ public class CpSelectAndImportItem extends XNavigateItemAction { @Override public void run(TableLoadOption... tableLoadOptions) throws Exception { CoverageUtil.getBranchFromUser(false); - CoveragePackageArtifactListDialog dialog = - new CoveragePackageArtifactListDialog("Open Coverage Package", "Select Coverage Package"); - if (!CoverageUtil.getBranchFromUser(false)) { - return; - } - dialog.setInput(OseeCoveragePackageStore.getCoveragePackageArtifacts(CoverageUtil.getBranch())); - if (dialog.open() != 0) { - return; - } - Artifact coveragePackageArtifact = (Artifact) dialog.getResult()[0]; + Artifact coveragePackageArtifact = CoverageTestUtil.getSelectedCoveragePackageFromDialog(); CoveragePackage coveragePackage = OseeCoveragePackageStore.get(coveragePackageArtifact); CoverageEditor.open(new CoverageEditorInput(coveragePackage.getName(), coveragePackageArtifact, coveragePackage, true)); @@ -67,4 +57,5 @@ public class CpSelectAndImportItem extends XNavigateItemAction { } editor.simulateImport(blamImportName); } + } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java index ec2de161256..678302d48b5 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoverUnitAction.java @@ -79,8 +79,7 @@ public class DeleteCoverUnitAction extends Action { new SkynetTransaction(saveable.getBranch(), "Coverage - Delete Coverage Unit"); ICoverage coverage = selectedCoverageEditorItem.getSelectedCoverageEditorItems().iterator().next(); CoveragePackage coveragePackage = (CoveragePackage) CoverageUtil.getParentCoveragePackageBase(coverage); - CoveragePackageEvent coverageEvent = - new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified); + CoveragePackageEvent coverageEvent = new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified); List<ICoverage> deleteItems = new ArrayList<ICoverage>(); for (ICoverage coverageItem : selectedCoverageEditorItem.getSelectedCoverageEditorItems()) { if (coverageItem.getParent() instanceof ICoverageUnitProvider) { @@ -91,7 +90,7 @@ public class DeleteCoverUnitAction extends Action { } } transaction.execute(); - CoverageEventManager.getInstance().sendRemoteEvent(coverageEvent); + CoverageEventManager.instance.sendRemoteEvent(coverageEvent); for (ICoverage coverageItem : deleteItems) { refreshable.remove(coverageItem); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java index ec674a339d2..58622c6b720 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/DeleteCoveragePackageAction.java @@ -83,7 +83,7 @@ public class DeleteCoveragePackageAction extends Action { if (!purge) { transaction.execute(); } - CoverageEventManager.getInstance().sendRemoteEvent(coverageEvent); + CoverageEventManager.instance.sendRemoteEvent(coverageEvent); } } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java index eda8e2bcb11..f46f79a234e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/NewCoveragePackageAction.java @@ -62,11 +62,10 @@ public class NewCoveragePackageAction extends Action { new CoveragePackage(dialog.getEntry(), CoverageOptionManagerDefault.instance(), new DbWorkProductTaskProvider(branch)); SkynetTransaction transaction = new SkynetTransaction(branch, "Add Coverage Package"); - CoveragePackageEvent coverageEvent = - new CoveragePackageEvent(coveragePackage, CoverageEventType.Added); + CoveragePackageEvent coverageEvent = new CoveragePackageEvent(coveragePackage, CoverageEventType.Added); OseeCoveragePackageStore.get(coveragePackage, branch).save(transaction, coverageEvent); transaction.execute(); - CoverageEventManager.getInstance().sendRemoteEvent(coverageEvent); + CoverageEventManager.instance.sendRemoteEvent(coverageEvent); CoverageEditor.open(new CoverageEditorInput(dialog.getEntry(), OseeCoveragePackageStore.get( coveragePackage, branch).getArtifact(false), coveragePackage, false)); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java index 96af7f0b071..7b8c741d49a 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/action/ViewSourceAction.java @@ -84,7 +84,7 @@ public class ViewSourceAction extends Action { html = html.replaceAll("HEREBEGIN", "<FONT style=\"BACKGROUND-COLOR: yellow\">"); html = html.replaceAll("HEREEND", "</FONT>"); ResultsEditor.open("source", - CoverageUtil.getFullPathWithName(item.getParent()) + "[" + item.getName() + "]", html); + CoverageUtil.getFullPathWithName(item.getParent(), true) + "[" + item.getName() + "]", html); } else { AWorkbench.popup("No File Contents Available"); return; @@ -99,7 +99,7 @@ public class ViewSourceAction extends Action { } String html = AHTML.textToHtml(text); html = html.replaceAll(" ", " "); - ResultsEditor.open("source", CoverageUtil.getFullPathWithName(item), html); + ResultsEditor.open("source", CoverageUtil.getFullPathWithName(item, true), html); } } catch (OseeCoreException ex) { diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java index 35ab3d17b6c..82816288663 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditor.java @@ -131,7 +131,7 @@ public class CoverageEditor extends FormEditor implements IActionable { } monitor.worked(1); - CoverageEventManager.getInstance().register(editor); + CoverageEventManager.instance.register(editor); // elapsedTime.end(); } @@ -245,7 +245,7 @@ public class CoverageEditor extends FormEditor implements IActionable { @Override public void dispose() { - CoverageEventManager.getInstance().unregister(this); + CoverageEventManager.instance.unregister(this); super.dispose(); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java index dae2ae78d82..dfc2e96d76c 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorImportTab.java @@ -228,6 +228,7 @@ public class CoverageEditorImportTab extends FormPage { @Override public void done(IJobChangeEvent event) { + blamOutputSection.appendText(String.format("BLAM completed in [%s]\n", Lib.getElapseString(startTime))); super.done(event); } } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java index d2cf43d6b27..591a63395ee 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorMergeTab.java @@ -52,6 +52,7 @@ import org.eclipse.osee.framework.logging.OseeLevel; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; +import org.eclipse.osee.framework.skynet.core.utility.ElapsedTime; import org.eclipse.osee.framework.ui.plugin.util.AWorkbench; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.plugin.util.Result; @@ -325,15 +326,19 @@ public class CoverageEditorMergeTab extends FormPage implements ISaveable { @Override protected void doWork(IProgressMonitor monitor) throws Exception { - final XResultData resultData = new XResultData(); + + final ElapsedTime elapsedTime = new ElapsedTime(getName()); + final XResultData resultData = new XResultData(false); final List<IMergeItem> mergeItems = mergeManager.getMergeItems(resultData); Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { + elapsedTime.logPoint("setInput"); xImportViewer2.getXViewer().setInput(mergeItems); if (debugReport) { resultData.report("Re-Load"); } + elapsedTime.end(); } }); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java index 4830f88ba6f..b50d46d9d82 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/CoverageEditorOverviewTab.java @@ -23,6 +23,7 @@ import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoveragePackageBase; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.util.CoverageUtil; +import org.eclipse.osee.coverage.validate.CoveragePackageOrderValidator; import org.eclipse.osee.framework.jdk.core.util.AHTML; import org.eclipse.osee.framework.ui.plugin.util.HelpUtil; import org.eclipse.osee.framework.ui.skynet.action.RefreshAction; @@ -117,6 +118,9 @@ public class CoverageEditorOverviewTab extends FormPage implements IRefreshActio } rd.addRaw(AHTML.newline()); rd.addRaw(AHTML.getLabelValueStr("\nEditor Branch", branchName)); + + new CoveragePackageOrderValidator(coveragePackageBase, rd).run(); + if (coveragePackageBase.getLog() != null) { rd.log(AHTML.newline() + AHTML.bold("Log:") + AHTML.newline()); rd.addRaw(coveragePackageBase.getLog().getReport("").getManipulatedHtml()); @@ -125,8 +129,8 @@ public class CoverageEditorOverviewTab extends FormPage implements IRefreshActio Displays.ensureInDisplayThread(new Runnable() { @Override public void run() { - xResultsComp.setHtmlText(rd.getReport(coveragePackageBase.getName()).getManipulatedHtml(), - coveragePackageBase.getName()); + String html = rd.getReport(coveragePackageBase.getName()).getManipulatedHtml(); + xResultsComp.setHtmlText(html, coveragePackageBase.getName()); } }); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeLabelProvider.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeLabelProvider.java index a6a1b0b6f66..0f59d3b1fb5 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeLabelProvider.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/editor/xmerge/CoverageMergeLabelProvider.java @@ -15,8 +15,11 @@ import org.eclipse.nebula.widgets.xviewer.XViewerColumn; import org.eclipse.osee.coverage.editor.xcover.CoverageLabelProvider; import org.eclipse.osee.coverage.editor.xcover.CoverageXViewerFactory; import org.eclipse.osee.coverage.merge.IMergeItem; +import org.eclipse.osee.coverage.merge.MergeItem; import org.eclipse.osee.coverage.merge.MergeItemGroup; +import org.eclipse.osee.coverage.merge.MergeType; import org.eclipse.osee.coverage.merge.MessageMergeItem; +import org.eclipse.osee.coverage.model.CoverageItem; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.ICoverage; import org.eclipse.osee.coverage.store.OseeCoverageUnitStore; @@ -98,6 +101,14 @@ public class CoverageMergeLabelProvider extends CoverageLabelProvider { if (!((IMergeItem) element).isImportAllowed()) { return ""; } + if (element instanceof MergeItem && ((MergeItem) element).getMergeType() == MergeType.CI_Method_Update) { + MergeItem mergeItem = (MergeItem) element; + if (mergeItem.getPackageItem() instanceof CoverageItem) { + return String.format("%s from [%s] to [%s]", mergeItem.getMergeType().toString(), + ((CoverageItem) mergeItem.getPackageItem()).getCoverageMethod().getName(), + ((CoverageItem) mergeItem.getImportItem()).getCoverageMethod().getName()); + } + } return ((IMergeItem) element).getMergeType().toString(); } if (coverage instanceof MergeItemGroup) { diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java index e110eac142f..360716a5ddc 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/CoverageEventManager.java @@ -55,16 +55,12 @@ import org.eclipse.osee.framework.ui.skynet.SkynetGuiPlugin; */ public class CoverageEventManager implements IArtifactEventListener, OseeMessagingStatusCallback { - private static CoverageEventManager instance = new CoverageEventManager(); + public static CoverageEventManager instance = new CoverageEventManager(); private final List<CoverageEditor> editors = new ArrayList<CoverageEditor>(); private ArtifactTypeEventFilter artifactTypeEventFilter; private ConnectionNode connectionNode; private OseeMessagingTracker oseeMessagingTracker; - public static CoverageEventManager getInstance() { - return instance; - } - public static void dispose() { instance.stopListeneingForFrameworkEvents(); instance.stopListeningForRemoteCoverageEvents(); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java index 34a0b6dd844..bfe6f15b253 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/event/OseeMessagingTracker.java @@ -36,7 +36,7 @@ public class OseeMessagingTracker extends ServiceTracker { MessageService service = (MessageService) super.addingService(reference); try { connectionNode = service.getDefault(); - CoverageEventManager.getInstance().addingRemoteEventService(connectionNode); + CoverageEventManager.instance.addingRemoteEventService(connectionNode); } catch (OseeCoreException ex) { OseeLog.log(OseeMessagingTracker.class, Level.SEVERE, ex); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java index a7d56a9455d..08ab07afec2 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeImportManager.java @@ -14,6 +14,7 @@ import java.util.Collection; import org.eclipse.osee.coverage.internal.Activator; import org.eclipse.osee.coverage.model.CoverageImport; import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoveragePackage; import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.ICoverage; @@ -183,6 +184,9 @@ public class MergeImportManager { CoverageItem importItem = (CoverageItem) ((MergeItem) mergeItem).getImportItem(); CoverageItem packageItem = (CoverageItem) ((MergeItem) mergeItem).getPackageItem(); packageItem.setCoverageMethod(importItem.getCoverageMethod()); + if (importItem.getCoverageMethod().getName().equals(CoverageOptionManager.Test_Unit.name)) { + packageItem.setRationale(""); + } updateFileContents(packageItem, importItem); } @@ -194,7 +198,8 @@ public class MergeImportManager { } private void updateFileContents(CoverageUnit packageUnit, CoverageUnit importUnit) throws OseeCoreException { - if (!packageUnit.getFileContents().equals(importUnit.getFileContents())) { + if (Strings.isValid(importUnit.getFileContents()) && !packageUnit.getFileContents().equals( + importUnit.getFileContents())) { packageUnit.setFileContents(importUnit.getFileContents()); } if (packageUnit.getParent() != null && packageUnit.getParent() instanceof CoverageUnit) { diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java index c17485e2c0a..f5a8d99eb79 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItem.java @@ -176,6 +176,11 @@ public class MergeItem extends MergeItemBase { } @Override + public String toStringNoPackage() { + return toString(); + } + + @Override public String getOrderNumber() { if (Strings.isValid(importItem.getOrderNumber())) { return importItem.getOrderNumber(); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java index 03f3a0dafe5..123f5070fe2 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeItemGroup.java @@ -43,6 +43,11 @@ public class MergeItemGroup extends MergeItemBase { } @Override + public String toStringNoPackage() { + return toString(); + } + + @Override public String getAssignees() { return ""; } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java index b6d5188e21e..908a0cbc4c7 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/merge/MergeManager.java @@ -23,6 +23,8 @@ import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; import org.eclipse.osee.coverage.model.CoverageImport; import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoverageOption; +import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoveragePackage; import org.eclipse.osee.coverage.model.CoveragePackageBase; import org.eclipse.osee.coverage.model.ICoverage; @@ -314,7 +316,17 @@ public class MergeManager { if (!(importItem instanceof CoverageItem)) { return false; } - if (!((CoverageItem) importItem).getCoverageMethod().equals(((CoverageItem) packageItem).getCoverageMethod())) { + + CoverageOption oldExistingOption = ((CoverageItem) packageItem).getCoverageMethod(); + CoverageOption newImportOption = ((CoverageItem) importItem).getCoverageMethod(); + boolean oldIsAnalystDispositionOption = + CoverageOptionManager.isAnalystDispositionedCoverageOption(oldExistingOption); + // If existing is an Analyst Disposition Option, don't overwrite with Not_Covered + if (oldIsAnalystDispositionOption && newImportOption.equals(CoverageOptionManager.Not_Covered)) { + return false; + } + // Else if new is different than old, overwrite old + else if (!newImportOption.equals(oldExistingOption)) { return true; } return false; diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java index 381e5064a69..21bf872364e 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageImport.java @@ -138,4 +138,14 @@ public class CoverageImport extends CoveragePackageBase { return super.equals(obj); } + @Override + public String toString() { + return getName(); + } + + @Override + public String toStringNoPackage() { + return getName(); + } + } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java index abc94f1efe4..6e8d9673ccd 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageItem.java @@ -132,6 +132,13 @@ public class CoverageItem extends NamedIdentity implements ICoverage, IWorkProdu } @Override + public String toStringNoPackage() { + return String.format("[Item : [%s][M: %s][E: %s][%s][Name: %s][Path: %s]]", getCoverageMethod(), + getCoverageUnit().getOrderNumber(), getOrderNumber(), getGuid(), getName(), + CoverageUtil.getFullPath(this, false)); + } + + @Override public Result isEditable() { return Result.FalseResult; } @@ -167,7 +174,7 @@ public class CoverageItem extends NamedIdentity implements ICoverage, IWorkProdu } public String getRationale() { - return rationale; + return rationale == null ? "" : rationale; } public void setRationale(String rationale) { diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java index f4662ea93e6..4eccb0caf2d 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageOptionManager.java @@ -55,6 +55,13 @@ public class CoverageOptionManager { } /** + * Coverage Option is one set during analyst disposition. !Test_Unit and !Not_Covered + */ + public static boolean isAnalystDispositionedCoverageOption(CoverageOption coverageOption) { + return !coverageOption.equals(Test_Unit) && !coverageOption.equals(Not_Covered); + } + + /** * Return valid options. If Read, all values returned. This handles the search use case where wouldn't want to set * values, but would want to search them. If Write, only enabled values are returned. * diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java index e5ce2006255..d4a643f480f 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackage.java @@ -102,4 +102,14 @@ public class CoveragePackage extends CoveragePackageBase { return super.equals(obj); } + @Override + public String toString() { + return getName(); + } + + @Override + public String toStringNoPackage() { + return getName(); + } + } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java index 86c11039862..02733104488 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageTestUnit.java @@ -32,6 +32,11 @@ public class CoverageTestUnit extends NamedIdentity implements ICoverage { } @Override + public String toStringNoPackage() { + return toString(); + } + + @Override public String getAssignees() { return ""; } @@ -118,4 +123,5 @@ public class CoverageTestUnit extends NamedIdentity implements ICoverage { public String getWorkProductTaskStr() { return ""; } + }
\ No newline at end of file diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java index d1c0f0b0f88..8ac10528605 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoverageUnit.java @@ -160,6 +160,12 @@ public class CoverageUnit extends NamedIdentity implements IWorkProductRelatable } @Override + public String toStringNoPackage() { + return String.format("[Unit [%s][M: %s][%s][Path: %s]]", getName(), getOrderNumber(), getGuid(), + CoverageUtil.getFullPath(this, false)); + } + + @Override public Result isEditable() { return Result.TrueResult; } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java index 882eccfff9d..09e9e81dfa3 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/ICoverage.java @@ -56,4 +56,5 @@ public interface ICoverage extends Named, Identity { public String getWorkProductTaskStr(); + public String toStringNoPackage(); } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java index ee64c53841e..f9293a43802 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/MessageCoverageItem.java @@ -37,6 +37,11 @@ public class MessageCoverageItem extends NamedIdentity implements ICoverage { } @Override + public String toStringNoPackage() { + return toString(); + } + + @Override public String getAssignees() { return ""; } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java index a9c61a9e573..f572e07fbd7 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoveragePackageStore.java @@ -236,7 +236,7 @@ public class OseeCoveragePackageStore extends OseeCoverageStore implements ISave CoveragePackageEvent coverageEvent = new CoveragePackageEvent(coveragePackage, CoverageEventType.Modified); save(transaction, coverageEvent, coverages); transaction.execute(); - CoverageEventManager.getInstance().sendRemoteEvent(coverageEvent); + CoverageEventManager.instance.sendRemoteEvent(coverageEvent); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); return new Result("Save Failed: " + ex.getLocalizedMessage()); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java index a64cbe7bdf5..7eb70b7a038 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/store/OseeCoverageStore.java @@ -67,7 +67,7 @@ public abstract class OseeCoverageStore extends CoverageStore { CoveragePackageEvent coverageEvent = getBaseCoveragePackageEvent(CoverageEventType.Modified); save(transaction, coverageEvent); transaction.execute(); - CoverageEventManager.getInstance().sendRemoteEvent(coverageEvent); + CoverageEventManager.instance.sendRemoteEvent(coverageEvent); } catch (OseeCoreException ex) { OseeLog.log(Activator.class, OseeLevel.SEVERE_POPUP, ex); return new Result("Save Failed: " + ex.getLocalizedMessage()); @@ -81,7 +81,7 @@ public abstract class OseeCoverageStore extends CoverageStore { CoveragePackageEvent coverageEvent = getBaseCoveragePackageEvent(CoverageEventType.Deleted); delete(transaction, coverageEvent, purge); transaction.execute(); - CoverageEventManager.getInstance().sendRemoteEvent(coverageEvent); + CoverageEventManager.instance.sendRemoteEvent(coverageEvent); } public abstract CoveragePackageEvent getBaseCoveragePackageEvent(CoverageEventType coverageEventType); diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java index 094638217a1..d510b3762bb 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/CoverageUtil.java @@ -177,28 +177,36 @@ public class CoverageUtil { /** * Returns string of all parent ICoverage items up the tree */ + public static String getFullPath(ICoverage coverage, boolean includePackageName) { + StringBuffer sb = new StringBuffer(); + getFullPathRecurse(coverage.getParent(), includePackageName, sb); + return sb.toString(); + } + public static String getFullPath(ICoverage coverage) { StringBuffer sb = new StringBuffer(); - getFullPathRecurse(coverage.getParent(), sb); + getFullPathRecurse(coverage.getParent(), true, sb); return sb.toString(); } - public static String getFullPathWithName(ICoverage coverage) { + public static String getFullPathWithName(ICoverage coverage, boolean includePackageName) { StringBuffer sb = new StringBuffer(); - getFullPathRecurse(coverage.getParent(), sb); + getFullPathRecurse(coverage.getParent(), includePackageName, sb); sb.append("[" + coverage.getName() + "]"); return sb.toString(); } - public static void getFullPathRecurse(ICoverage coverage, StringBuffer sb) { + public static void getFullPathRecurse(ICoverage coverage, boolean includePackageName, StringBuffer sb) { if (coverage == null) { return; } - getFullPathRecurse(coverage.getParent(), sb); - if (coverage instanceof CoverageImport) { + getFullPathRecurse(coverage.getParent(), includePackageName, sb); + if (coverage instanceof CoverageImport && includePackageName) { sb.append("[Import]"); } else { - sb.append("[" + coverage.getName() + "]"); + if (!(coverage instanceof CoveragePackageBase) || includePackageName) { + sb.append("[" + coverage.getName() + "]"); + } } } @@ -207,7 +215,7 @@ public class CoverageUtil { MatchItem item = MergeManager.getPackageCoverageItem(coveragePackage, importItem); if (!item.isMatch()) { System.out.println(String.format("No Match for item [%s] path [%s]", importItem, - CoverageUtil.getFullPath(importItem))); + CoverageUtil.getFullPath(importItem, false))); } } } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java index 71c8757842d..3affd1fb810 100644 --- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/util/dialog/CoveragePackageArtifactListDialog.java @@ -15,7 +15,10 @@ import org.eclipse.jface.viewers.IStructuredContentProvider; import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.Viewer; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.ui.skynet.util.ArtifactNameSorter; import org.eclipse.osee.framework.ui.swt.Displays; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; /** * @author Donald G. Dunne @@ -53,4 +56,12 @@ public class CoveragePackageArtifactListDialog extends org.eclipse.ui.dialogs.Li }); } + + @Override + protected Control createDialogArea(Composite container) { + Control control = super.createDialogArea(container); + getTableViewer().setSorter(new ArtifactNameSorter()); + return control; + } + } diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/validate/CoveragePackageOrderValidator.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/validate/CoveragePackageOrderValidator.java new file mode 100644 index 00000000000..797562a8532 --- /dev/null +++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/validate/CoveragePackageOrderValidator.java @@ -0,0 +1,102 @@ +/* + * Created on Apr 6, 2011 + * + * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE + */ +package org.eclipse.osee.coverage.validate; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.eclipse.osee.coverage.model.CoverageItem; +import org.eclipse.osee.coverage.model.CoveragePackageBase; +import org.eclipse.osee.coverage.model.CoverageUnit; +import org.eclipse.osee.coverage.model.ICoverage; +import org.eclipse.osee.framework.jdk.core.util.AHTML; +import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.eclipse.osee.framework.ui.skynet.results.XResultData; + +/** + * Validate that all coverage objects valid order numbers. Not duplicates and no missing numbers. Add error to list that + * will be showed on overview. + * + * @author Donald G. Dunne + */ +public class CoveragePackageOrderValidator { + + private final CoveragePackageBase coveragePackageBase; + private final XResultData rd; + + public CoveragePackageOrderValidator(CoveragePackageBase coveragePackageBase, XResultData rd) { + super(); + this.coveragePackageBase = coveragePackageBase; + this.rd = rd; + } + + public void run() { + List<String> orderErrors = new ArrayList<String>(); + validateCoverageOrderNums(orderErrors, coveragePackageBase.getCoverageUnits()); + if (orderErrors.size() == 0) { + rd.log(AHTML.newline() + AHTML.bold("Validation: ") + "Ok"); + } else { + rd.log(AHTML.newline() + AHTML.bold("Validation: ") + AHTML.newline()); + for (String str : orderErrors) { + rd.logError(str); + } + } + } + + private void validateCoverageOrderNums(List<String> orderErrors, List<CoverageUnit> coverageUnits) { + for (CoverageUnit coverageUnit : coverageUnits) { + + // validate coverage units + List<String> orderNums = new ArrayList<String>(); + for (CoverageUnit unit : coverageUnit.getCoverageUnits()) { + if (Strings.isValid(unit.getOrderNumber())) { + orderNums.add(unit.getOrderNumber()); + } + } + if (!orderNums.isEmpty()) { + validateNumbers("child units", orderErrors, orderNums, coverageUnit); + } + // validate coverage items + orderNums.clear(); + for (CoverageItem item : coverageUnit.getCoverageItems()) { + if (Strings.isValid(item.getOrderNumber())) { + orderNums.add(item.getOrderNumber()); + } + } + if (!orderNums.isEmpty()) { + validateNumbers("child items", orderErrors, orderNums, coverageUnit); + } + + // process children coverage units + for (CoverageUnit unit : coverageUnit.getCoverageUnits()) { + validateCoverageOrderNums(orderErrors, unit.getCoverageUnits()); + } + } + } + + private void validateNumbers(String name, List<String> orderErrors, List<String> orderNums, ICoverage coverage) { + int maxNum = 0; + Map<Integer, Boolean> maxNumToFound = new HashMap<Integer, Boolean>(); + for (String number : orderNums) { + int orderNum = new Integer(number); + if (orderNum > maxNum) { + maxNum = orderNum; + } + if (maxNumToFound.containsKey(orderNum)) { + orderErrors.add(String.format("Found duplicate [%s] order num [%s] for %s", name, orderNum, + coverage.toStringNoPackage())); + } + maxNumToFound.put(orderNum, true); + } + for (int x = 1; x <= orderNums.size(); x++) { + if (!maxNumToFound.containsKey(x)) { + orderErrors.add(String.format("[%s] order num [%s] not found for %s", name, x, coverage.toStringNoPackage())); + } + } + } + +} diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ElapsedTime.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ElapsedTime.java index e58b776b9c5..a5e2f5f5bd5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ElapsedTime.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/utility/ElapsedTime.java @@ -32,6 +32,10 @@ public class ElapsedTime { System.out.println("\n" + name + " - start " + DateUtil.getTimeStamp()); } + public void logPoint(String pointName) { + System.out.println("\n" + name + " - [" + pointName + "] " + DateUtil.getTimeStamp()); + } + public void end() { endDate = new Date(); long diff = endDate.getTime() - startDate.getTime(); |