diff options
Diffstat (limited to 'plugins')
205 files changed, 624 insertions, 675 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch b/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch index 529da31e002..0e3be9f995b 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite.launch @@ -1,12 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <setAttribute key="additional_plugins"> -<setEntry value="com.google.guava:10.0.1.v201203051515:default:true"/> -<setEntry value="com.google.guava:12.0.0.v201212092141:default:true"/> -<setEntry value="org.eclipse.core.runtime.compatibility:3.2.200.v20120521-2346:default:true"/> -<setEntry value="org.eclipse.osee.ats.client.integration.tests:0.11.0.qualifier:default:true"/> -<setEntry value="org.eclipse.osee.client.integration.tests:0.11.0.qualifier:default:false"/> -<setEntry value="org.eclipse.osee.client.test.framework:0.11.0.qualifier:default:false"/> +<setEntry value="org.eclipse.osee.ats.client.integration.tests:0.11.1.qualifier:default:true"/> +<setEntry value="org.eclipse.osee.client.integration.tests:0.11.1.qualifier:default:true"/> +<setEntry value="org.eclipse.osee.client.test.framework:0.11.1.qualifier:default:true"/> </setAttribute> <booleanAttribute key="append.args" value="true"/> <booleanAttribute key="askclear" value="false"/> @@ -34,8 +31,9 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.ats.client.integration.AtsClientIntegrationTestSuite"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash -console"/> +<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.ats.client.integration.tests"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Dequinox.ds.debug=true -Dosee.application.server=http://localhost:8089 -DeventDebug=log -DeventSystem=new -Dosee.is.in.db.init=true"/> @@ -47,8 +45,6 @@ <setEntry value="org.eclipse.osee.ats.feature:default"/> <setEntry value="org.eclipse.osee.client.demo.feature:default"/> <setEntry value="org.eclipse.osee.client.feature:default"/> -<setEntry value="org.eclipse.osee.core.feature:default"/> -<setEntry value="org.eclipse.osee.core.plugin.feature:default"/> <setEntry value="org.eclipse.osee.core.runtime.feature:default"/> <setEntry value="org.eclipse.osee.core.ui.feature:default"/> <setEntry value="org.eclipse.osee.define.feature:default"/> @@ -57,12 +53,10 @@ <setEntry value="org.eclipse.osee.framework.ui.feature:default"/> <setEntry value="org.eclipse.sdk:default"/> </setAttribute> -<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*12.0.0.v201212092141@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.lowagie.text@default:default,com.ning.async-http-client@default:default,de.itemis.xtext.antlr@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.generator@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.net@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.apache.oro@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cyberneko.html@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.birt.core@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.jsoup@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.mozilla.javascript@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*4.0.0.v201302062210@default:default,org.polarion.eclipse.team.svn.connector.svnkit17@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api*1.6.4.v20120130-2120@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="com.sun.jersey.client.apache@default:default,com.sun.jersey@default:default,javax.ws.rs@default:default,jms.libraries@default:default,net.jini@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.client.demo@default:default,org.eclipse.osee.ats.client.integration.tests@default:default,org.eclipse.osee.ats.core.client.test@default:false,org.eclipse.osee.ats.core.client@default:default,org.eclipse.osee.ats.core.test@default:false,org.eclipse.osee.ats.core@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.ats.help.ui.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.ats.impl.test@default:false,org.eclipse.osee.ats.impl@default:default,org.eclipse.osee.ats.mocks@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.cache.admin.test@default:default,org.eclipse.osee.cache.admin@default:default,org.eclipse.osee.client.demo@default:default,org.eclipse.osee.client.test.framework@default:default,org.eclipse.osee.coverage.help.ui.test@default:false,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.access.provider@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl.ui.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.help.ui.test@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.orcs.rest.client@default:default,org.eclipse.osee.orcs.rest.model@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.support.test.util@default:default,org.hsqldb@default:default,org.jvnet.mimepull@default:default,org.mockito@default:default,org.objenesis@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="timestamp" value="1354263054730"/> <booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> <booleanAttribute key="useProduct" value="true"/> diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite_HSQLDB.launch b/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite_HSQLDB.launch deleted file mode 100644 index 0dd81eaf343..00000000000 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/AtsClient_Integration_TestSuite_HSQLDB.launch +++ /dev/null @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> -<setAttribute key="additional_plugins"> -<setEntry value="com.google.guava:10.0.1.v201203051515:default:true"/> -<setEntry value="com.google.guava:12.0.0.v201212092141:default:true"/> -<setEntry value="org.eclipse.core.runtime.compatibility:3.2.200.v20120521-2346:default:true"/> -<setEntry value="org.eclipse.osee.ats.client.integration.tests:0.11.0.qualifier:default:true"/> -<setEntry value="org.eclipse.osee.client.integration.tests:0.11.0.qualifier:default:false"/> -<setEntry value="org.eclipse.osee.client.test.framework:0.11.0.qualifier:default:false"/> -</setAttribute> -<booleanAttribute key="append.args" value="true"/> -<booleanAttribute key="askclear" value="false"/> -<booleanAttribute key="automaticAdd" value="false"/> -<booleanAttribute key="automaticValidate" value="true"/> -<stringAttribute key="bootstrap" value=""/> -<stringAttribute key="checked" value="[NONE]"/> -<booleanAttribute key="clearConfig" value="true"/> -<booleanAttribute key="clearws" value="true"/> -<booleanAttribute key="clearwslog" value="false"/> -<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> -<booleanAttribute key="default" value="false"/> -<stringAttribute key="featureDefaultLocation" value="workspace"/> -<stringAttribute key="featurePluginResolution" value="workspace"/> -<booleanAttribute key="includeOptional" value="false"/> -<stringAttribute key="location" value="${workspace_loc}/../junit-workspace-atsTest"/> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> -<listEntry value="/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/AtsClientIntegrationTestSuite.java"/> -</listAttribute> -<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> -<listEntry value="1"/> -</listAttribute> -<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> -<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/> -<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> -<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> -<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> -<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.ats.client.integration.AtsClientIntegrationTestSuite"/> -<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash -console"/> -<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.ats.client.integration.tests"/> -<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> -<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=WARNING -Dequinox.ds.debug=true -Dosee.application.server=http://localhost:8089 -DeventDebug=log -DeventSystem=new -Dosee.is.in.db.init=true"/> -<stringAttribute key="pde.version" value="3.3"/> -<stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<setAttribute key="selected_features"> -<setEntry value="org.eclipse.osee.ats.client.demo.feature:default"/> -<setEntry value="org.eclipse.osee.ats.feature:default"/> -<setEntry value="org.eclipse.osee.client.demo.feature:default"/> -<setEntry value="org.eclipse.osee.client.feature:default"/> -<setEntry value="org.eclipse.osee.core.feature:default"/> -<setEntry value="org.eclipse.osee.core.plugin.feature:default"/> -<setEntry value="org.eclipse.osee.core.runtime.feature:default"/> -<setEntry value="org.eclipse.osee.core.ui.feature:default"/> -<setEntry value="org.eclipse.osee.define.feature:default"/> -<setEntry value="org.eclipse.osee.external.feature:default"/> -<setEntry value="org.eclipse.osee.framework.feature:default"/> -<setEntry value="org.eclipse.osee.framework.ui.feature:default"/> -<setEntry value="org.eclipse.sdk:default"/> -</setAttribute> -<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*12.0.0.v201212092141@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.lowagie.text@default:default,com.ning.async-http-client@default:default,de.itemis.xtext.antlr@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.servlet*2.5.0.v201103041518@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.servlet.jsp@default:default,javax.xml@default:default,org.antlr.generator@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.net@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.apache.oro@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.birt.core@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.mozilla.javascript@default:default,org.objectweb.asm@default:default,org.polarion.eclipse.team.svn.connector.svnkit17@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api*1.6.4.v20120130-2120@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="com.sun.jersey.client.apache@default:default,com.sun.jersey@default:default,javax.ws.rs@default:default,jms.libraries@default:default,net.jini@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.client.demo@default:default,org.eclipse.osee.ats.client.integration.tests@default:default,org.eclipse.osee.ats.core.client.test@default:false,org.eclipse.osee.ats.core.client@default:default,org.eclipse.osee.ats.core.test@default:false,org.eclipse.osee.ats.core@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.ats.help.ui.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.ats.impl.test@default:false,org.eclipse.osee.ats.impl@default:default,org.eclipse.osee.ats.mocks@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.client.demo@default:default,org.eclipse.osee.client.test.framework@default:default,org.eclipse.osee.coverage.help.ui.test@default:false,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.access.provider@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl.ui.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.help.ui.test@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.orcs.rest.client@default:default,org.eclipse.osee.orcs.rest.model@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.support.test.util@default:default,org.hsqldb@default:default,org.jvnet.mimepull@default:default,org.mockito@default:default,org.objenesis@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="timestamp" value="1354263054730"/> -<booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> -<booleanAttribute key="useDefaultConfig" value="true"/> -<booleanAttribute key="useDefaultConfigArea" value="false"/> -<booleanAttribute key="useProduct" value="true"/> -</launchConfiguration> diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF index 046f45a0a9a..b9566918882 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats.client.integration.tests Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit, +Require-Bundle: org.junit;bundle-version="4.11.0", org.eclipse.core.runtime, org.eclipse.core.resources, org.eclipse.ui, @@ -27,14 +27,12 @@ Import-Package: org.eclipse.nebula.widgets.xviewer, org.eclipse.osee.ats.mocks, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.data, - org.eclipse.osee.framework.core.dsl.integration, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.cache, org.eclipse.osee.framework.core.operation, org.eclipse.osee.framework.core.util, - org.eclipse.osee.framework.database.core, org.eclipse.osee.framework.database.init, org.eclipse.osee.framework.jdk.core.type, org.eclipse.osee.framework.jdk.core.util, diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DirtyArtifactCacheTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DirtyArtifactCacheTest.java index 6cf9e69011d..0504298b18b 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DirtyArtifactCacheTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/DirtyArtifactCacheTest.java @@ -12,11 +12,11 @@ package org.eclipse.osee.ats.client.integration.tests; import java.util.Collection; import java.util.logging.Level; -import junit.framework.Assert; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.junit.Assert; /** * This test should be run as the last test of a suite to make sure that the ArtifactCache has no dirty artifacts. diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java index 971be191590..d870eac5db2 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/access/AtsBranchAccessManagerTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.access; import static java.lang.Thread.sleep; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.access.AtsBranchAccessManager; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.client.demo.DemoActionableItems; @@ -62,9 +62,6 @@ public class AtsBranchAccessManagerTest { return getService(OseeEventService.class); } - /** - * Test method for {@link org.eclipse.osee.ats.access.AtsBranchAccessManager#AtsBranchAccessManager()}. - */ @Test public void testAtsBranchAccessManager() { int numListeners = OseeEventManager.getNumberOfListeners(); @@ -72,9 +69,6 @@ public class AtsBranchAccessManagerTest { Assert.assertEquals(numListeners + 1, OseeEventManager.getNumberOfListeners()); } - /** - * Test method for {@link org.eclipse.osee.ats.access.AtsBranchAccessManager#dispose()}. - */ @Test public void testDispose() { AtsBranchAccessManager mgr = new AtsBranchAccessManager(getEventService()); @@ -83,12 +77,6 @@ public class AtsBranchAccessManagerTest { Assert.assertEquals(numListeners - 1, OseeEventManager.getNumberOfListeners()); } - /** - * Test method for - * {@link org.eclipse.osee.ats.access.AtsBranchAccessManager#isApplicable(org.eclipse.osee.framework.core.model.Branch)} - * - * @throws OseeCoreException - */ @Test public void testIsApplicable() throws OseeCoreException { AtsBranchAccessManager mgr = new AtsBranchAccessManager(getEventService()); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java index ee2263cb075..df2879a2ed9 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/AbstractAtsActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.jface.action.Action; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/FavoriteActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/FavoriteActionTest.java index 9ae3e6509bb..bb2661788d5 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/FavoriteActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/FavoriteActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.actions.FavoriteAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java index 3243adcbdc9..24cb57655a9 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/OpenChangeReportByIdActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.actions.OpenChangeReportByIdAction; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ResourceHistoryActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ResourceHistoryActionTest.java index 17f97e9d9e4..db2e2c115b0 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ResourceHistoryActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ResourceHistoryActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.actions.ResourceHistoryAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowBranchChangeDataActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowBranchChangeDataActionTest.java index 888ada307f2..0543276ec1b 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowBranchChangeDataActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowBranchChangeDataActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.actions.ShowBranchChangeDataAction; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowChangeReportActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowChangeReportActionTest.java index 3c48a687ddf..25a99e17040 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowChangeReportActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowChangeReportActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.actions.ShowChangeReportAction; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java index 8307be99669..81a19959960 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/ShowMergeManagerActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.actions.ShowMergeManagerAction; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/SubscribedActionTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/SubscribedActionTest.java index db6f97b4335..f2ea576238f 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/SubscribedActionTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/actions/SubscribedActionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.actions; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.actions.SubscribedAction; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/ConfigDataTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/ConfigDataTest.java index 4401c003f1e..2b7b1a28630 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/ConfigDataTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/ConfigDataTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.client.demo.DemoActionableItems; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsConfigurationOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsConfigurationOperationTest.java index d627a70cb9e..27bb8225e0b 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsConfigurationOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsConfigurationOperationTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsUtilTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsUtilTest.java index 537e0919ff6..721f3d741f7 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsUtilTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsUtilTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.config.copy.ConfigData; import org.eclipse.osee.ats.config.copy.CopyAtsUtil; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsValidationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsValidationTest.java index 96ae1205ffe..15629a4da63 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsValidationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/config/copy/CopyAtsValidationTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.config.copy; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.client.demo.DemoActionableItems; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtilTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtilTest.java index 1c3ab8eb803..0ea832a2acd 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtilTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/AtsTestUtilTest.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.core.client; -import junit.framework.Assert; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.core.client.team.TeamState; @@ -24,6 +23,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; +import org.junit.Assert; /** * Test unit for {@link AtsTestUtil} diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java index 79e7c27fd42..cde0f3fb226 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/action/AutoAddActionToGoalTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.action; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java index 30fb1286d66..230ab79aeeb 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/config/store/VersionArtifactStoreTest.java @@ -12,7 +12,6 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.config.sto import java.util.Arrays; import java.util.Date; -import junit.framework.Assert; import org.eclipse.osee.ats.api.IAtsConfigObject; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; @@ -20,7 +19,6 @@ import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.version.IAtsVersion; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; -import org.eclipse.osee.ats.core.config.AtsConfigCache; import org.eclipse.osee.ats.core.config.IAtsConfig; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; @@ -29,6 +27,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -57,8 +56,6 @@ public class VersionArtifactStoreTest { @Test public void testLoadFromArtifact() throws OseeCoreException { - IAtsConfig cache = new AtsConfigCache(); - Artifact verArt = ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtilCore.getAtsBranchToken()); verArt.setName("VersionArtifactStoreTest - version 1"); verArt.persist(getClass().getSimpleName()); @@ -102,8 +99,6 @@ public class VersionArtifactStoreTest { @Test public void testSaveToArtifact() throws OseeCoreException { - IAtsConfig cache = new AtsConfigCache(); - Artifact verArt = ArtifactTypeManager.addArtifact(AtsArtifactTypes.Version, AtsUtilCore.getAtsBranchToken()); verArt.setName("VersionArtifactStoreTest - version 2"); diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java index bc632faa2a3..d42765e3464 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/notify/AtsNotificationManagerTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.client.demo.DemoUsers; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java index 73caa9fdd47..81a9502bf6a 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/operation/MoveTeamWorkflowsOperationTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.operation; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.operation.MoveTeamWorkflowsOperation; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewDefinitionManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewDefinitionManagerTest.java index 76fb9f02d7d..351ab0ddab2 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewDefinitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewDefinitionManagerTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java index 0670212c961..513c034f2bc 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/DecisionReviewManagerTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerReviewDefinitionManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerReviewDefinitionManagerTest.java index 70003738eb8..1ee37eb2599 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerReviewDefinitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerReviewDefinitionManagerTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java index b0f19f0e569..4afb497c381 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/review/PeerToPeerReviewManagerTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.review; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/TaskManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/TaskManagerTest.java index bcaaf692b57..60bf6e3f9ad 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/TaskManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/TaskManagerTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.task; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; @@ -21,7 +21,6 @@ import org.eclipse.osee.ats.core.client.task.TaskArtifact; import org.eclipse.osee.ats.core.client.task.TaskManager; import org.eclipse.osee.ats.core.client.task.TaskStates; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; - import org.eclipse.osee.ats.core.client.util.AtsUtilCore; import org.eclipse.osee.ats.core.client.workflow.HoursSpentUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; @@ -81,8 +80,8 @@ public class TaskManagerTest extends TaskManager { XResultData resultData = new XResultData(); AtsClientService.get().getWorkDefinitionAdmin(); IAtsWorkDefinition differentTaskWorkDef = - AtsClientService.get().getWorkDefinitionAdmin().copyWorkDefinition(taskWorkDef.getName() + "2", - taskWorkDef, resultData); + AtsClientService.get().getWorkDefinitionAdmin().copyWorkDefinition(taskWorkDef.getName() + "2", taskWorkDef, + resultData); Assert.assertFalse("Should be no errors", resultData.isErrors()); AtsClientService.get().getWorkDefinitionAdmin().addWorkDefinition(differentTaskWorkDef); @@ -115,8 +114,8 @@ public class TaskManagerTest extends TaskManager { XResultData resultData = new XResultData(); AtsClientService.get().getWorkDefinitionAdmin(); IAtsWorkDefinition differentTaskWorkDef = - AtsClientService.get().getWorkDefinitionAdmin().copyWorkDefinition(taskWorkDef.getName() + "2", - taskWorkDef, resultData); + AtsClientService.get().getWorkDefinitionAdmin().copyWorkDefinition(taskWorkDef.getName() + "2", taskWorkDef, + resultData); Assert.assertFalse("Should be no errors", resultData.isErrors()); AtsClientService.get().getWorkDefinitionAdmin().addWorkDefinition(differentTaskWorkDef); @@ -152,7 +151,7 @@ public class TaskManagerTest extends TaskManager { transaction.execute(); Assert.assertEquals(TaskStates.Completed.getName(), taskArt.getCurrentStateName()); - Assert.assertEquals(3.0, HoursSpentUtil.getHoursSpentTotal(taskArt)); + Assert.assertEquals(3.0, HoursSpentUtil.getHoursSpentTotal(taskArt), 0.0); Assert.assertEquals("", taskArt.getStateMgr().getAssigneesStr()); // ensure nothing dirty @@ -162,11 +161,13 @@ public class TaskManagerTest extends TaskManager { transaction = TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(), getClass().getSimpleName() + " testTransitionToCompletedThenInWork() 2"); - result = TaskManager.transitionToInWork(taskArt, AtsClientService.get().getUserAdmin().getCurrentUser(), 45, .5, transaction); + result = + TaskManager.transitionToInWork(taskArt, AtsClientService.get().getUserAdmin().getCurrentUser(), 45, .5, + transaction); Assert.assertEquals(Result.TrueResult, result); transaction.execute(); Assert.assertEquals(TaskStates.InWork.getName(), taskArt.getCurrentStateName()); - Assert.assertEquals(3.5, HoursSpentUtil.getHoursSpentTotal(taskArt)); + Assert.assertEquals(3.5, HoursSpentUtil.getHoursSpentTotal(taskArt), 0.0); Assert.assertEquals("Joe Smith", taskArt.getStateMgr().getAssigneesStr()); } diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUserTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUserTest.java index fc316d25187..c4e5a634c6c 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUserTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUserTest.java @@ -13,15 +13,14 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.util; import java.util.Arrays; import java.util.Collection; import java.util.HashSet; -import junit.framework.Assert; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.client.demo.DemoUsers; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; - import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.eclipse.osee.framework.skynet.core.User; import org.eclipse.osee.framework.skynet.core.UserManager; +import org.junit.Assert; import org.junit.Before; import org.mockito.Mockito; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUsersTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUsersTest.java index 0e0cb18f201..0466d4f78d7 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUsersTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/AtsUsersTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.util; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.core.users.AtsCoreUsers; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java index c5e06e01e9b..b9e313606d1 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/util/CopyActionDetailsTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.util; -import junit.framework.Assert; +import static org.junit.Assert.assertEquals; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil.AtsTestUtilState; @@ -20,11 +20,14 @@ import org.eclipse.osee.ats.core.client.util.CopyActionDetails; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Donald G. Dunne */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CopyActionDetailsTest { @BeforeClass @@ -34,39 +37,39 @@ public class CopyActionDetailsTest { } @Test - public void testGetDetailsStringForTeamWf() throws OseeCoreException { + public void test01GetDetailsStringForTeamWf() throws OseeCoreException { AtsTestUtil.cleanupAndReset(getClass().getSimpleName()); String str = new CopyActionDetails(AtsTestUtil.getTeamWf()).getDetailsString(); - Assert.assertEquals( + assertEquals( "\"Team Workflow\" - " + AtsTestUtil.getTeamWf().getHumanReadableId() + " - \"AtsTestUtil - Team WF [CopyActionDetailsTest]\"", str); } @Test - public void testGetDetailsStringForTask() throws OseeCoreException { + public void test02GetDetailsStringForTask() throws OseeCoreException { String str = new CopyActionDetails(AtsTestUtil.getOrCreateTaskOffTeamWf1()).getDetailsString(); - Assert.assertEquals( + assertEquals( "\"Task\" - " + AtsTestUtil.getOrCreateTaskOffTeamWf1().getHumanReadableId() + " - \"AtsTestUtil - Task [CopyActionDetailsTest]\"", str); } @Test - public void testGetDetailsStringForDecisionReview() throws OseeCoreException { + public void test03GetDetailsStringForDecisionReview() throws OseeCoreException { DecisionReviewArtifact review = AtsTestUtil.getOrCreateDecisionReview(ReviewBlockType.Commit, AtsTestUtilState.Analyze); String str = new CopyActionDetails(review).getDetailsString(); - Assert.assertEquals( - "\"Decision Review\" - " + review.getHumanReadableId() + " - \"AtsTestUtil Test Decision Review\"", str); + assertEquals("\"Decision Review\" - " + review.getHumanReadableId() + " - \"AtsTestUtil Test Decision Review\"", + str); review.persist(getClass().getSimpleName()); } @Test - public void testGetDetailsStringForPeerReview() throws OseeCoreException { + public void test04GetDetailsStringForPeerReview() throws OseeCoreException { PeerToPeerReviewArtifact review = AtsTestUtil.getOrCreatePeerReview(ReviewBlockType.None, AtsTestUtilState.Analyze, null); String str = new CopyActionDetails(review).getDetailsString(); - Assert.assertEquals( - "\"PeerToPeer Review\" - " + review.getHumanReadableId() + " - \"AtsTestUtil Test Peer Review\"", str); + assertEquals("\"PeerToPeer Review\" - " + review.getHumanReadableId() + " - \"AtsTestUtil Test Peer Review\"", + str); review.persist(getClass().getSimpleName()); } } diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java index abc9b3d7a92..54b9cd4e9a9 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/ConvertWorkflowStatesOperationTest.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsArtifactTypes; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.core.client.util.AtsUtilCore; @@ -31,6 +30,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.QueryOptions; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java index b9dc02ed4fc..90bfd07b68a 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/StateManagerTest.java @@ -11,7 +11,6 @@ package org.eclipse.osee.ats.client.integration.tests.ats.core.client.workflow.transition; import java.util.Collections; -import junit.framework.Assert; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -22,6 +21,7 @@ import org.eclipse.osee.ats.core.client.workflow.transition.TransitionManager; import org.eclipse.osee.ats.core.client.workflow.transition.TransitionResults; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java index d42fc209623..a877b7355d1 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/workflow/transition/TransitionManagerTest.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; import java.util.List; -import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.data.AtsRelationTypes; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; @@ -54,6 +53,7 @@ import org.eclipse.osee.framework.core.util.Result; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; /** diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java index 6d4f1e593fd..5689e231bdb 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/EarnedValueReportOperationTest.java @@ -13,7 +13,6 @@ package org.eclipse.osee.ats.client.integration.tests.ats.ev; import java.util.ArrayList; import java.util.List; import java.util.Set; -import junit.framework.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; @@ -31,6 +30,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java index d58d274097a..d24603d24f8 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/ev/SearchWorkPackageOperationTest.java @@ -15,7 +15,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Set; -import junit.framework.Assert; import org.eclipse.osee.ats.api.ai.IAtsActionableItem; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.client.demo.DemoArtifactToken; @@ -26,6 +25,7 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java index 9311d4cb9b3..775b279a279 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/util/CreateActionUsingAllActionableItemsTest.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.util; -import junit.framework.Assert; import org.eclipse.osee.ats.core.client.action.ActionArtifact; import org.eclipse.osee.ats.core.client.config.AtsBulkLoad; import org.eclipse.osee.ats.util.AtsUtil; @@ -24,6 +23,7 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction; import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.eclipse.osee.support.test.util.TestUtil; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; /** diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java index cce08f9b583..854315d98b2 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/workflow/SMAPromptChangeStatusTest.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.ats.client.integration.tests.ats.workflow; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Collection; -import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.client.integration.tests.util.DemoTestUtil; @@ -40,10 +40,14 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.FixMethodOrder; +import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Donald G. Dunne */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class SMAPromptChangeStatusTest { public static TeamWorkFlowArtifact teamArt; @@ -59,8 +63,13 @@ public class SMAPromptChangeStatusTest { AtsTestUtil.cleanupSimpleTest(SMAPromptChangeStatusTest.class.getSimpleName()); } - @org.junit.Test - public void testInitialize() throws Exception { + @AfterClass + public static void cleanup() throws Exception { + AtsTestUtil.cleanupSimpleTest(SMAPromptChangeStatusTest.class.getSimpleName()); + } + + @Test + public void test01Initialize() throws Exception { SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Prompt Change Status Test"); teamArt = DemoTestUtil.createSimpleAction(getClass().getSimpleName(), transaction); @@ -68,8 +77,8 @@ public class SMAPromptChangeStatusTest { assertNotNull(teamArt); } - @org.junit.Test - public void testChangeTaskStatusNoResolution() throws Exception { + @Test + public void test02ChangeTaskStatusNoResolution() throws Exception { SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Prompt Change Status Test"); @@ -103,8 +112,8 @@ public class SMAPromptChangeStatusTest { } - @org.junit.Test - public void testChangeStatusFailsIfTaskCancelled() throws Exception { + @Test + public void test03ChangeStatusFailsIfTaskCancelled() throws Exception { SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Prompt Change Status Test"); Collection<TaskArtifact> tasks = @@ -122,7 +131,7 @@ public class SMAPromptChangeStatusTest { TransitionManager transitionMgr = new TransitionManager(helper, transaction); TransitionResults results = transitionMgr.handleAll(); transitionMgr.getTransaction().execute(); - Assert.assertTrue("Transition should have no errors", results.isEmpty()); + assertEquals("Transition should have no errors", true, results.isEmpty()); Result result = SMAPromptChangeStatus.isValidToChangeStatus(tasks); assertTrue(result.isFalse()); @@ -130,8 +139,8 @@ public class SMAPromptChangeStatusTest { } - @org.junit.Test - public void testChangeStatusFailsIfTaskWrongRelatedToState() throws Exception { + @Test + public void test04ChangeStatusFailsIfTaskWrongRelatedToState() throws Exception { SkynetTransaction transaction = TransactionManager.createTransaction(AtsUtil.getAtsBranch(), "Prompt Change Status Test"); Collection<TaskArtifact> tasks = @@ -150,30 +159,25 @@ public class SMAPromptChangeStatusTest { assertTrue(result.getText().contains("Task work must be done in")); } - @AfterClass - public static void testCleanupPost() throws Exception { - AtsTestUtil.cleanupSimpleTest(SMAPromptChangeStatusTest.class.getSimpleName()); - } - private static void validateSMAs(Collection<? extends AbstractWorkflowArtifact> awas, String stateName, int totalPercent, double hoursSpent) throws Exception { for (AbstractWorkflowArtifact awa : awas) { - Assert.assertEquals("Current State wrong for " + awa.getHumanReadableId(), - awa.getStateMgr().getCurrentStateName(), stateName); + assertEquals("Current State wrong for " + awa.getHumanReadableId(), awa.getStateMgr().getCurrentStateName(), + stateName); if (awa.isCompletedOrCancelled()) { - Assert.assertEquals("ats.CurrentState wrong " + awa.getHumanReadableId(), + assertEquals("ats.CurrentState wrong " + awa.getHumanReadableId(), awa.getStateMgr().getCurrentStateName() + ";;;", awa.getSoleAttributeValue(AtsAttributeTypes.CurrentState)); } - Assert.assertEquals("Percent wrong for " + awa.getHumanReadableId(), + assertEquals("Percent wrong for " + awa.getHumanReadableId(), PercentCompleteTotalUtil.getPercentCompleteTotal(awa), totalPercent); - Assert.assertEquals("Hours Spent wrong for " + awa.getHumanReadableId(), - HoursSpentUtil.getHoursSpentTotal(awa), hoursSpent, 0.0); + assertEquals("Hours Spent wrong for " + awa.getHumanReadableId(), HoursSpentUtil.getHoursSpentTotal(awa), + hoursSpent, 0.0); for (String xml : awa.getAttributesToStringList(AtsAttributeTypes.State)) { WorkStateImpl state = AtsWorkStateFactory.getFromXml(xml); boolean isCompletedCancelledState = isCompletedCancelledState(awa, state.getName()); if (isCompletedCancelledState) { - Assert.assertTrue("completed/cancelled ats.State [" + xml + "] wrong " + awa.getHumanReadableId(), + assertTrue("completed/cancelled ats.State [" + xml + "] wrong " + awa.getHumanReadableId(), xml.endsWith(";;;")); } } diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java index 556625e71a7..c5ba04cfe51 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/LegacyPcrIdQuickSearchTest.java @@ -12,7 +12,6 @@ package org.eclipse.osee.ats.client.integration.tests.ats.world.search; import java.util.Arrays; import java.util.Collection; -import junit.framework.Assert; import org.eclipse.osee.ats.api.data.AtsAttributeTypes; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; import org.eclipse.osee.ats.core.client.team.TeamWorkFlowArtifact; @@ -20,6 +19,7 @@ import org.eclipse.osee.ats.world.search.LegacyPcrIdQuickSearch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java index 82577d66a2e..9e4fbd8d282 100644 --- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java +++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/world/search/TeamDefinitionQuickSearchTest.java @@ -12,7 +12,6 @@ package org.eclipse.osee.ats.client.integration.tests.ats.world.search; import java.util.Arrays; import java.util.Collection; -import junit.framework.Assert; import org.eclipse.osee.ats.api.team.IAtsTeamDefinition; import org.eclipse.osee.ats.client.integration.tests.AtsClientService; import org.eclipse.osee.ats.client.integration.tests.ats.core.client.AtsTestUtil; @@ -21,6 +20,7 @@ import org.eclipse.osee.ats.world.search.TeamDefinitionQuickSearch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.junit.AfterClass; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java index ccb8431daff..1bc36d862b6 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/internal/config/TeamDefinitionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.client.internal.config; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.version.IAtsVersionService; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Before; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java index f6cad7c9fc6..57e327edbda 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/AtsXDefectValidatorTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.client.review.defect; import java.util.Arrays; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItemTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItemTest.java index a06f8a4a768..421803f9e2d 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItemTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/defect/ReviewDefectItemTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.client.review.defect; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.Disposition; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.InjectionActivity; import org.eclipse.osee.ats.core.client.review.defect.ReviewDefectItem.Severity; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java index f8716a6f441..e15b09fd5c0 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/AtsXUserRoleValidatorTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.client.review.role; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; diff --git a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/UserRoleTest.java b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/UserRoleTest.java index 453b9a84f99..bf3a3d7a39b 100644 --- a/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/UserRoleTest.java +++ b/plugins/org.eclipse.osee.ats.core.client.test/src/org/eclipse/osee/ats/core/client/review/role/UserRoleTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.core.client.review.role; import org.eclipse.osee.ats.core.client.review.role.Role; import org.eclipse.osee.ats.core.client.review.role.UserRole; -import junit.framework.Assert; +import org.junit.Assert; /** * Test unit for {@link UserRole} diff --git a/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF index a4acf32d2e3..b5aaaa2cd42 100644 --- a/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.ats.core.test Bundle-Version: 0.11.1.qualifier Fragment-Host: org.eclipse.osee.ats.core Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="4.8.1", +Require-Bundle: org.junit;bundle-version="4.11.0", org.mockito;bundle-version="1.9.0", org.hamcrest.core, org.objenesis diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java index b7b8b1c12f9..5402bf7037b 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ActivityIdColumnTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueService; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueServiceProvider; import org.eclipse.osee.ats.api.ev.IAtsWorkPackage; @@ -90,12 +90,12 @@ public class ActivityIdColumnTest { Set<IAtsWorkPackage> workPackages = new HashSet<IAtsWorkPackage>(); col.getWorkPackages(task1, workPackages); - // Each workflow stores it's own work package, so none should be returned + // Each work flow stores it's own work package, so none should be returned Assert.assertEquals(0, workPackages.size()); } @Test - public void testGetWorkPackageStr() throws OseeCoreException { + public void testGetWorkPackageStr() { ActivityIdUtility col = new ActivityIdUtility(earnedValueServiceProvider); Assert.assertEquals("ActId 1 - ActId 1 Name", col.getColumnText(teamWf1)); diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java index d2d38facc5f..33b6ec38676 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/AssigneeColumnTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.column; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workflow.HasWorkData; import org.eclipse.osee.ats.api.workflow.IAtsWorkData; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java index c204745ebdc..e503b33bd4f 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/column/ImplementersColumnTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.core.column; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.core.mock.MockActionGroup; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java index fe766a9cbf8..f5a32dc4232 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/AbstractWorkPackageUtilityTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.IAtsWorkItem; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueService; import org.eclipse.osee.ats.api.ev.IAtsEarnedValueServiceProvider; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java index 0352b16d68f..76232744961 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageGuidUtilityTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.core.column.IAtsColumnUtility; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Before; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java index d4786c4c188..dd275756f62 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageIdUtilityTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.core.column.IAtsColumnUtility; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Before; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java index 1cb1b1d82f4..88cf5c40f4f 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageNameUtilityTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.core.column.IAtsColumnUtility; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Before; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java index 632c0eda40c..c9508f910e2 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageProgramUtilityTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.core.column.IAtsColumnUtility; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Before; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java index 92cfa403eb4..9f39cca7095 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/internal/column/ev/WorkPackageTypeUtilityTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.internal.column.ev; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.ev.AtsWorkPackageType; import org.eclipse.osee.ats.core.column.IAtsColumnUtility; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java index c14a56e1d33..709dfb8a88c 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/mock/MockWorkItem.java @@ -118,7 +118,7 @@ public class MockWorkItem implements IAtsWorkItem { } @Override - public IAtsTeamWorkflow getParentTeamWorkflow() throws OseeCoreException { + public IAtsTeamWorkflow getParentTeamWorkflow() { return null; } diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java index 14e27acdbec..17c8d010e03 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/model/impl/WorkStateProviderImplTest.java @@ -14,7 +14,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.mock.MockAtsUser; import org.eclipse.osee.ats.core.mock.MockWorkStateFactory; @@ -23,6 +22,7 @@ import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -339,7 +339,7 @@ public class WorkStateProviderImplTest { Assert.assertTrue(provider.isStateVisited("endorse")); Assert.assertEquals(1, provider.getVisitedStateNames().size()); Assert.assertEquals(1, provider.getAssignees("endorse").size()); - Assert.assertEquals(4.2, provider.getHoursSpent("endorse")); + Assert.assertEquals(4.2, provider.getHoursSpent("endorse"), 0.0); Assert.assertEquals(4, provider.getPercentComplete("endorse")); } @@ -354,7 +354,7 @@ public class WorkStateProviderImplTest { Assert.assertTrue(provider.isStateVisited("endorse")); Assert.assertEquals(1, provider.getVisitedStateNames().size()); Assert.assertEquals(1, provider.getAssignees("endorse").size()); - Assert.assertEquals(0.0, provider.getHoursSpent("endorse")); + Assert.assertEquals(0.0, provider.getHoursSpent("endorse"), 0.0); Assert.assertEquals(0, provider.getPercentComplete("endorse")); } @@ -379,7 +379,7 @@ public class WorkStateProviderImplTest { @Test public void getHoursSpent() { - Assert.assertEquals(0.0, provider.getHoursSpent("endorse")); + Assert.assertEquals(0.0, provider.getHoursSpent("endorse"), 0.0); } @Test(expected = OseeStateException.class) @@ -393,7 +393,7 @@ public class WorkStateProviderImplTest { provider.setCurrentStateName("endorse"); provider.setHoursSpent("endorse", 8.0); - Assert.assertEquals(8.0, provider.getHoursSpent("endorse")); + Assert.assertEquals(8.0, provider.getHoursSpent("endorse"), 0.0); } @Test(expected = OseeStateException.class) diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java index 0efb8df4654..627b2f4e394 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/AtsUsersUtilityTest.java @@ -8,7 +8,7 @@ package org.eclipse.osee.ats.core.users; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.ats.core.mock.MockAtsUser; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java index 4dd24357a0c..98c84ad2d74 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/users/CoreAtsUsersTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.users; import java.util.HashMap; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.user.IAtsUser; import org.eclipse.osee.framework.core.data.Identity; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java index 15d4440c571..0bb262ca6b0 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsObjectsTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.IAtsObject; import org.eclipse.osee.ats.core.users.AtsCoreUsers; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java index ffde608f02c..53849767520 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/util/AtsUserGroupTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.util; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.core.mock.MockAtsUser; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java index f10fdd9f4da..f55a0bc4974 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsCoreXWidgetValidatorProviderTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.validator; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java index 256250513b9..ff91a73fbc5 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboBooleanValidatorTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java index ad7a5a508b4..583a4efdaae 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXComboValidatorTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.validator; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java index 6c43c67bad7..ee51fb372ca 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXDateValidatorTest.java @@ -14,7 +14,7 @@ import java.util.Arrays; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXFloatValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXFloatValidatorTest.java index 034435f18a8..894e5fd7687 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXFloatValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXFloatValidatorTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.validator; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinitionFloatMinMaxConstraint; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXIntegerValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXIntegerValidatorTest.java index c4f02aea7cd..79aea22122f 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXIntegerValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXIntegerValidatorTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.validator; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinitionIntMinMaxConstraint; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java index 7cb1a82bd04..1046d3ac5ee 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXListValidatorTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.validator; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinitionListMinMaxSelectedConstraint; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java index 2ef275577e4..77e696e3156 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXTextValidatorTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.validator; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.api.workdef.WidgetResult; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java index f835ef3532d..c56144d70a9 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/AtsXWidgetValidateManagerTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.core.validator; import java.util.Collection; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; import org.eclipse.osee.ats.api.workdef.WidgetResult; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java index 65a57317ae1..e9b696f24d5 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/validator/WidgetStatusTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.validator; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.WidgetStatus; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java index 6af1e7ebf8a..db741ead8b1 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/ReviewBlockTypeTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workdef; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java index 8868201e216..cdd418b9755 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/RuleDefinitionOptionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workdef; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java index e001b896bd7..adf397049ef 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateColorTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workdef; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateColor; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java index cf2cc4dfafb..1b566041306 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/StateEventTypeTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workdef; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateEventType; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheetTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheetTest.java index 88b7f3072f2..37efd2d365a 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheetTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/WorkDefinitionSheetTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.workdef; import java.io.File; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/BooleanDefUtilTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/BooleanDefUtilTest.java index 4eb3b9db468..acec7f022f8 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/BooleanDefUtilTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/BooleanDefUtilTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workdef.provider; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.dsl.BooleanDefUtil; import org.eclipse.osee.ats.dsl.atsDsl.BooleanDef; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/UserRefUtilTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/UserRefUtilTest.java index 92c2f829b02..c3dad38b006 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/UserRefUtilTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workdef/provider/UserRefUtilTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.core.workdef.provider; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.osee.ats.dsl.UserRefUtil; diff --git a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java index ca6a2af26dc..140dbab1ecf 100644 --- a/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java +++ b/plugins/org.eclipse.osee.ats.core.test/src/org/eclipse/osee/ats/core/workflow/StateTypeTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.core.workflow; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.StateType; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF index db3f76858f6..f5429a6b77e 100644 --- a/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.core/META-INF/MANIFEST.MF @@ -7,7 +7,7 @@ Bundle-ActivationPolicy: lazy Eclipse-ExtensibleAPI: true Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: com.google.inject, - org.eclipse.core.runtime;version="3.4.0", + org.eclipse.core.runtime, org.eclipse.emf.common, org.eclipse.emf.common.util, org.eclipse.emf.ecore, @@ -41,7 +41,7 @@ Import-Package: com.google.inject, org.eclipse.osee.framework.logging, org.eclipse.osee.framework.plugin.core.util, org.eclipse.xtext.resource, - org.osgi.framework;version="1.3.0" + org.osgi.framework Bundle-Vendor: Eclipse Open System Engineering Environment Export-Package: org.eclipse.osee.ats.core, org.eclipse.osee.ats.core.column, diff --git a/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF index d80f146054d..2b3d5578b15 100644 --- a/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.dsl.ui/META-INF/MANIFEST.MF @@ -7,13 +7,17 @@ Bundle-SymbolicName: org.eclipse.osee.ats.dsl.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.osee.ats.dsl;visibility:=reexport, org.eclipse.xtext.ui, - org.eclipse.ui.editors, - org.eclipse.ui.ide, + org.eclipse.ui.editors;bundle-version="3.5.0", + org.eclipse.ui.ide;bundle-version="3.5.0", org.eclipse.xtext.ui.shared, org.eclipse.ui, org.eclipse.xtext.builder, - org.antlr.runtime -Import-Package: org.apache.log4j, + org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", + org.eclipse.xtext.common.types.ui, + org.eclipse.xtext.ui.codetemplates.ui, + org.eclipse.compare +Import-Package: org.apache.log4j;version="1.2.15", + org.apache.commons.logging, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.type, diff --git a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF index 8648352da10..d4462f8e629 100644 --- a/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.dsl/META-INF/MANIFEST.MF @@ -17,20 +17,20 @@ Export-Package: org.eclipse.osee.ats.dsl, org.eclipse.osee.ats.dsl.validation, org.eclipse.osee.ats.dsl.scoping, org.eclipse.osee.ats.dsl.formatting -Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0";visibility:=reexport, - org.apache.log4j;bundle-version="1.2.15";visibility:=reexport, - org.apache.commons.logging;resolution:=optional;visibility:=reexport, - org.eclipse.xtext.generator;resolution:=optional, - org.eclipse.emf.codegen.ecore;resolution:=optional, - org.eclipse.emf.mwe.utils;resolution:=optional, - org.eclipse.emf.mwe2.launch;resolution:=optional, +Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport, + org.eclipse.xtext.generator;resolution:=optional;x-installation:=greedy, + org.eclipse.emf.codegen.ecore;resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe.utils;resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;resolution:=optional;x-installation:=greedy, + org.eclipse.xtext.ui.codetemplates;resolution:=optional;x-installation:=greedy, org.eclipse.xtext.util, org.eclipse.emf.ecore, org.eclipse.emf.common, - org.antlr.runtime, - com.google.guava;bundle-version="10.0.1" + org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", + org.eclipse.xtext.common.types, + org.eclipse.xtext.xbase.lib;bundle-version="2.3.0" Import-Package: org.apache.commons.logging, - org.apache.log4j, + org.apache.log4j;version="1.2.15", org.eclipse.core.runtime, org.eclipse.osee.framework.core.exception, org.eclipse.osee.framework.core.model.type, diff --git a/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF index 5ce738c44b9..df33cf39fc6 100644 --- a/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.help.ui.test/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.ats.help.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit -Import-Package: org.eclipse.core.runtime;version="3.4.0", +Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.jdk.core.util, org.osgi.framework diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertWorkDefinitionToAtsDslTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertWorkDefinitionToAtsDslTest.java index 3929bbfb5f4..88c3097d81e 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertWorkDefinitionToAtsDslTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/convert/ConvertWorkDefinitionToAtsDslTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.impl.internal.convert; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsCompositeLayoutItem; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java index ce0da1b1f95..a83b6d8a51a 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewDefinitionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.impl.internal.model; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.StateEventType; import org.eclipse.osee.ats.impl.internal.model.DecisionReviewDefinition; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java index de9306076a5..8791186e3e0 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/DecisionReviewOptionTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.impl.internal.model; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsDecisionReviewOption; import org.eclipse.osee.ats.impl.internal.model.DecisionReviewOption; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java index 7ccc3968832..33913f61c2b 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/PeerReviewDefinitionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.impl.internal.model; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.ReviewBlockType; import org.eclipse.osee.ats.api.workdef.StateEventType; import org.eclipse.osee.ats.impl.internal.model.PeerReviewDefinition; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java index 927b5c2e336..4247e621575 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/StateDefinitionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.impl.internal.model; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsCompositeLayoutItem; import org.eclipse.osee.ats.api.workdef.IAtsWidgetDefinition; import org.eclipse.osee.ats.api.workdef.RuleDefinitionOption; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java index aca237548e9..39ae8f67888 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetDefinitionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.impl.internal.model; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.eclipse.osee.ats.impl.internal.model.WidgetDefinition; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetOptionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetOptionTest.java index c8a195041f7..7df37ecafee 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetOptionTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WidgetOptionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ats.impl.internal.model; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.WidgetOption; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java index 50a58ffb7f9..69ff46fc9f5 100644 --- a/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java +++ b/plugins/org.eclipse.osee.ats.impl.test/src/org/eclipse/osee/ats/impl/internal/model/WorkDefinitionTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.impl.internal.model; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.api.workdef.IAtsStateDefinition; import org.eclipse.osee.ats.api.workdef.IAtsWorkDefinition; import org.eclipse.osee.ats.api.workdef.StateType; diff --git a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF index 6f6aa90b34a..07e02f7d7cd 100644 --- a/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.impl/META-INF/MANIFEST.MF @@ -32,8 +32,8 @@ Import-Package: com.google.inject, org.eclipse.osee.framework.jdk.core.util, org.eclipse.xtext, org.eclipse.xtext.resource, - org.osgi.framework;version="1.3.0" + org.osgi.framework Service-Component: OSGI-INF/*.xml Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0" +Require-Bundle: org.eclipse.core.runtime diff --git a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java index da8c03cc01a..e4d4f27240d 100644 --- a/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java +++ b/plugins/org.eclipse.osee.ats.presenter.test/src/org/eclipse/osee/ats/presenter/internal/AtsSearchPresenterTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.presenter.internal; import java.io.UnsupportedEncodingException; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.ui.api.data.AtsSearchParameters; import org.eclipse.osee.ats.ui.api.view.AtsSearchHeaderComponent; import org.eclipse.osee.display.api.data.ViewId; diff --git a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF index fa90ab05aac..76e6d0e90eb 100644 --- a/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ats.rest/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.11.1.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-Vendor: Eclipse Open System Engineering Environment Service-Component: OSGI-INF/*.xml -Import-Package: com.google.common.cache;version="10.0.1", +Import-Package: com.google.common.cache;version="11.0.0", com.lowagie.text;version="2.1.7", com.lowagie.text.html;version="2.1.7", com.lowagie.text.rtf.table;version="2.1.7", diff --git a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF index 741350f9ae2..ddebc3fc6c4 100644 --- a/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.cache.admin/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.cache.admin Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: com.google.guava;bundle-version="12.0.0" +Require-Bundle: com.google.guava;bundle-version="[11.0.0,15.0.0)" Import-Package: org.eclipse.osee.framework.jdk.core.type Service-Component: OSGI-INF/*.xml Export-Package: org.eclipse.osee.cache.admin diff --git a/plugins/org.eclipse.osee.client.integration.tests/OseeClient_Integration_TestSuite.launch b/plugins/org.eclipse.osee.client.integration.tests/OseeClient_Integration_TestSuite.launch index 0523e73f559..5e01abcd30b 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/OseeClient_Integration_TestSuite.launch +++ b/plugins/org.eclipse.osee.client.integration.tests/OseeClient_Integration_TestSuite.launch @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <setAttribute key="additional_plugins"> -<setEntry value="com.google.guava:10.0.1.v201203051515:default:true"/> -<setEntry value="com.google.guava:12.0.0.v201212092141:default:true"/> -<setEntry value="org.eclipse.osee.client.integration.tests:0.11.0.qualifier:default:true"/> -<setEntry value="org.eclipse.osee.client.test.framework:0.11.0.qualifier:default:true"/> +<setEntry value="com.google.guava:10.0.1.v201203051515:default:false"/> +<setEntry value="com.google.guava:12.0.0.v201212092141:default:false"/> +<setEntry value="org.eclipse.osee.client.integration.tests:0.11.1.qualifier:default:true"/> +<setEntry value="org.eclipse.osee.client.test.framework:0.11.1.qualifier:default:true"/> </setAttribute> <booleanAttribute key="append.args" value="true"/> <booleanAttribute key="askclear" value="false"/> @@ -32,6 +32,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.client.integration.tests.OseeClientIntegrationTestSuite"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.client.integration.tests"/> @@ -51,12 +52,10 @@ <setEntry value="org.eclipse.osee.framework.ui.feature:default"/> <setEntry value="org.eclipse.sdk:default"/> </setAttribute> -<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*12.0.0.v201212092141@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.lowagie.text@default:default,com.ning.async-http-client@default:default,de.itemis.xtext.antlr@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,jcl.over.slf4j@default:default,org.antlr.generator@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.codec*1.7.0@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.net@default:default,org.apache.commons.pool@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.apache.oro@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cyberneko.html@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.birt.core@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.cache.admin@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.jsoup@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.mozilla.javascript@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*4.0.0.v201302062210@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api*1.6.4.v20120130-2120@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="com.sun.jersey.client.apache@default:default,com.sun.jersey@default:default,javax.ws.rs@default:default,jms.libraries@default:default,net.jini@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.cache.admin.test@default:default,org.eclipse.osee.client.demo@default:default,org.eclipse.osee.client.integration.tests@default:default,org.eclipse.osee.client.test.framework@default:default,org.eclipse.osee.coverage.help.ui.test@default:false,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.access.provider@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl.ui.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.help.ui.test@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.orcs.rest.client@default:default,org.eclipse.osee.orcs.rest.model@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.support.test.util@default:default,org.hsqldb@default:default,org.jvnet.mimepull@default:default,org.mockito@default:default,org.objenesis@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="timestamp" value="1354136077440"/> <booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> <booleanAttribute key="useProduct" value="true"/> diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/DirtyArtifactCacheTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/DirtyArtifactCacheTest.java index 0d6d3221742..e1e28f40598 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/DirtyArtifactCacheTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/DirtyArtifactCacheTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.client.integration.tests.integration; import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO; import java.util.Collection; import java.util.logging.Level; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventFiltersTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventFiltersTest.java index 26c3a0af587..5b50a942f46 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventFiltersTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ArtifactEventFiltersTest.java @@ -14,7 +14,7 @@ import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.core.data.IOseeBranch; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java index e11e809d973..e80a33b2aa9 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/BranchEventTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.client.integration.tests.integration.skynet.core; import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.client.test.framework.TestInfo; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictDeletionTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictDeletionTest.java index bb94348cc99..635487b8be3 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictDeletionTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictDeletionTest.java @@ -41,8 +41,7 @@ import org.junit.Test; /** * @author Theron Virgin */ -@Ignore -// This test does not work +@Ignore("This test does not work") public class ConflictDeletionTest { @Rule diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java index 76db1fd6fea..79462a6381d 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/skynet/core/ConflictTest.java @@ -16,7 +16,9 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; + import java.util.Collection; + import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.osee.client.integration.tests.integration.skynet.core.utils.ConflictTestManager; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; @@ -40,14 +42,17 @@ import org.eclipse.osee.framework.skynet.core.conflict.RelationConflict; import org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Rule; import org.junit.rules.MethodRule; +import org.junit.runners.MethodSorters; /** * @author Jeff C. Phillips * @author Theron Virgin */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class ConflictTest { @Rule @@ -71,7 +76,7 @@ public class ConflictTest { * {@link org.eclipse.osee.framework.skynet.core.artifact.BranchManager#getMergeBranch(Branch, Branch)} . */ @org.junit.Test - public void testGetMergeBranchNotCreated() throws Exception { + public void test01GetMergeBranchNotCreated() throws Exception { SevereLoggingMonitor monitorLog = new SevereLoggingMonitor(); OseeLog.registerLoggerListener(monitorLog); try { @@ -92,7 +97,7 @@ public class ConflictTest { * . */ @org.junit.Test - public void testGetConflictsPerBranch() { + public void test02GetConflictsPerBranch() { SevereLoggingMonitor monitorLog = new SevereLoggingMonitor(); OseeLog.registerLoggerListener(monitorLog); Collection<Conflict> conflicts = null; @@ -118,7 +123,7 @@ public class ConflictTest { * {@link org.eclipse.osee.framework.skynet.core.artifact.BranchManager#getMergeBranch(Branch, Branch)} . */ @org.junit.Test - public void testGetMergeBranchCreated() throws Exception { + public void test03GetMergeBranchCreated() throws Exception { SevereLoggingMonitor monitorLog = new SevereLoggingMonitor(); OseeLog.registerLoggerListener(monitorLog); try { @@ -140,7 +145,7 @@ public class ConflictTest { } @org.junit.Test - public void testResolveConflicts() { + public void test04ResolveConflicts() { SevereLoggingMonitor monitorLog = new SevereLoggingMonitor(); OseeLog.registerLoggerListener(monitorLog); try { @@ -178,7 +183,7 @@ public class ConflictTest { } @Ignore - public void testCommitWithoutResolutionErrors() { + public void test05CommitWithoutResolutionErrors() { SevereLoggingMonitor monitorLog = new SevereLoggingMonitor(); OseeLog.registerLoggerListener(monitorLog); try { @@ -199,7 +204,7 @@ public class ConflictTest { } @org.junit.Test - public void testCommitFiltering() throws OseeCoreException { + public void test06CommitFiltering() throws OseeCoreException { checkNoTxCurrent("art_id", "osee_artifact"); checkNoTxCurrent("attr_id", "osee_attribute"); checkNoTxCurrent("rel_link_id", "osee_relation_link"); diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java index 57051e1d556..03f255269b7 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/InterArtifactDropTest.java @@ -36,7 +36,7 @@ import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.relation.RelationLink; import org.eclipse.osee.framework.ui.skynet.update.InterArtifactExplorerDropHandlerOperation; import org.junit.AfterClass; -import org.junit.BeforeClass; +import org.junit.Before; import org.junit.Rule; import org.junit.Test; @@ -55,7 +55,7 @@ public class InterArtifactDropTest { public OseeLogMonitorRule monitorRule = new OseeLogMonitorRule(); @Rule - public static TestInfo method = new TestInfo(); + public TestInfo method = new TestInfo(); private static Artifact sourceArtifact1; private static Artifact sourceArtifact2; @@ -69,15 +69,24 @@ public class InterArtifactDropTest { private static IOseeBranch updateTestBranch2; private static IOseeBranch updateTestBranch3; - @BeforeClass - public static void setUp() throws Exception { - initializeBranches(); - addArtifactsToBranches(); + private static boolean wasInitialized = false; + + @Before + public void setUp() throws Exception { + // Initialization must run after the integration rule + // Can't use before class here + if (!wasInitialized) { + wasInitialized = true; + initializeBranches(); + addArtifactsToBranches(); + } } @AfterClass public static void tearDown() throws OseeCoreException { - purgeBranches(); + if (wasInitialized) { + purgeBranches(); + } } @Test @@ -88,7 +97,7 @@ public class InterArtifactDropTest { OseeSystemArtifacts.getDefaultHierarchyRootArtifact(destinationBranch), new Artifact[] {sourceArtifact1}, false); Operations.executeWork(dropHandler); - //Acquire the introduced artifact + // Acquire the introduced artifact Artifact destArtifact = ArtifactQuery.getArtifactFromId(sourceArtifact1.getArtId(), destinationBranch); assertTrue(sourceArtifact1.getName().equals(destArtifact.getName())); @@ -98,7 +107,8 @@ public class InterArtifactDropTest { @Test public void testUpdateBranch() throws Exception { - // source artifact updated and introduced to existing destination artifact + // source artifact updated and introduced to existing destination + // artifact Artifact updateTestArtifact = ArtifactQuery.getArtifactFromId(sourceArtifact1.getArtId(), updateTestBranch2); Attribute<Object> testAttr = updateTestArtifact.getSoleAttribute(CoreAttributeTypes.Name); testAttr.setFromString("I am an update branch test"); @@ -110,7 +120,7 @@ public class InterArtifactDropTest { new InterArtifactExplorerDropHandlerOperation(sourceArtifact1, new Artifact[] {updateTestArtifact}, false); Operations.executeWork(dropHandler); - //Acquire the updated artifact + // Acquire the updated artifact Artifact destArtifact = ArtifactQuery.getArtifactFromId(updateTestArtifact.getArtId(), sourceArtifact1.getBranch()); destArtifact.reloadAttributesAndRelations(); @@ -121,7 +131,8 @@ public class InterArtifactDropTest { @Test public void testDeleteAttributeFromArtifactBranch() throws Exception { - //attribute deleted and introduced to existing attribute on sourceBranch + // attribute deleted and introduced to existing attribute on + // sourceBranch Artifact deleteTestArtifact = ArtifactQuery.getArtifactFromId(sourceArtifact2.getArtId(), updateTestBranch1); Attribute<Object> destAttribute = deleteTestArtifact.getSoleAttribute(CoreAttributeTypes.StaticId); deleteTestArtifact.deleteAttribute(destAttribute); @@ -139,7 +150,7 @@ public class InterArtifactDropTest { @Test public void testDeleteRelationFromArtifactBranch() throws Exception { - //relation deleted and introduced to existing relation on sourceBranch + // relation deleted and introduced to existing relation on sourceBranch Artifact deleteTestArtifact = ArtifactQuery.getArtifactFromId(sourceArtifact2.getArtId(), updateTestBranch1); deleteTestArtifact.deleteRelation(CoreRelationTypes.Default_Hierarchical__Child, sourceChildArtifact1); deleteTestArtifact.persist(getClass().getSimpleName()); @@ -182,7 +193,8 @@ public class InterArtifactDropTest { @Test public void testDestinationArtifactDoesNotExistAsDeletedBranch() throws Exception { - // artifact deleted on source branch, does not exist on destination branch + // artifact deleted on source branch, does not exist on destination + // branch // the deleted artifact will be introduced as deleted InterArtifactExplorerDropHandlerOperation dropHandler = new InterArtifactExplorerDropHandlerOperation( @@ -193,7 +205,7 @@ public class InterArtifactDropTest { Artifact destArtifact = ArtifactQuery.getArtifactFromId(sourceDeleteArtifact1.getArtId(), destinationBranch, DeletionFlag.INCLUDE_DELETED); - // artifact should be introduced + // artifact should be introduced assertNotNull(destArtifact); assertTrue(sourceDeleteArtifact1.getName().equals(destArtifact.getName())); assertTrue(sourceDeleteArtifact1.getGammaId() == destArtifact.getGammaId()); @@ -202,7 +214,8 @@ public class InterArtifactDropTest { @Test public void testUndeleteArtifactOnBranch() throws Exception { - // artifact deleted on updateBranch2 and introduced as non-deleted artifact on updateTestBranch2 + // artifact deleted on updateBranch2 and introduced as non-deleted + // artifact on updateTestBranch2 Artifact testArtifact = ArtifactQuery.getArtifactFromId(sourceDeleteArtifact1.getArtId(), updateTestBranch3); InterArtifactExplorerDropHandlerOperation dropHandler = @@ -214,29 +227,31 @@ public class InterArtifactDropTest { Artifact destArtifact = ArtifactQuery.getArtifactFromId(sourceDeleteArtifact1.getArtId(), updateTestBranch2, DeletionFlag.EXCLUDE_DELETED); - // artifact should be introduced + // artifact should be introduced assertNotNull(destArtifact); assertTrue(testArtifact.getName().equals(destArtifact.getName())); assertTrue(testArtifact.getGammaId() == destArtifact.getGammaId()); assertTrue(testArtifact.getModType() == destArtifact.getModType()); } - private static void addArtifactsToBranches() throws OseeCoreException { + private void addArtifactsToBranches() throws OseeCoreException { BranchManager.createWorkingBranch(CoreBranches.SYSTEM_ROOT, sourceBranch); BranchManager.createWorkingBranch(CoreBranches.SYSTEM_ROOT, destinationBranch); - // Add artifacts to source + // Add artifacts to source sourceArtifact1 = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, sourceBranch); sourceArtifact1.persist(method.getQualifiedTestName()); sourceChildArtifact1 = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, sourceBranch); sourceChildArtifact1.persist(method.getQualifiedTestName()); - // sourceArtifact2 has an additional attribute and a child artifact associated to it + // sourceArtifact2 has an additional attribute and a child artifact + // associated to it sourceArtifact2 = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, sourceBranch); sourceArtifact2.addAttribute(CoreAttributeTypes.StaticId); sourceArtifact2.addChild(sourceChildArtifact1); sourceArtifact2.persist(method.getQualifiedTestName()); - //updateTestBranch has sourceArtifact1/2, sourceChildArtifact1 and sourceDeleteArtifact + // updateTestBranch has sourceArtifact1/2, sourceChildArtifact1 and + // sourceDeleteArtifact BranchManager.createWorkingBranch(sourceBranch, updateTestBranch1); sourceArtifact3 = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, sourceBranch); @@ -244,17 +259,19 @@ public class InterArtifactDropTest { sourceDeleteArtifact1 = ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, sourceBranch); sourceDeleteArtifact1.persist(method.getQualifiedTestName()); - //updateTestBranch has sourceArtifact1/2/3, sourceChildArtifact1, sourceDeleteArtifact1 + // updateTestBranch has sourceArtifact1/2/3, sourceChildArtifact1, + // sourceDeleteArtifact1 BranchManager.createWorkingBranch(sourceBranch, updateTestBranch3); sourceDeleteArtifact1.delete(); sourceDeleteArtifact1.persist(method.getQualifiedTestName()); - //updateTestBranch has sourceArtifact1/2/3, sourceChildArtifact1, sourceDeleteArtifact1 (deleted) + // updateTestBranch has sourceArtifact1/2/3, sourceChildArtifact1, + // sourceDeleteArtifact1 (deleted) BranchManager.createWorkingBranch(sourceBranch, updateTestBranch2); } - private static void initializeBranches() { + private void initializeBranches() { sourceBranch = createBranchToken("Source"); destinationBranch = createBranchToken("Destination"); updateTestBranch1 = createBranchToken("updateTestBranch"); @@ -270,7 +287,7 @@ public class InterArtifactDropTest { BranchManager.purgeBranch(sourceBranch); } - private static IOseeBranch createBranchToken(String name) { + private IOseeBranch createBranchToken(String name) { String branchName = String.format("%s__%s", method.getQualifiedTestName(), name); return TokenFactory.createBranch(GUID.create(), branchName); } diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java index 639cc7730af..ad873770bbd 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/RelationIntegrityCheckTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.client.integration.tests.integration.ui.skynet; import static org.eclipse.osee.client.demo.DemoChoice.OSEE_CLIENT_DEMO; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; import org.eclipse.osee.framework.core.data.TokenFactory; diff --git a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/StringGuidsToArtifactListOperationTest.java b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/StringGuidsToArtifactListOperationTest.java index a322d70abec..87f4f789cb5 100644 --- a/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/StringGuidsToArtifactListOperationTest.java +++ b/plugins/org.eclipse.osee.client.integration.tests/src/org/eclipse/osee/client/integration/tests/integration/ui/skynet/StringGuidsToArtifactListOperationTest.java @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashSet; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.client.demo.DemoBranches; import org.eclipse.osee.client.test.framework.OseeClientIntegrationRule; import org.eclipse.osee.client.test.framework.OseeLogMonitorRule; diff --git a/plugins/org.eclipse.osee.client.test.framework/src/org/eclipse/osee/client/test/framework/OseeHousekeepingRule.java b/plugins/org.eclipse.osee.client.test.framework/src/org/eclipse/osee/client/test/framework/OseeHousekeepingRule.java index 925cd625f31..031479a84b6 100644 --- a/plugins/org.eclipse.osee.client.test.framework/src/org/eclipse/osee/client/test/framework/OseeHousekeepingRule.java +++ b/plugins/org.eclipse.osee.client.test.framework/src/org/eclipse/osee/client/test/framework/OseeHousekeepingRule.java @@ -11,7 +11,7 @@ package org.eclipse.osee.client.test.framework; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; import org.eclipse.osee.framework.skynet.core.artifact.ArtifactCache; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; diff --git a/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF index 0cbbe284fa2..cb1c7794232 100644 --- a/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.help.ui.test/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.coverage.help.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.junit -Import-Package: org.eclipse.core.runtime;version="3.4.0", +Import-Package: org.eclipse.core.runtime, org.eclipse.osee.framework.jdk.core.util, org.osgi.framework diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/Coverage_Integration_TestSuite.launch b/plugins/org.eclipse.osee.coverage.integration.tests/Coverage_Integration_TestSuite.launch index 7e2f186d586..223ae1a44e2 100644 --- a/plugins/org.eclipse.osee.coverage.integration.tests/Coverage_Integration_TestSuite.launch +++ b/plugins/org.eclipse.osee.coverage.integration.tests/Coverage_Integration_TestSuite.launch @@ -1,11 +1,9 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> <setAttribute key="additional_plugins"> -<setEntry value="org.eclipse.core.runtime.compatibility:3.2.200.v20120521-2346:default:true"/> -<setEntry value="org.eclipse.osee.client.integration.tests:0.11.0.qualifier:default:false"/> -<setEntry value="org.eclipse.osee.client.test.framework:0.11.0.qualifier:default:false"/> -<setEntry value="org.eclipse.osee.coverage.demo:0.11.0.qualifier:default:false"/> -<setEntry value="org.eclipse.osee.coverage.integration.tests:0.11.0.qualifier:default:true"/> +<setEntry value="org.eclipse.osee.client.integration.tests:0.11.1.qualifier:default:true"/> +<setEntry value="org.eclipse.osee.client.test.framework:0.11.1.qualifier:default:true"/> +<setEntry value="org.eclipse.osee.coverage.integration.tests:0.11.1.qualifier:default:true"/> </setAttribute> <booleanAttribute key="append.args" value="true"/> <booleanAttribute key="askclear" value="false"/> @@ -33,6 +31,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.coverage.integration.tests.CoverageIntegrationTestSuite"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -nosplash"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.coverage.integration.tests"/> @@ -42,11 +41,10 @@ <stringAttribute key="product" value="org.eclipse.osee.framework.ui.product.osee"/> <booleanAttribute key="run_in_ui_thread" value="true"/> <setAttribute key="selected_features"> +<setEntry value="org.eclipse.osee.ats.client.demo.feature:default"/> <setEntry value="org.eclipse.osee.ats.feature:default"/> <setEntry value="org.eclipse.osee.client.demo.feature:default"/> <setEntry value="org.eclipse.osee.client.feature:default"/> -<setEntry value="org.eclipse.osee.core.feature:default"/> -<setEntry value="org.eclipse.osee.core.plugin.feature:default"/> <setEntry value="org.eclipse.osee.core.runtime.feature:default"/> <setEntry value="org.eclipse.osee.core.ui.feature:default"/> <setEntry value="org.eclipse.osee.coverage.demo.feature:default"/> @@ -57,12 +55,10 @@ <setEntry value="org.eclipse.osee.framework.ui.feature:default"/> <setEntry value="org.eclipse.sdk:default"/> </setAttribute> -<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*12.0.0.v201212092141@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.lowagie.text@default:default,com.ning.async-http-client@default:default,de.itemis.xtext.antlr@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.xml@default:default,jcl.over.slf4j@default:default,org.antlr.generator@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.batik.css@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.codec*1.7.0@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.net@default:default,org.apache.commons.pool@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.apache.oro@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cyberneko.html@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.birt.core@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.compare.core@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.concurrent@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.launcher.win32.win32.x86_64@default:false,org.eclipse.equinox.launcher@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.apt.core@default:default,org.eclipse.jdt.apt.pluggable.core@default:default,org.eclipse.jdt.apt.ui@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.doc.isv@default:default,org.eclipse.jdt.doc.user@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit4.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.xpand@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.jsoup@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.mozilla.javascript@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*4.0.0.v201302062210@default:default,org.polarion.eclipse.team.svn.connector.svnkit17@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api*1.6.4.v20120130-2120@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="com.sun.jersey.client.apache@default:default,com.sun.jersey@default:default,javax.ws.rs@default:default,jms.libraries@default:default,net.jini@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.client.demo@default:default,org.eclipse.osee.ats.core.client.test@default:false,org.eclipse.osee.ats.core.client@default:default,org.eclipse.osee.ats.core.test@default:false,org.eclipse.osee.ats.core@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.ats.help.ui.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.ats.mocks@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.cache.admin.test@default:false,org.eclipse.osee.cache.admin@default:default,org.eclipse.osee.client.demo@default:default,org.eclipse.osee.client.test.framework@default:default,org.eclipse.osee.coverage.demo@default:default,org.eclipse.osee.coverage.help.ui.test@default:false,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.coverage.integration.tests@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.framework.access.provider@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl.ui.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.help.ui.test@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.orcs.rest.client@default:default,org.eclipse.osee.orcs.rest.model@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.support.test.util@default:default,org.hsqldb@default:default,org.jvnet.mimepull@default:default,org.mockito@default:default,org.objenesis@default:default,org.xerial.sqlite@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="timestamp" value="1358216577236"/> <booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> <booleanAttribute key="useProduct" value="true"/> diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF index e1ed00dd180..d420c3b6488 100644 --- a/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.integration.tests/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.coverage.integration.tests Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="[4.10.0,4.11.0)", +Require-Bundle: org.junit;bundle-version="4.11.0", org.mockito;bundle-version="1.9.0", org.hamcrest.core, org.objenesis, @@ -30,4 +30,4 @@ Import-Package: org.eclipse.osee.client.test.framework, org.eclipse.osee.framework.plugin.core.util, org.eclipse.osee.framework.ui.skynet.blam, org.eclipse.osee.framework.ui.skynet.render, - org.osgi.framework;version="1.6.0" + org.osgi.framework diff --git a/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/CoverageItemPersistTest.java b/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/CoverageItemPersistTest.java index 7bed8902704..7fe9ce7e848 100644 --- a/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/CoverageItemPersistTest.java +++ b/plugins/org.eclipse.osee.coverage.integration.tests/src/org/eclipse/osee/coverage/integration/tests/integration/CoverageItemPersistTest.java @@ -37,12 +37,15 @@ import org.eclipse.osee.framework.skynet.core.transaction.TransactionManager; import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; +import org.junit.FixMethodOrder; import org.junit.Rule; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Donald G. Dunne */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CoverageItemPersistTest { public static CoverageUnit parentCu = null; @@ -96,7 +99,7 @@ public class CoverageItemPersistTest { * Test method for {@link org.eclipse.osee.coverage.model.CoverageItem#asArtifact(boolean)}. */ @Test - public void testGetArtifact() throws OseeCoreException { + public void test01GetArtifact() throws OseeCoreException { try { ArtifactQuery.getArtifactFromId(parentGuid, CoverageTestUtil.getTestBranch()); Assert.fail("Artifact should not yet exist"); @@ -119,7 +122,7 @@ public class CoverageItemPersistTest { * {@link org.eclipse.osee.coverage.model.CoverageItem#save(SkynetTransaction, String, CoverageOptionManager)} */ @Test - public void testSave() throws OseeCoreException { + public void test02Save() throws OseeCoreException { // Since test units are stored through provider, ensure they are same before and after save Assert.assertEquals(10, ci.getTestUnits().size()); @@ -153,7 +156,7 @@ public class CoverageItemPersistTest { * Test method for {@link org.eclipse.osee.coverage.model.CoverageItem#asArtifact(boolean)}. */ @Test - public void testGetArtifact2() throws OseeCoreException { + public void test03GetArtifact2() throws OseeCoreException { OseeCoverageUnitStore.get(parentCu, CoverageTestUtil.getTestBranch()).load( CoverageOptionManagerDefault.instance()); CoverageItem ci = parentCu.getCoverageItems().iterator().next(); @@ -173,7 +176,7 @@ public class CoverageItemPersistTest { * . */ @Test - public void testDelete() throws OseeCoreException { + public void test04Delete() throws OseeCoreException { Artifact artifact = new OseeCoverageUnitStore(parentCu, CoverageTestUtil.getTestBranch(), null, readOnlyTestUnitNames).getArtifact(false); Assert.assertNotNull(artifact); 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 cb210377975..17aacff7eb9 100644 --- a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.coverage Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="[4.10.0,4.11.0)", +Require-Bundle: org.junit;bundle-version="4.11.0", org.mockito;bundle-version="1.9.0", org.hamcrest.core Import-Package: org.eclipse.osee.framework.database.init diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/model/CoverageItemTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/model/CoverageItemTest.java index cefe76d8ccc..6160b124919 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/model/CoverageItemTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/model/CoverageItemTest.java @@ -14,11 +14,14 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.junit.Assert; import org.junit.BeforeClass; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * @author Donald G. Dunne */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class CoverageItemTest { public static CoverageUnit parent = null; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/store/TestUnitCacheTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/store/TestUnitCacheTest.java index 3419764b142..f4a9bfe0d02 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/store/TestUnitCacheTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/store/TestUnitCacheTest.java @@ -18,7 +18,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map.Entry; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.coverage.model.CoverageItem; import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; diff --git a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/traceability/TestUnitAnnotationUtilityTest.java b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/traceability/TestUnitAnnotationUtilityTest.java index 4d9156d39fd..d4e23399d95 100644 --- a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/traceability/TestUnitAnnotationUtilityTest.java +++ b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/traceability/TestUnitAnnotationUtilityTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.define.traceability; import java.nio.CharBuffer; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF index 68835c94819..ba6a65d00ae 100644 --- a/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.display.presenter/META-INF/MANIFEST.MF @@ -25,4 +25,4 @@ Import-Package: org.eclipse.osee.display.api, org.eclipse.osee.orcs.utility Export-Package: org.eclipse.osee.display.presenter Require-Bundle: org.eclipse.core.runtime, - com.google.guava;bundle-version="[10.0.0,11.0.0)" + com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF index d39f9f4094b..df2f36016cc 100644 --- a/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.access/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.access;singleton:=true Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: com.google.common.cache, - org.eclipse.core.resources, +Import-Package: org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, @@ -41,4 +40,4 @@ Eclipse-ExtensibleAPI: true Export-Package: org.eclipse.osee.framework.access, org.eclipse.osee.framework.access.internal.data Service-Component: OSGI-INF/*.xml -Require-Bundle: com.google.guava;bundle-version="12.0.0" +Require-Bundle: com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF index e3ced05edfa..9c6bebb1c1b 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration/META-INF/MANIFEST.MF @@ -22,8 +22,7 @@ Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.jdk.core.util, org.osgi.framework Require-Bundle: org.eclipse.xtext, - org.eclipse.core.runtime, - com.google.guava;bundle-version="10.0.1" + org.eclipse.core.runtime Export-Package: org.eclipse.osee.framework.core.dsl.integration, org.eclipse.osee.framework.core.dsl.integration.util Service-Component: OSGI-INF/*.xml diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF index cf97db0633b..4b6cc4e02d1 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/META-INF/MANIFEST.MF @@ -5,13 +5,10 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl.ui.integration;singleto Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Import-Package: org.eclipse.compare, - org.eclipse.core.commands.common, +Import-Package: org.eclipse.core.commands.common, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.core.runtime.jobs, - org.eclipse.emf.compare.diff.metamodel, - org.eclipse.emf.compare.ui.editor, org.eclipse.nebula.widgets.xviewer, org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.core.client.server, diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java index b057d25e101..77d491a6b92 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/AbstractDslRenderer.java @@ -125,7 +125,6 @@ public abstract class AbstractDslRenderer extends FileSystemRenderer { return NO_MATCH; } - @SuppressWarnings("unused") @Override public final void open(final List<Artifact> artifacts, final PresentationType presentationType) throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java index a837c04f82d..633a468b6db 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/internal/OseeDslRenderer.java @@ -49,7 +49,6 @@ public final class OseeDslRenderer extends AbstractDslRenderer { return new OseeDslRenderer(); } - @SuppressWarnings("unused") @Override public String getAssociatedExtension(Artifact artifact) throws OseeCoreException { return "osee"; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java index c51606f9446..234dfc5938a 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/OseeTypesImportOperation.java @@ -11,7 +11,6 @@ package org.eclipse.osee.framework.core.dsl.ui.integration.operations; import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URI; @@ -19,21 +18,10 @@ import java.net.URL; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.eclipse.compare.CompareEditorInput; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.emf.compare.diff.metamodel.ComparisonSnapshot; -import org.eclipse.emf.compare.ui.editor.ModelCompareEditorInput; -import org.eclipse.emf.ecore.resource.Resource; -import org.eclipse.emf.ecore.resource.ResourceSet; -import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl; import org.eclipse.osee.framework.core.data.OseeServerContext; import org.eclipse.osee.framework.core.dsl.ui.integration.internal.DslUiIntegrationConstants; import org.eclipse.osee.framework.core.enums.CoreTranslatorId; -import org.eclipse.osee.framework.core.exception.OseeCoreException; -import org.eclipse.osee.framework.core.exception.OseeExceptions; import org.eclipse.osee.framework.core.model.OseeImportModelRequest; import org.eclipse.osee.framework.core.model.OseeImportModelResponse; import org.eclipse.osee.framework.core.model.TableData; @@ -41,12 +29,7 @@ import org.eclipse.osee.framework.core.operation.AbstractOperation; import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.core.services.IOseeCachingService; import org.eclipse.osee.framework.jdk.core.util.Lib; -import org.eclipse.osee.framework.jdk.core.util.Strings; -import org.eclipse.osee.framework.plugin.core.util.Jobs; import org.eclipse.osee.framework.skynet.core.artifact.HttpClientMessage; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.progress.UIJob; /** * @author Roberto E. Escobar @@ -56,14 +39,12 @@ public class OseeTypesImportOperation extends AbstractOperation { private final URI model; private final boolean isPersistAllowed; private final boolean createTypeChangeReport; - private final boolean createCompareReport; - public OseeTypesImportOperation(IOseeCachingService cacheService, URI model, boolean createTypeChangeReport, boolean createCompareReport, boolean isPersistAllowed) { + public OseeTypesImportOperation(IOseeCachingService cacheService, URI model, boolean createTypeChangeReport, boolean isPersistAllowed) { super("Import Osee Types Model", DslUiIntegrationConstants.PLUGIN_ID); this.cacheService = cacheService; this.model = model; this.isPersistAllowed = isPersistAllowed; - this.createCompareReport = createCompareReport; this.createTypeChangeReport = createTypeChangeReport; } @@ -91,8 +72,8 @@ public class OseeTypesImportOperation extends AbstractOperation { Map<String, String> parameters = new HashMap<String, String>(); OseeImportModelRequest modelRequest = - new OseeImportModelRequest(getName(model), getModel(model.toURL()), createTypeChangeReport, - createCompareReport, isPersistAllowed); + new OseeImportModelRequest(getName(model), getModel(model.toURL()), createTypeChangeReport, false, + isPersistAllowed); OseeImportModelResponse response = HttpClientMessage.send(OseeServerContext.OSEE_MODEL_CONTEXT, parameters, @@ -109,48 +90,6 @@ public class OseeTypesImportOperation extends AbstractOperation { openTabReport(response.getReportData()); } - if (createCompareReport) { - String compareName = response.getComparisonSnapshotModelName(); - String compareData = response.getComparisonSnapshotModel(); - if (Strings.isValid(compareData) && Strings.isValid(compareName)) { - ComparisonSnapshot snapshot = loadComparisonSnapshot(compareName, compareData); - openCompareEditor(snapshot); - } - } - } - - private static ComparisonSnapshot loadComparisonSnapshot(String compareName, String compareData) throws OseeCoreException { - ComparisonSnapshot snapshot = null; - try { - ResourceSet resourceSet = new ResourceSetImpl(); - Resource resource = resourceSet.createResource(org.eclipse.emf.common.util.URI.createURI(compareName)); - resource.load(new ByteArrayInputStream(compareData.getBytes("UTF-8")), resourceSet.getLoadOptions()); - snapshot = (ComparisonSnapshot) resource.getContents().get(0); - } catch (IOException ex) { - OseeExceptions.wrapAndThrow(ex); - } - return snapshot; - } - - private void openCompareEditor(final ComparisonSnapshot snapshot) { - Job job = new UIJob("Open Compare") { - - @Override - public IStatus runInUIThread(IProgressMonitor monitor) { - IStatus status; - try { - CompareEditorInput input = new ModelCompareEditorInput(snapshot); - IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage(); - page.openEditor(input, "org.eclipse.compare.CompareEditor", true); - status = Status.OK_STATUS; - } catch (Exception ex) { - status = - new Status(IStatus.ERROR, DslUiIntegrationConstants.PLUGIN_ID, "Error opening compare editor", ex); - } - return status; - } - }; - Jobs.startJob(job); } private void openTabReport(List<TableData> tableData) { diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java index 7a84dfa06cc..6172620eccc 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui.integration/src/org/eclipse/osee/framework/core/dsl/ui/integration/operations/XtextOseeTypesHandler.java @@ -32,7 +32,7 @@ public class XtextOseeTypesHandler implements IOseeTypesHandler { @Override public void execute(IProgressMonitor monitor, URI uri) throws OseeCoreException { IOseeCachingService cacheService = getCachingService(); - IOperation operation = new OseeTypesImportOperation(cacheService, uri, false, false, true); + IOperation operation = new OseeTypesImportOperation(cacheService, uri, false, true); Operations.executeWorkAndCheckStatus(operation, monitor); } diff --git a/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF index ed96fffe3f4..46d69ade52b 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl.ui/META-INF/MANIFEST.MF @@ -7,13 +7,17 @@ Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl.ui; singleton:=true Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.osee.framework.core.dsl;visibility:=reexport, org.eclipse.xtext.ui, - org.eclipse.ui.editors, - org.eclipse.ui.ide, + org.eclipse.ui.editors;bundle-version="3.5.0", + org.eclipse.ui.ide;bundle-version="3.5.0", org.eclipse.xtext.ui.shared, org.eclipse.ui, org.eclipse.xtext.builder, - org.antlr.runtime -Import-Package: org.apache.log4j, + org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", + org.eclipse.xtext.common.types.ui, + org.eclipse.xtext.ui.codetemplates.ui, + org.eclipse.compare +Import-Package: org.apache.commons.logging, + org.apache.log4j;version="1.2.15", org.eclipse.osee.framework.jdk.core.util Export-Package: org.eclipse.osee.framework.core.dsl.ui, org.eclipse.osee.framework.core.dsl.ui.contentassist, diff --git a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF index ec46919ad86..8c1daf6e712 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.dsl/META-INF/MANIFEST.MF @@ -5,19 +5,20 @@ Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Bundle-SymbolicName: org.eclipse.osee.framework.core.dsl;singleton:=true Bundle-ActivationPolicy: lazy -Require-Bundle: org.eclipse.xtext;bundle-version="2.0.0";visibility:=reexport, - org.apache.log4j;bundle-version="1.2.15";visibility:=reexport, - org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional;visibility:=reexport, - org.eclipse.xtext.generator;resolution:=optional, - org.eclipse.emf.codegen.ecore;resolution:=optional, - org.eclipse.emf.mwe.utils;resolution:=optional, - org.eclipse.emf.mwe2.launch;resolution:=optional, +Require-Bundle: org.eclipse.xtext;bundle-version="2.3.0";visibility:=reexport, + org.eclipse.xtext.generator;resolution:=optional;x-installation:=greedy, + org.eclipse.emf.codegen.ecore;resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe.utils;resolution:=optional;x-installation:=greedy, + org.eclipse.emf.mwe2.launch;resolution:=optional;x-installation:=greedy, + org.eclipse.xtext.ui.codetemplates;resolution:=optional;x-installation:=greedy, org.eclipse.xtext.util, org.eclipse.emf.ecore, org.eclipse.emf.common, - org.antlr.runtime + org.antlr.runtime;bundle-version="[3.2.0,3.2.1)", + org.eclipse.xtext.common.types, + org.eclipse.xtext.xbase.lib;bundle-version="2.3.0" Import-Package: org.apache.commons.logging, - org.apache.log4j + org.apache.log4j;version="1.2.15" Export-Package: org.eclipse.osee.framework.core.dsl, org.eclipse.osee.framework.core.dsl.conversion, org.eclipse.osee.framework.core.dsl.oseeDsl, diff --git a/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF index c37c51dc987..99e5b2c9410 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.core.model.test/META-INF/MANIFEST.MF @@ -6,7 +6,7 @@ Bundle-Version: 0.11.1.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.core.model Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="[4.10.0,4.11.0)" +Require-Bundle: org.junit;bundle-version="4.11.0" Export-Package: org.eclipse.osee.framework.core.model, org.eclipse.osee.framework.core.model.cache, org.eclipse.osee.framework.core.model.mocks, diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/ScopeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/ScopeTest.java index 505242ba6fa..1559039e3b8 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/ScopeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/ScopeTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.model.access; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java index 9c2ed452ff2..cc3278df4f7 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/AbstractOseeCacheTest.java @@ -15,20 +15,24 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; + import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.exception.OseeTypeDoesNotExist; import org.eclipse.osee.framework.core.model.AbstractOseeType; import org.junit.Assert; +import org.junit.FixMethodOrder; import org.junit.Ignore; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * Test Case for {@link AbstractOseeCache} * * @author Roberto E. Escobar */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class AbstractOseeCacheTest<K, T extends AbstractOseeType<K>> { private final List<T> data; private final AbstractOseeCache<K, T> cache; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java index dc47bf35c93..f228b32370e 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java @@ -12,16 +12,20 @@ package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Collection; + import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.OseeField; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.junit.Assert; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized.Parameters; /** * @author Roberto E. Escobar */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class BaseOseeFieldTest { private final OseeFieldTestData<?> test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java index 939e1682727..9d10022c9e0 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java @@ -12,18 +12,22 @@ package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Collection; + import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.OseeField; import org.eclipse.osee.framework.jdk.core.util.Compare; import org.junit.Assert; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; /** * @author Roberto E. Escobar */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) public class OseeFieldMainTest { private final OseeFieldTestData<?> test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java index 37b9ad49d5b..6ea1fdf22a3 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java @@ -12,10 +12,13 @@ package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.Collection; + import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.core.model.IOseeStorable; import org.eclipse.osee.framework.core.model.internal.fields.UniqueIdField; +import org.junit.FixMethodOrder; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; @@ -24,6 +27,7 @@ import org.junit.runners.Parameterized.Parameters; * * @author Roberto E. Escobar */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) public class UniqueIdFieldTest extends BaseOseeFieldTest { diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java index 0787968b16d..ccf71a17a50 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/exception/OseeExceptionsTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.exception; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.OseeCodeVersion; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeExceptions; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java index 27dee796424..126e7095d76 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/operation/OperationBuilderTest.java @@ -16,7 +16,7 @@ import static org.mockito.Mockito.inOrder; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/XResultDataTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/XResultDataTest.java index 2ae7bfc7a85..458bee02450 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/XResultDataTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/util/XResultDataTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.util; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.util.IResultDataListener; import org.eclipse.osee.framework.core.util.XResultData; import org.eclipse.osee.framework.core.util.XResultData.Type; diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/UrlQueryTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/UrlQueryTest.java index 1d8c1cf309b..50b7782d42d 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/UrlQueryTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/util/UrlQueryTest.java @@ -32,7 +32,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; import java.util.TreeMap; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF index 3eb70eadd04..8e4a99e50cb 100644 --- a/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.manager.servlet/META-INF/MANIFEST.MF @@ -40,4 +40,4 @@ Service-Component: OSGI-INF/*.xml Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Require-Bundle: org.eclipse.core.runtime, javax.servlet;bundle-version="2.5.0", - com.google.guava;bundle-version="12.0.0" + com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.framework.messaging.test/Messaging_Integration_TestSuite.launch b/plugins/org.eclipse.osee.framework.messaging.test/Messaging_Integration_TestSuite.launch index 1c5ac7a9b60..6f51a2f8f73 100644 --- a/plugins/org.eclipse.osee.framework.messaging.test/Messaging_Integration_TestSuite.launch +++ b/plugins/org.eclipse.osee.framework.messaging.test/Messaging_Integration_TestSuite.launch @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<setAttribute key="additional_plugins"> +<setEntry value="lba.osee.client.integration.tests:0.11.1.qualifier:default:false"/> +</setAttribute> <booleanAttribute key="append.args" value="true"/> <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> <booleanAttribute key="askclear" value="false"/> @@ -12,6 +15,8 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> +<stringAttribute key="featureDefaultLocation" value="workspace"/> +<stringAttribute key="featurePluginResolution" value="workspace"/> <booleanAttribute key="includeOptional" value="false"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -24,6 +29,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.framework.messaging.integration.AllMessagingIntegrationTestSuite"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.framework.messaging.test"/> @@ -31,7 +37,8 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="lba.ote.outfile.conversion.app.convert"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="javax.xml@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default"/> +<setAttribute key="selected_features"/> +<stringAttribute key="selected_target_plugins" value="javax.xml@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.osgi@-1:true,org.hamcrest.core@default:default"/> <stringAttribute key="selected_workspace_plugins" value="jms.activemq.launch@default:default,jms.libraries@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.mockito@default:default,org.objenesis@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="timestamp" value="1352335978869"/> diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF index cbcbf21cee9..ebd0899392d 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.skynet.core.test;singleton:=true Bundle-Version: 0.11.1.qualifier Fragment-Host: org.eclipse.osee.framework.skynet.core Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit;bundle-version="[4.10.0,4.11.0)", +Require-Bundle: org.junit;bundle-version="4.11.0", org.mockito;bundle-version="1.9.0", org.hamcrest.core, org.objenesis diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/RoughArtifactMetaDataTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/RoughArtifactMetaDataTest.java index d6ef34d6b94..319101b79b9 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/RoughArtifactMetaDataTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/importing/parsers/RoughArtifactMetaDataTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.importing.parsers; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java index b14f84a6da7..1889bffb6c0 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventHandlersTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.internal.event; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteAccessControlEvent1; import org.eclipse.osee.framework.messaging.event.res.msgs.RemoteBranchEvent1; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java index c2d63b6ae09..42805dce3f5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/internal/event/EventListenerRegistryTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.internal.event; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.skynet.core.event.filter.IEventFilter; import org.eclipse.osee.framework.skynet.core.event.listener.EventQosType; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java index 09a071a03e5..b3cc63f1eea 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/RelationTypeSideSorterTest.java @@ -20,6 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Random; + import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationType; @@ -48,14 +49,17 @@ import org.eclipse.osee.framework.skynet.core.relation.order.RelationSorterProvi import org.eclipse.osee.framework.skynet.core.types.IArtifact; import org.eclipse.osee.framework.skynet.core.utility.Artifacts; import org.junit.Assert; +import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runner.RunWith; +import org.junit.runners.MethodSorters; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; /** * @author Roberto E. Escobar */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) @RunWith(Parameterized.class) public class RelationTypeSideSorterTest { private final static Random randomGenerator = new Random(); @@ -75,12 +79,12 @@ public class RelationTypeSideSorterTest { } @Test - public void testConstruction() { + public void test01Construction() { Assert.assertNotNull(sorter); } @Test - public void testGetIArtifact() throws OseeCoreException { + public void test02GetIArtifact() throws OseeCoreException { Assert.assertNotNull(orderData.getIArtifact()); Assert.assertEquals(orderData.getIArtifact(), sorter.getIArtifact()); @@ -94,17 +98,17 @@ public class RelationTypeSideSorterTest { } @Test - public void testGetRelationType() { + public void test03GetRelationType() { Assert.assertEquals(relationType, sorter.getRelationType()); } @Test - public void testGetRelationSide() { + public void test04GetRelationSide() { Assert.assertEquals(relationSide, sorter.getSide()); } @Test - public void testGetSorterId() throws OseeCoreException { + public void test05GetSorterId() throws OseeCoreException { String sorterGuid = orderData.getCurrentSorterGuid(relationType, relationSide); IRelationSorterId expected = sorterProvider.getRelationOrder(sorterGuid).getSorterId(); Assert.assertNotNull(sorterGuid); @@ -114,7 +118,7 @@ public class RelationTypeSideSorterTest { } @Test - public void testSorterName() throws OseeCoreException { + public void test06SorterName() throws OseeCoreException { String sorterGuid = orderData.getCurrentSorterGuid(relationType, relationSide); IRelationSorterId expected = sorterProvider.getRelationOrder(sorterGuid).getSorterId(); Assert.assertNotNull(sorterGuid); @@ -122,7 +126,7 @@ public class RelationTypeSideSorterTest { } @Test - public void testSetOrder() throws OseeCoreException { + public void test07SetOrder() throws OseeCoreException { IArtifact art3 = createArtifact("c", GUID.create()); IArtifact art4 = createArtifact("d", GUID.create()); @@ -142,7 +146,7 @@ public class RelationTypeSideSorterTest { } @Test - public void testSort() { + public void test08Sort() { // sorter.sort(listToOrder) // RelationSorter sorter = null; // List<IArtifact> sorted = sorter.getSortedRelatives(relatives); @@ -150,7 +154,7 @@ public class RelationTypeSideSorterTest { } @Test - public void testEquals() { + public void test09Equals() { // RelationSorter a = new RelationSorter(RelationTypeManager.getType(6), RelationSide.SIDE_A); // RelationSorter b = new RelationSorter(RelationTypeManager.getType(7), RelationSide.SIDE_B); // assertFalse(a.equals(b)); @@ -158,7 +162,7 @@ public class RelationTypeSideSorterTest { } @Test - public void testAddItem() throws OseeCoreException { + public void test10AddItem() throws OseeCoreException { IArtifact itemToAdd = createArtifact("Item to Add", GUID.create()); List<IArtifact> startingArtifacts = new ArrayList<IArtifact>(); @@ -195,7 +199,7 @@ public class RelationTypeSideSorterTest { } @Test - public void testToString() throws OseeCoreException { + public void test11ToString() throws OseeCoreException { String artGuid = sorter.getIArtifact().getGuid(); String sorterGuid = orderData.getCurrentSorterGuid(relationType, relationSide); IRelationSorterId expectedId = sorterProvider.getRelationOrder(sorterGuid).getSorterId(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java index b3c3273f054..e777850607c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/transaction/TxMonitorImplTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.transaction; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java index 4308fb854dd..3d31f0aa098 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java @@ -15,7 +15,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; import java.net.URL; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF index e8e835bdf2d..5eb7e55d293 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.skynet.core/META-INF/MANIFEST.MF @@ -7,7 +7,6 @@ Eclipse-ExtensibleAPI: true Bundle-Activator: org.eclipse.osee.framework.skynet.core.internal.Activator Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.resources, - org.eclipse.compare, net.jini, org.eclipse.osee.framework.jdk.core, org.eclipse.osee.framework.database, diff --git a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsArtifactExtractor.java b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsArtifactExtractor.java index dbc69fa6436..a83b7906a92 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsArtifactExtractor.java +++ b/plugins/org.eclipse.osee.framework.skynet.core/src/org/eclipse/osee/framework/skynet/core/importing/parsers/DoorsArtifactExtractor.java @@ -100,7 +100,7 @@ public class DoorsArtifactExtractor extends AbstractArtifactExtractor { return false; } - private class Handler extends AbstractSaxHandler { + public class Handler extends AbstractSaxHandler { private boolean isTitle = false; private final Vector<String> currentRow = new Vector<String>(); diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGeneratorTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGeneratorTest.java index 5429d12bd13..a2afb3da87a 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGeneratorTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/util/VbaWordDiffGeneratorTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.util; import java.io.File; import java.io.IOException; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.osee.framework.jdk.core.util.Lib; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF index 42c10722402..5ff2c63f7ca 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF @@ -34,7 +34,7 @@ Require-Bundle: javax.mail.glassfish, org.eclipse.osee.framework.access, org.eclipse.core.filesystem, org.eclipse.osee.framework.core, - com.google.guava;bundle-version="12.0.0", + com.google.guava;bundle-version="[11.0.0,15.0.0)", org.eclipse.xtext.ui;bundle-version="2.3.1" Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Open System Engineering Environment @@ -48,7 +48,6 @@ Import-Package: com.lowagie.text;version="2.1.7", org.eclipse.core.resources, org.eclipse.jdt.core, org.eclipse.jdt.core.search, - org.eclipse.nebula.widgets.calendarcombo, org.eclipse.nebula.widgets.xviewer, org.eclipse.osee.framework.access, org.eclipse.osee.framework.core.client, diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailMessageTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailMessageTest.java index 1b99192446b..c099aa64c44 100644 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailMessageTest.java +++ b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailMessageTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.LinkedList; import javax.activation.DataSource; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; diff --git a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigTest.java b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigTest.java index 89d10d73cab..1c9bfb18e84 100644 --- a/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigTest.java +++ b/plugins/org.eclipse.osee.mail.test/src/org/eclipse/osee/mail/MailServiceConfigTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.mail; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/ArtifactImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/ArtifactImplTest.java index da4c3f35d18..e43f694d426 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/ArtifactImplTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/ArtifactImplTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.core.internal.attribute; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeClassResolverTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeClassResolverTest.java index 816366aa86e..f65a14ac93a 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeClassResolverTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeClassResolverTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.orcs.core.AttributeClassProvider; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollectionTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollectionTest.java index c33e13b1282..09e3b1e8d6f 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollectionTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeCollectionTest.java @@ -17,7 +17,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactoryTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactoryTest.java index 3fae804ff07..c3f188375eb 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactoryTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/attribute/AttributeFactoryTest.java @@ -14,7 +14,7 @@ import static junit.framework.Assert.*; import static org.mockito.Matchers.*; import static org.mockito.Mockito.*; import java.lang.ref.WeakReference; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java index 04601455455..6d2c2257dff 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/DeletedBranchProviderTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.orcs.core.internal.branch.provider; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.BranchArchivedState; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProviderTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProviderTest.java index 3e1ac53e29c..6bb0e6e1464 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProviderTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/branch/provider/MultiBranchProviderTest.java @@ -14,7 +14,7 @@ import java.util.Collection; import java.util.Collections; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ArtifactWriteableInvocationHandlerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ArtifactWriteableInvocationHandlerTest.java index 26a8f10319d..ececb44cc25 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ArtifactWriteableInvocationHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ArtifactWriteableInvocationHandlerTest.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.orcs.core.internal.artifact.ArtifactFactory; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ProxyTestHelper.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ProxyTestHelper.java index bc63a57f85a..366f570d77e 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ProxyTestHelper.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ProxyTestHelper.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.mockito.Mockito; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ReadableInvocationHandlerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ReadableInvocationHandlerTest.java index f634664a8a8..d700840057c 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ReadableInvocationHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/ReadableInvocationHandlerTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.core.internal.proxy.handler; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.orcs.core.internal.proxy.HasProxiedObject; import org.eclipse.osee.orcs.core.internal.proxy.ProxyUtil; import org.eclipse.osee.orcs.data.ArtifactReadable; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/WriteableInvocationHandlerTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/WriteableInvocationHandlerTest.java index e0e008815aa..a3bb6e0142c 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/WriteableInvocationHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/proxy/handler/WriteableInvocationHandlerTest.java @@ -16,7 +16,7 @@ import static org.mockito.Mockito.verify; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.orcs.core.internal.proxy.HasProxiedObject; import org.eclipse.osee.orcs.core.internal.proxy.ProxyUtil; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/search/SearchCriteriaTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/search/SearchCriteriaTest.java index cd62c389299..c67d2f3bc7a 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/search/SearchCriteriaTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/search/SearchCriteriaTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.orcs.core.internal.search; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImplTest.java index 8cce1aecf56..99d6566c7fc 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImplTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TransactionFactoryImplTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.core.internal.transaction; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.exception.OseeArgumentException; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerImplTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerImplTest.java index 2779ccee91b..6a1c2c561e2 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerImplTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/TxDataManagerImplTest.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/handler/CollectAndCopyDirtyDataTest.java b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/handler/CollectAndCopyDirtyDataTest.java index b2c8260095a..4676e1030ce 100644 --- a/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/handler/CollectAndCopyDirtyDataTest.java +++ b/plugins/org.eclipse.osee.orcs.core.test/src/org/eclipse/osee/orcs/core/internal/transaction/handler/CollectAndCopyDirtyDataTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.orcs.core.ds.ArtifactData; import org.eclipse.osee.orcs.core.ds.ArtifactTransactionData; diff --git a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF index 5a0db08f707..34c2a0a58b3 100644 --- a/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.db.mock/META-INF/MANIFEST.MF @@ -13,11 +13,9 @@ Import-Package: org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.jdk.core.util.annotation, org.eclipse.osee.framework.jdk.core.util.network, org.eclipse.osee.hsqldb, - org.junit;version="4.8.2", - org.junit.rules;version="4.8.2", - org.junit.runners.model;version="4.8.2", - org.osgi.framework;version="1.6.0", - org.osgi.util.tracker;version="1.5.0" + org.osgi.framework, + org.osgi.util.tracker Export-Package: org.eclipse.osee.orcs.db.mock -Require-Bundle: org.eclipse.core.runtime +Require-Bundle: org.eclipse.core.runtime, + org.junit;bundle-version="4.11.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java index 667e884630b..b8de8cef3c7 100644 --- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java +++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OseeDatabase.java @@ -12,14 +12,14 @@ package org.eclipse.osee.orcs.db.mock; import org.eclipse.osee.orcs.db.mock.internal.TestDatabase; import org.junit.Assert; -import org.junit.rules.MethodRule; -import org.junit.runners.model.FrameworkMethod; +import org.junit.rules.TestRule; +import org.junit.runner.Description; import org.junit.runners.model.Statement; /** * @author Roberto E. Escobar */ -public class OseeDatabase implements MethodRule { +public class OseeDatabase implements TestRule { private final String connectionId; @@ -28,12 +28,12 @@ public class OseeDatabase implements MethodRule { } @Override - public Statement apply(final Statement base, final FrameworkMethod method, final Object target) { + public Statement apply(final Statement base, final Description description) { return new Statement() { @Override public void evaluate() throws Throwable { Assert.assertNotNull("Connection Id cannot be null", connectionId); - TestDatabase db = new TestDatabase(connectionId, method, target); + TestDatabase db = new TestDatabase(connectionId, description.getTestClass().getSimpleName(), description.getMethodName()); try { db.initialize(); base.evaluate(); @@ -41,7 +41,6 @@ public class OseeDatabase implements MethodRule { db.cleanup(); } } - }; } } diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java index 9dabc96f42b..2a8fbfe5745 100644 --- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java +++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/OsgiRule.java @@ -16,10 +16,13 @@ import java.util.Map; import org.eclipse.osee.framework.jdk.core.util.annotation.AnnotationProcessor; import org.eclipse.osee.framework.jdk.core.util.annotation.FieldAnnotationHandler; import org.eclipse.osee.orcs.db.mock.internal.OsgiServiceFieldAnnotationHandler; -import org.junit.rules.TestWatchman; -import org.junit.runners.model.FrameworkMethod; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; -public class OsgiRule extends TestWatchman { +/** + * @author Roberto E. Escobar + */ +public class OsgiRule extends TestWatcher { private static final AnnotationProcessor processor = createProcessor(); private final Object[] objects; @@ -29,7 +32,8 @@ public class OsgiRule extends TestWatchman { } @Override - public void starting(FrameworkMethod method) { + protected void starting(Description description) { + super.starting(description); try { processor.initAnnotations(objects); } catch (Exception ex) { diff --git a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java index 8b48c7fa2f8..59027fceafa 100644 --- a/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java +++ b/plugins/org.eclipse.osee.orcs.db.mock/src/org/eclipse/osee/orcs/db/mock/internal/TestDatabase.java @@ -24,7 +24,6 @@ import org.eclipse.osee.framework.jdk.core.util.network.PortUtil; import org.eclipse.osee.hsqldb.HyperSqlDbServer; import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.junit.Assert; -import org.junit.runners.model.FrameworkMethod; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; import org.osgi.framework.FrameworkUtil; @@ -35,23 +34,22 @@ import org.osgi.framework.ServiceRegistration; */ public class TestDatabase { - private final FrameworkMethod method; - private final Object target; + private final String className; + private final String methodName; private ServiceRegistration<?> registration; private File tempFolder; private final String connectionId; - public TestDatabase(String connectionId, FrameworkMethod method, Object target) { + public TestDatabase(String connectionId, String className, String methodName) { this.connectionId = connectionId; - this.method = method; - this.target = target; + this.className = className; + this.methodName = methodName; } - private File createTempFolder(FrameworkMethod method, Object target) { + private File createTempFolder() { String tempDir = System.getProperty("user.home"); - String folderName = - String.format("%s_%s_%s", target.getClass().getSimpleName(), method.getName(), Lib.getDateTimeString()); + String folderName = String.format("%s_%s_%s", className, methodName, Lib.getDateTimeString()); File tempFolder = new File(tempDir, folderName); tempFolder.mkdir(); return tempFolder; @@ -65,7 +63,7 @@ public class TestDatabase { bundle.start(); } - tempFolder = createTempFolder(method, target); + tempFolder = createTempFolder(); Assert.assertNotNull("TempFolder cannot be null", tempFolder); addResource(tempFolder, bundle, "data/hsql.zip"); diff --git a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch b/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch index b8265e29c59..df480bb4b2d 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch +++ b/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<setAttribute key="additional_plugins"> +<setEntry value="org.eclipse.equinox.ds:1.4.100.v20130515-2026:default:true"/> +<setEntry value="org.eclipse.osee.hsqldb:0.11.1.qualifier:default:false"/> +<setEntry value="org.eclipse.osee.orcs.db.mock:0.11.1.qualifier:default:true"/> +<setEntry value="org.hsqldb:2.2.9.qualifier:default:false"/> +<setEntry value="org.mockito:1.9.0.qualifier:default:false"/> +</setAttribute> <booleanAttribute key="append.args" value="true"/> <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> <booleanAttribute key="askclear" value="false"/> @@ -12,6 +19,8 @@ <booleanAttribute key="clearwslog" value="false"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> +<stringAttribute key="featureDefaultLocation" value="workspace"/> +<stringAttribute key="featurePluginResolution" value="workspace"/> <booleanAttribute key="includeOptional" value="false"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -24,6 +33,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.orcs.db.OrcsDbTestSuite"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.orcs.db.test"/> @@ -31,13 +41,16 @@ <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -Dosee.log.default=INFO"/> <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="org.eclipse.birt.report.engine.ReportEngineSDK"/> -<booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.inject@default:default,com.ibm.icu@default:default,javax.inject@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.codec*1.7.0@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.team.core@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.util@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.jsoup@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.slf4j.api*1.6.4.v20120130-2120@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.console.admin.test@default:false,org.eclipse.osee.console.admin@default:default,org.eclipse.osee.database.schema@default:default,org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin.test@default:false,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:default,org.eclipse.osee.orcs.core.test@default:false,org.eclipse.osee.orcs.core@default:default,org.eclipse.osee.orcs.db.mock@default:default,org.eclipse.osee.orcs.db.test@default:false,org.eclipse.osee.orcs.db@default:default,org.eclipse.osee.orcs.test@default:false,org.eclipse.osee.orcs@default:default,org.hsqldb@default:default,org.mockito@default:default,org.objenesis@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> +<booleanAttribute key="run_in_ui_thread" value="false"/> +<setAttribute key="selected_features"> +<setEntry value="org.eclipse.osee.orcs.feature:default"/> +<setEntry value="org.eclipse.osee.x.core.external.feature:default"/> +<setEntry value="org.eclipse.osee.x.core.feature:default"/> +</setAttribute> +<booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="timestamp" value="1342550414716"/> <booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> <booleanAttribute key="useProduct" value="false"/> diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java index 971f8c008a2..1c02eac97d2 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/IntegrationUtil.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.intergration; -import static junit.framework.Assert.assertEquals; +import static org.junit.Assert.assertEquals; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -20,6 +20,10 @@ import org.eclipse.osee.orcs.core.ds.AttributeData; import org.eclipse.osee.orcs.core.ds.OrcsData; import org.eclipse.osee.orcs.core.ds.RelationData; import org.eclipse.osee.orcs.core.ds.VersionData; +import org.eclipse.osee.orcs.db.mock.OseeDatabase; +import org.eclipse.osee.orcs.db.mock.OsgiRule; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; /** * @author Roberto E. Escobar @@ -28,6 +32,10 @@ public class IntegrationUtil { private static final Comparator<OrcsData> SORT_BY_LOCAL_ID = new IdComparator(); + public static TestRule integrationRule(Object testObject, String dbId) { + return RuleChain.outerRule(new OseeDatabase(dbId)).around(new OsgiRule(testObject)); + } + public static void sort(List<? extends OrcsData> data) { Collections.sort(data, SORT_BY_LOCAL_ID); } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java index 219f37d161f..a0e9c0f67fe 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/LoaderTest.java @@ -16,6 +16,7 @@ import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.Active; import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.Name; import static org.eclipse.osee.framework.core.enums.CoreAttributeTypes.UriGeneralStringData; import static org.eclipse.osee.framework.core.enums.CoreRelationTypes.Default_Hierarchical__Parent; +import static org.eclipse.osee.orcs.db.intergration.IntegrationUtil.integrationRule; import static org.eclipse.osee.orcs.db.intergration.IntegrationUtil.sort; import static org.eclipse.osee.orcs.db.intergration.IntegrationUtil.verifyData; import static org.mockito.Mockito.times; @@ -27,6 +28,7 @@ import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.enums.LoadLevel; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException; +import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.orcs.core.ds.ArtifactBuilder; import org.eclipse.osee.orcs.core.ds.ArtifactData; @@ -38,11 +40,10 @@ import org.eclipse.osee.orcs.core.ds.DataLoaderFactory; import org.eclipse.osee.orcs.core.ds.OrcsDataStore; import org.eclipse.osee.orcs.core.ds.RelationData; import org.eclipse.osee.orcs.core.ds.RelationDataHandler; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; -import org.eclipse.osee.orcs.db.mock.OsgiRule; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.junit.Before; import org.junit.Rule; +import org.junit.rules.TestRule; import org.mockito.ArgumentCaptor; import org.mockito.Captor; import org.mockito.Mock; @@ -54,24 +55,19 @@ import org.mockito.MockitoAnnotations; public class LoaderTest { @Rule - public OsgiRule osgi = new OsgiRule(this); - - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.hsql"); + public TestRule db = integrationRule(this, "osee.demo.hsql"); // @formatter:off - @OsgiService private OrcsDataStore dataStore; - - @Mock private ArtifactBuilder builder; - - @Mock private ArtifactDataHandler artifactHandler; - @Mock private AttributeDataHandler attributeHandler; - @Mock private RelationDataHandler relationHandler; - - @Captor ArgumentCaptor<ArtifactData> artifactCaptor; - @Captor ArgumentCaptor<AttributeData> attributeCaptor; - @Captor ArgumentCaptor<RelationData> relationCaptor; - // @formatter:on + @OsgiService private IOseeDatabaseService dbService; + @OsgiService private OrcsDataStore dataStore; + @Mock private ArtifactBuilder builder; + @Mock private ArtifactDataHandler artifactHandler; + @Mock private AttributeDataHandler attributeHandler; + @Mock private RelationDataHandler relationHandler; + @Captor private ArgumentCaptor<ArtifactData> artifactCaptor; + @Captor private ArgumentCaptor<AttributeData> attributeCaptor; + @Captor private ArgumentCaptor<RelationData> relationCaptor; + // @formatter:on private String sessionId; private HasCancellation cancellation; @@ -106,35 +102,55 @@ public class LoaderTest { sort(artifactCaptor.getAllValues()); Iterator<ArtifactData> arts = artifactCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(arts.next(), 5, "AkA10I4aUSDLuFNIaegA", "3VY6B", ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, 15L); - verifyData(arts.next(), 6, "AkA10LiAPEZLR4+jdFQA", "N782Y", ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, 16L); - verifyData(arts.next(), 7, "AkA2AcT6AXe6ivMFRhAA", "LBVP3", ModificationType.NEW, Folder.getGuid(), 2, 6, -1, 43L); - //@formatter:on + // @formatter:off + verifyData(arts.next(), 5, "AkA10I4aUSDLuFNIaegA", "3VY6B", + ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, + 15L); + verifyData(arts.next(), 6, "AkA10LiAPEZLR4+jdFQA", "N782Y", + ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, + 16L); + verifyData(arts.next(), 7, "AkA2AcT6AXe6ivMFRhAA", "LBVP3", + ModificationType.NEW, Folder.getGuid(), 2, 6, -1, 43L); + // @formatter:on sort(attributeCaptor.getAllValues()); Iterator<AttributeData> attrs = attributeCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(attrs.next(), 9, 5, ModificationType.NEW, Name.getGuid(), 2, 5, -1, 5L, "org.eclipse.osee.framework.skynet.core.OseeTypes_Framework", ""); - verifyData(attrs.next(), 10, 5, ModificationType.NEW, UriGeneralStringData.getGuid(), 2, 5, -1, 6L, "", "attr://6/AkA10I4aUSDLuFNIaegA.zip"); - verifyData(attrs.next(), 11, 5, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 7L, "true", ""); - - verifyData(attrs.next(), 12, 6, ModificationType.NEW, Name.getGuid(), 2, 5, -1, 8L, "org.eclipse.osee.coverage.OseeTypes_Coverage", ""); - verifyData(attrs.next(), 13, 6, ModificationType.NEW, UriGeneralStringData.getGuid(), 2, 5, -1, 9L, "", "attr://9/AkA10LiAPEZLR4+jdFQA.zip"); - verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 10L, "true", ""); - - verifyData(attrs.next(), 17, 7, ModificationType.NEW, Name.getGuid(), 2, 6, -1, 33L, "User Groups", ""); - //@formatter:on + // @formatter:off + verifyData(attrs.next(), 9, 5, ModificationType.NEW, Name.getGuid(), 2, + 5, -1, 5L, + "org.eclipse.osee.framework.skynet.core.OseeTypes_Framework", + ""); + verifyData(attrs.next(), 10, 5, ModificationType.NEW, + UriGeneralStringData.getGuid(), 2, 5, -1, 6L, "", + "attr://6/AkA10I4aUSDLuFNIaegA.zip"); + verifyData(attrs.next(), 11, 5, ModificationType.NEW, Active.getGuid(), + 2, 5, -1, 7L, "true", ""); + + verifyData(attrs.next(), 12, 6, ModificationType.NEW, Name.getGuid(), + 2, 5, -1, 8L, "org.eclipse.osee.coverage.OseeTypes_Coverage", + ""); + verifyData(attrs.next(), 13, 6, ModificationType.NEW, + UriGeneralStringData.getGuid(), 2, 5, -1, 9L, "", + "attr://9/AkA10LiAPEZLR4+jdFQA.zip"); + verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), + 2, 5, -1, 10L, "true", ""); + + verifyData(attrs.next(), 17, 7, ModificationType.NEW, Name.getGuid(), + 2, 6, -1, 33L, "User Groups", ""); + // @formatter:on sort(relationCaptor.getAllValues()); Iterator<RelationData> rels = relationCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(rels.next(), 1, 7, 7, 8, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 53L); - verifyData(rels.next(), 2, 7, 1, 7, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 52L); - verifyData(rels.next(), 3, 7, 7, 15, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 54L); - //@formatter:on + // @formatter:off + verifyData(rels.next(), 1, 7, 7, 8, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 53L); + verifyData(rels.next(), 2, 7, 1, 7, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 52L); + verifyData(rels.next(), 3, 7, 7, 15, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 54L); + // @formatter:on } @org.junit.Test @@ -159,29 +175,43 @@ public class LoaderTest { sort(artifactCaptor.getAllValues()); Iterator<ArtifactData> arts = artifactCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(arts.next(), 5, "AkA10I4aUSDLuFNIaegA", "3VY6B", ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, 15L); - verifyData(arts.next(), 6, "AkA10LiAPEZLR4+jdFQA", "N782Y", ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, 16L); - verifyData(arts.next(), 7, "AkA2AcT6AXe6ivMFRhAA", "LBVP3", ModificationType.NEW, Folder.getGuid(), 2, 6, -1, 43L); - //@formatter:on + // @formatter:off + verifyData(arts.next(), 5, "AkA10I4aUSDLuFNIaegA", "3VY6B", + ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, + 15L); + verifyData(arts.next(), 6, "AkA10LiAPEZLR4+jdFQA", "N782Y", + ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, + 16L); + verifyData(arts.next(), 7, "AkA2AcT6AXe6ivMFRhAA", "LBVP3", + ModificationType.NEW, Folder.getGuid(), 2, 6, -1, 43L); + // @formatter:on sort(attributeCaptor.getAllValues()); Iterator<AttributeData> attrs = attributeCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(attrs.next(), 9, 5, ModificationType.NEW, Name.getGuid(), 2, 5, -1, 5L, "org.eclipse.osee.framework.skynet.core.OseeTypes_Framework", ""); - verifyData(attrs.next(), 12, 6, ModificationType.NEW, Name.getGuid(), 2, 5, -1, 8L, "org.eclipse.osee.coverage.OseeTypes_Coverage", ""); - verifyData(attrs.next(), 17, 7, ModificationType.NEW, Name.getGuid(), 2, 6, -1, 33L, "User Groups", ""); - //@formatter:on + // @formatter:off + verifyData(attrs.next(), 9, 5, ModificationType.NEW, Name.getGuid(), 2, + 5, -1, 5L, + "org.eclipse.osee.framework.skynet.core.OseeTypes_Framework", + ""); + verifyData(attrs.next(), 12, 6, ModificationType.NEW, Name.getGuid(), + 2, 5, -1, 8L, "org.eclipse.osee.coverage.OseeTypes_Coverage", + ""); + verifyData(attrs.next(), 17, 7, ModificationType.NEW, Name.getGuid(), + 2, 6, -1, 33L, "User Groups", ""); + // @formatter:on sort(relationCaptor.getAllValues()); Iterator<RelationData> rels = relationCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(rels.next(), 1, 7, 7, 8, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 53L); - verifyData(rels.next(), 2, 7, 1, 7, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 52L); - verifyData(rels.next(), 3, 7, 7, 15, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 54L); - //@formatter:on + // @formatter:off + verifyData(rels.next(), 1, 7, 7, 8, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 53L); + verifyData(rels.next(), 2, 7, 1, 7, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 52L); + verifyData(rels.next(), 3, 7, 7, 15, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 54L); + // @formatter:on } @org.junit.Test @@ -206,27 +236,36 @@ public class LoaderTest { sort(artifactCaptor.getAllValues()); Iterator<ArtifactData> arts = artifactCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(arts.next(), 5, "AkA10I4aUSDLuFNIaegA", "3VY6B", ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, 15L); - verifyData(arts.next(), 6, "AkA10LiAPEZLR4+jdFQA", "N782Y", ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, 16L); - verifyData(arts.next(), 7, "AkA2AcT6AXe6ivMFRhAA", "LBVP3", ModificationType.NEW, Folder.getGuid(), 2, 6, -1, 43L); - //@formatter:on + // @formatter:off + verifyData(arts.next(), 5, "AkA10I4aUSDLuFNIaegA", "3VY6B", + ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, + 15L); + verifyData(arts.next(), 6, "AkA10LiAPEZLR4+jdFQA", "N782Y", + ModificationType.NEW, OseeTypeDefinition.getGuid(), 2, 5, -1, + 16L); + verifyData(arts.next(), 7, "AkA2AcT6AXe6ivMFRhAA", "LBVP3", + ModificationType.NEW, Folder.getGuid(), 2, 6, -1, 43L); + // @formatter:on sort(attributeCaptor.getAllValues()); Iterator<AttributeData> attrs = attributeCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(attrs.next(), 11, 5, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 7L, "true", ""); - verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), 2, 5, -1, 10L, "true", ""); - //@formatter:on + // @formatter:off + verifyData(attrs.next(), 11, 5, ModificationType.NEW, Active.getGuid(), + 2, 5, -1, 7L, "true", ""); + verifyData(attrs.next(), 14, 6, ModificationType.NEW, Active.getGuid(), + 2, 5, -1, 10L, "true", ""); + // @formatter:on sort(relationCaptor.getAllValues()); Iterator<RelationData> rels = relationCaptor.getAllValues().iterator(); - //@formatter:off - verifyData(rels.next(), 2, 7, 1, 7, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 52L); - verifyData(rels.next(), 3, 7, 7, 15, "", ModificationType.NEW, Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 54L); - //@formatter:on + // @formatter:off + verifyData(rels.next(), 2, 7, 1, 7, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 52L); + verifyData(rels.next(), 3, 7, 7, 15, "", ModificationType.NEW, + Default_Hierarchical__Parent.getGuid(), 2, 6, -1, 54L); + // @formatter:on } } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java index 77cd894fbf9..a495523c918 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/intergration/OseeInfoDataAccessorTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.intergration; +import static org.eclipse.osee.orcs.db.intergration.IntegrationUtil.integrationRule; import java.sql.DatabaseMetaData; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; @@ -20,12 +21,11 @@ import org.eclipse.osee.orcs.core.ds.DataStoreConstants; import org.eclipse.osee.orcs.db.internal.SqlProvider; import org.eclipse.osee.orcs.db.internal.accessor.OseeInfoDataAccessor; import org.eclipse.osee.orcs.db.internal.resource.ResourceConstants; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; -import org.eclipse.osee.orcs.db.mock.OsgiRule; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.db.mocks.MockLog; import org.junit.Assert; import org.junit.Rule; +import org.junit.rules.TestRule; /** * Test Case for {@link OseeInfoDataAccessor} @@ -35,13 +35,11 @@ import org.junit.Rule; public class OseeInfoDataAccessorTest { @Rule - public OsgiRule osgi = new OsgiRule(this); + public TestRule db = integrationRule(this, "osee.demo.hsql"); - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.hsql"); - - @OsgiService - IOseeDatabaseService dbService; + //@formatter:off + @OsgiService private IOseeDatabaseService dbService; + //@formatter:on @org.junit.Test public void testGetSetValue() throws OseeCoreException { diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ChangeItemConflictTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ChangeItemConflictTest.java index ab2e4b5ee08..aaf16310618 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ChangeItemConflictTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/ChangeItemConflictTest.java @@ -27,7 +27,7 @@ import org.junit.runners.Parameterized.Parameters; /** * {@link ChangeItem} - * + * * <pre> * SRC Art * Delete | Modified | Merged | Introduce @@ -37,7 +37,7 @@ import org.junit.runners.Parameterized.Parameters; * Merged | 9 | 10 | 11 | 12 | * Introduce | 13 | 14 | 15 | 16 | * ----------------------------------------- - * + * * SRC Attr * Delete | Modified | Merged * ------------------------------ @@ -46,7 +46,7 @@ import org.junit.runners.Parameterized.Parameters; * Merged | 7 | 8 | 9 | * ------------------------------ * </pre> - * + * * @author Jeff C. Phillips * @author Karol M. Wilk * @author Ryan D. Brooks @@ -165,6 +165,8 @@ public class ChangeItemConflictTest { case SRC_INT: changeVersion(item.getCurrentVersion(), gamma, ModificationType.INTRODUCED); break; + default: + break; } switch (dstCase) { @@ -180,6 +182,8 @@ public class ChangeItemConflictTest { case DST_INT: changeVersion(item.getCurrentVersion(), gamma, ModificationType.INTRODUCED); break; + default: + break; } } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java index b6d40c85892..00655bc9788 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/change/MissingChangeItemFactoryTest.java @@ -15,7 +15,7 @@ import static org.mockito.Mockito.*; import java.util.Collection; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.executor.admin.HasCancellation; import org.eclipse.osee.framework.core.enums.ModificationType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/AttributeDataProxyFactoryTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/AttributeDataProxyFactoryTest.java index e12b0d71222..6956059b30b 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/AttributeDataProxyFactoryTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/AttributeDataProxyFactoryTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.loader; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.AttributeTypeCache; diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java index e8afbf900ac..b643ff73d4c 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataFactoryImplTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.loader; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotSame; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java index 237d56e1917..f20e2b5b6d6 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/loader/DataLoaderImplTest.java @@ -10,8 +10,8 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.loader; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import static org.mockito.Matchers.eq; import static org.mockito.Mockito.spy; @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; import java.util.List; -import junit.framework.Assert; import org.eclipse.osee.executor.admin.HasCancellation; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -769,13 +768,13 @@ public class DataLoaderImplTest { } } - Assert.assertEquals(joinDatas.size(), context.getJoins().size()); + assertEquals(joinDatas.size(), context.getJoins().size()); Iterator<AbstractJoinQuery> jQuerys = context.getJoins().iterator(); Iterator<Object> queryIds = queryIdsToMatch.iterator(); for (Object[] data : joinDatas) { AbstractJoinQuery jQuery = jQuerys.next(); assertEquals(queryIds.next(), jQuery.getQueryId()); - Assert.assertEquals(data.length, jQuery.size()); + assertEquals(data.length, jQuery.size()); } } diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/DaoToSqlTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/DaoToSqlTest.java index 280c0bec41e..78108214eb9 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/DaoToSqlTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/DaoToSqlTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.transaction; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.orcs.core.ds.DataProxy; import org.junit.Before; diff --git a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java index a730242af4f..24856ddb2c8 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java +++ b/plugins/org.eclipse.osee.orcs.db.test/src/org/eclipse/osee/orcs/db/internal/transaction/TxSqlBuilderTest.java @@ -10,9 +10,9 @@ *******************************************************************************/ package org.eclipse.osee.orcs.db.internal.transaction; -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertTrue; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import static org.eclipse.osee.framework.core.enums.ModificationType.ARTIFACT_DELETED; import static org.eclipse.osee.framework.core.enums.ModificationType.DELETED; import static org.eclipse.osee.framework.core.enums.ModificationType.INTRODUCED; diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml index e5237ba1158..f162a7263b0 100644 --- a/plugins/org.eclipse.osee.orcs.parent/pom.xml +++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml @@ -29,7 +29,6 @@ <module>../../plugins/org.eclipse.osee.framework.database</module> <module>../../plugins/org.eclipse.osee.framework.database.test</module> - <module>../../plugins/org.eclipse.osee.database</module> <module>../../plugins/org.eclipse.osee.database.schema</module> <module>../../plugins/org.eclipse.osee.orcs</module> diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/DslTranslatorImplTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/DslTranslatorImplTest.java index a0a30b98843..d7dfeff15a0 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/DslTranslatorImplTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/DslTranslatorImplTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.orcs.rest.internal.search.dsl; import java.util.List; import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.orcs.rest.model.search.Predicate; diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java index a419e5cd4e8..140f482394d 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/dsl/SearchDslTest.java @@ -16,7 +16,7 @@ import static org.mockito.Mockito.when; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java index 83dbc460faa..fbc366ffca1 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/AttributeTypePredicateHandlerTest.java @@ -16,7 +16,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CaseType; import org.eclipse.osee.framework.core.enums.MatchTokenCountType; diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistsTypePredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistsTypePredicateHandlerTest.java index f9b01b5f77d..aae13425d31 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistsTypePredicateHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/ExistsTypePredicateHandlerTest.java @@ -17,7 +17,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.data.IRelationTypeSide; diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/GuidOrHridsPredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/GuidOrHridsPredicateHandlerTest.java index e70fed260f8..53e7f51b026 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/GuidOrHridsPredicateHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/GuidOrHridsPredicateHandlerTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.verify; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.orcs.rest.model.search.Predicate; diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IdsPredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IdsPredicateHandlerTest.java index 6e32aa30ee8..f483d4dde06 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IdsPredicateHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IdsPredicateHandlerTest.java @@ -14,7 +14,7 @@ import static org.mockito.Mockito.verify; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IsOfTypePredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IsOfTypePredicateHandlerTest.java index 1b0060211e9..a3b480f68fa 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IsOfTypePredicateHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/IsOfTypePredicateHandlerTest.java @@ -16,7 +16,7 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java index 2ee66d7db08..ad2cd862a4f 100644 --- a/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java +++ b/plugins/org.eclipse.osee.orcs.rest.test/src/org/eclipse/osee/orcs/rest/internal/search/predicate/RelatedToPredicateHandlerTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IRelationTypeSide; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF index 1e723b67132..d983df53118 100644 --- a/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.rest/META-INF/MANIFEST.MF @@ -22,4 +22,4 @@ Import-Package: javax.ws.rs, org.eclipse.osee.orcs.rest.model.search, org.eclipse.osee.orcs.search Require-Bundle: org.eclipse.core.runtime, - com.google.guava;bundle-version="12.0.0" + com.google.guava;bundle-version="[11.0.0,15.0.0)" diff --git a/plugins/org.eclipse.osee.orcs.test/OrcsIntegrationTestSuite.launch b/plugins/org.eclipse.osee.orcs.test/OrcsIntegrationTestSuite.launch index fee0c435149..0886f9bc7d8 100644 --- a/plugins/org.eclipse.osee.orcs.test/OrcsIntegrationTestSuite.launch +++ b/plugins/org.eclipse.osee.orcs.test/OrcsIntegrationTestSuite.launch @@ -1,5 +1,12 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<setAttribute key="additional_plugins"> +<setEntry value="org.eclipse.equinox.ds:1.4.100.v20130515-2026:default:true"/> +<setEntry value="org.eclipse.osee.hsqldb:0.11.1.qualifier:default:false"/> +<setEntry value="org.eclipse.osee.orcs.db.mock:0.11.1.qualifier:default:true"/> +<setEntry value="org.hsqldb:2.2.9.qualifier:default:false"/> +<setEntry value="org.mockito:1.9.0.qualifier:default:false"/> +</setAttribute> <booleanAttribute key="append.args" value="true"/> <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> <booleanAttribute key="askclear" value="false"/> @@ -13,6 +20,8 @@ <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/> <booleanAttribute key="default" value="false"/> <booleanAttribute key="default_auto_start" value="true"/> +<stringAttribute key="featureDefaultLocation" value="workspace"/> +<stringAttribute key="featurePluginResolution" value="workspace"/> <booleanAttribute key="includeOptional" value="false"/> <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> @@ -25,6 +34,7 @@ <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/> <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/> <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.orcs.OrcsIntegrationTestSuite"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console"/> <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.osee.orcs.test"/> @@ -33,12 +43,15 @@ <stringAttribute key="pde.version" value="3.3"/> <stringAttribute key="product" value="lba.ote.outfile.conversion.app.convert"/> <booleanAttribute key="run_in_ui_thread" value="true"/> -<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.inject@default:default,javax.activation@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.commons.codec*1.3.0.v201101211617@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.codec*1.7.0@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.0.4.v201101211617@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.pool@default:default,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.team.core@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.util@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.jsoup@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.slf4j.api*1.6.4.v20120130-2120@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.slf4j.jcl@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.console.admin.test@default:false,org.eclipse.osee.console.admin@default:default,org.eclipse.osee.database.schema@default:default,org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin.test@default:false,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:default,org.eclipse.osee.orcs.core.test@default:false,org.eclipse.osee.orcs.core@default:default,org.eclipse.osee.orcs.db.mock@default:default,org.eclipse.osee.orcs.db.test@default:false,org.eclipse.osee.orcs.db@default:default,org.eclipse.osee.orcs.test@default:false,org.eclipse.osee.orcs@default:default,org.hsqldb@default:default,org.mockito@default:default,org.objenesis@default:default"/> -<booleanAttribute key="show_selected_only" value="false"/> +<setAttribute key="selected_features"> +<setEntry value="org.eclipse.osee.orcs.feature:default"/> +<setEntry value="org.eclipse.osee.x.core.external.feature:default"/> +<setEntry value="org.eclipse.osee.x.core.feature:default"/> +</setAttribute> +<booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="timestamp" value="1342653904563"/> <booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="false"/> <booleanAttribute key="useProduct" value="false"/> diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java index c15857c581b..911b54421bb 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java @@ -17,17 +17,24 @@ import org.eclipse.osee.framework.core.services.IOseeModelFactoryService; import org.eclipse.osee.framework.core.services.IdentityService; import org.eclipse.osee.framework.database.IOseeDatabaseService; import org.eclipse.osee.logger.Log; +import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiRule; import org.eclipse.osee.orcs.db.mock.OsgiService; +import org.junit.rules.RuleChain; +import org.junit.rules.TestRule; import org.osgi.service.event.EventAdmin; /** * @author Roberto E. Escobar */ -public class OrcsIntegrationRule extends OsgiRule { +public final class OrcsIntegrationRule extends OsgiRule { - public OrcsIntegrationRule(Object testObject) { - super(new CheckServices(), testObject); + private OrcsIntegrationRule() { + // Utility + } + + public static TestRule integrationRule(Object testObject, String dbId) { + return RuleChain.outerRule(new OseeDatabase(dbId)).around(new OsgiRule(new CheckServices(), testObject)); } public static class CheckServices { diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java index 0ea96f89991..5529b4eb072 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java @@ -10,11 +10,11 @@ *******************************************************************************/ package org.eclipse.osee.orcs.api; +import static org.eclipse.osee.orcs.OrcsIntegrationRule.integrationRule; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; @@ -23,13 +23,13 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.cache.BranchCache; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; -import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.search.QueryBuilder; import org.eclipse.osee.orcs.search.QueryFactory; +import org.junit.Assert; import org.junit.Rule; +import org.junit.rules.TestRule; /** * @author Jeff C. Phillips @@ -37,10 +37,7 @@ import org.junit.Rule; public class OrcsAttributeLoadingTest { @Rule - public OrcsIntegrationRule osgi = new OrcsIntegrationRule(this); - - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.h2"); + public TestRule osgi = integrationRule(this, "osee.demo.hsql"); @OsgiService private OrcsApi orcsApi; diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java index 934ba057b7d..11d8fac35ce 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.orcs.api; +import static org.eclipse.osee.orcs.OrcsIntegrationRule.integrationRule; import java.util.HashMap; import java.util.List; import java.util.Map; -import junit.framework.Assert; import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.enums.CaseType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; @@ -27,15 +27,15 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.cache.BranchCache; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; -import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.search.QueryBuilder; import org.eclipse.osee.orcs.search.QueryFactory; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestRule; /** * @author Jeff C. Phillips @@ -43,10 +43,7 @@ import org.junit.Test; public class OrcsAttributeSearchTest { @Rule - public OrcsIntegrationRule osgi = new OrcsIntegrationRule(this); - - @Rule - public OseeDatabase db1 = new OseeDatabase("osee.demo.h2"); + public TestRule osgi = integrationRule(this, "osee.demo.hsql"); @OsgiService private OrcsApi orcsApi; diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java index 548cca21271..f1eb5549fb5 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.api; +import static org.eclipse.osee.orcs.OrcsIntegrationRule.integrationRule; import java.util.Collections; import java.util.List; import java.util.concurrent.Callable; @@ -27,10 +28,8 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; import org.eclipse.osee.orcs.OrcsBranch; -import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.ArtifactWriteable; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.search.QueryFactory; import org.eclipse.osee.orcs.transaction.OrcsTransaction; @@ -38,6 +37,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestRule; /** * @author David W. Miller @@ -45,10 +45,7 @@ import org.junit.Test; public class OrcsBranchTest { @Rule - public OrcsIntegrationRule osgi = new OrcsIntegrationRule(this); - - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.h2"); + public TestRule osgi = integrationRule(this, "osee.demo.hsql"); private OrcsBranch branchInterface = null; private final ApplicationContext context = null; // TODO use real application context diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java index 48bdc98ea01..64944cec3e5 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsPortingTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.api; +import static org.eclipse.osee.orcs.OrcsIntegrationRule.integrationRule; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.ResultSet; import org.eclipse.osee.framework.core.data.TokenFactory; @@ -22,10 +23,8 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; import org.eclipse.osee.orcs.OrcsBranch; -import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.ArtifactWriteable; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.search.QueryFactory; import org.eclipse.osee.orcs.transaction.OrcsTransaction; @@ -34,6 +33,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestRule; /** * @author David W. Miller @@ -41,10 +41,7 @@ import org.junit.Test; public class OrcsPortingTest { @Rule - public OrcsIntegrationRule osgi = new OrcsIntegrationRule(this); - - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.h2"); + public TestRule osgi = integrationRule(this, "osee.demo.hsql"); @OsgiService private OrcsApi orcsApi; @@ -76,6 +73,8 @@ public class OrcsPortingTest { IOseeBranch copyTxBranch = createCopyFromTransactionBranch(transactionToCopy); TransactionRecord finalTx = commitToDestinationBranch(copyTxBranch); + + Thread.sleep(5000); // now check to make sure everything is as expected // we should have a SoftwareRequirement named "SecondRequirement" with an attribute named "test changed" (changed on child branch to this) diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java index 3c5cfb55b4f..4b2a19139f9 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java @@ -10,12 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.orcs.api; +import static org.eclipse.osee.orcs.OrcsIntegrationRule.integrationRule; import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.Iterator; import java.util.List; -import junit.framework.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CaseType; @@ -30,10 +30,8 @@ import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.type.MatchLocation; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; -import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.AttributeReadable; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.search.Match; import org.eclipse.osee.orcs.search.QueryBuilder; @@ -41,9 +39,11 @@ import org.eclipse.osee.orcs.search.QueryFactory; import org.eclipse.osee.orcs.utility.MatchComparator; import org.eclipse.osee.orcs.utility.NameComparator; import org.eclipse.osee.orcs.utility.SortOrder; +import org.junit.Assert; import org.junit.Before; import org.junit.Rule; import org.junit.Test; +import org.junit.rules.TestRule; /** * @author Roberto E. Escobar @@ -51,10 +51,7 @@ import org.junit.Test; public class OrcsQueryTest { @Rule - public OrcsIntegrationRule osgi = new OrcsIntegrationRule(this); - - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.h2"); + public TestRule osgi = integrationRule(this, "osee.demo.hsql"); private final boolean includeMatchLocationTests = false; diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java index 3a4ecf18952..d909c865f90 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.api; +import static org.eclipse.osee.orcs.OrcsIntegrationRule.integrationRule; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -22,15 +23,14 @@ import org.eclipse.osee.framework.core.enums.Operator; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; -import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.GraphReadable; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.search.QueryBuilder; import org.eclipse.osee.orcs.search.QueryFactory; import org.junit.Assert; import org.junit.Rule; +import org.junit.rules.TestRule; /** * Test Case for {@link OrcsApi} @@ -40,10 +40,7 @@ import org.junit.Rule; public class OrcsRelationLoadingTest { @Rule - public OrcsIntegrationRule osgi = new OrcsIntegrationRule(this); - - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.h2"); + public TestRule osgi = integrationRule(this, "osee.demo.hsql"); @OsgiService private OrcsApi orcsApi; diff --git a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java index 3476683c41b..03d2f2adc03 100644 --- a/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java @@ -10,6 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.orcs.api; +import static org.eclipse.osee.orcs.OrcsIntegrationRule.integrationRule; import java.lang.reflect.Proxy; import java.util.concurrent.Callable; import org.eclipse.osee.framework.core.data.IOseeBranch; @@ -30,10 +31,8 @@ import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; import org.eclipse.osee.orcs.OrcsBranch; -import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.ArtifactWriteable; -import org.eclipse.osee.orcs.db.mock.OseeDatabase; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.eclipse.osee.orcs.transaction.OrcsTransaction; import org.eclipse.osee.orcs.transaction.TransactionFactory; @@ -42,6 +41,7 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; +import org.junit.rules.TestRule; /** * @author Roberto E. Escobar @@ -52,10 +52,7 @@ public class OrcsTransactionTest { public ExpectedException thrown = ExpectedException.none(); @Rule - public OrcsIntegrationRule osgi = new OrcsIntegrationRule(this); - - @Rule - public OseeDatabase db = new OseeDatabase("osee.demo.h2"); + public TestRule osgi = integrationRule(this, "osee.demo.hsql"); @OsgiService private OrcsApi orcsApi; diff --git a/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/XmlSupportTest.java b/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/XmlSupportTest.java index 575a30b7897..cfb3c80f4c1 100644 --- a/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/XmlSupportTest.java +++ b/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/XmlSupportTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ote.core; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/environment/status/msg/SerializedMessageTest.java b/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/environment/status/msg/SerializedMessageTest.java index c78eddd0811..ef03ddbf5e1 100644 --- a/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/environment/status/msg/SerializedMessageTest.java +++ b/plugins/org.eclipse.osee.ote.core.test/src/org/eclipse/osee/ote/core/environment/status/msg/SerializedMessageTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ote.core.environment.status.msg; import java.io.IOException; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ote.core.environment.status.EnvironmentError; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF index 09ab68e8a9f..53ab7da9ffd 100644 --- a/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.ote.version.git.test/META-INF/MANIFEST.MF @@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.osee.ote.version.git.test Bundle-Version: 0.11.1.qualifier Fragment-Host: org.eclipse.osee.ote.version.git;bundle-version="0.0.0" Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit4;bundle-version="4.8.1" +Require-Bundle: org.junit;bundle-version="4.11.0" diff --git a/plugins/org.eclipse.osee.parent/pom.xml b/plugins/org.eclipse.osee.parent/pom.xml index 36c5eb74f2e..c403ca93a2f 100644 --- a/plugins/org.eclipse.osee.parent/pom.xml +++ b/plugins/org.eclipse.osee.parent/pom.xml @@ -35,7 +35,7 @@ <javadoc-version>2.8</javadoc-version> <build-helper-maven-plugin-version>1.7</build-helper-maven-plugin-version> - <platform-version-name>juno</platform-version-name> + <platform-version-name>kepler</platform-version-name> <orbit-version>R20130517111416</orbit-version> <xtext-version>2.0.0</xtext-version> <subversive-version>1.0</subversive-version> diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch index 0814a2e80d8..bf262ef4313 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[HSQLDB].launch @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher"> <setAttribute key="additional_plugins"> -<setEntry value="com.google.guava:10.0.1.v201203051515:default:true"/> -<setEntry value="com.google.guava:12.0.0.v201212092141:default:true"/> +<setEntry value="com.google.guava:10.0.1.v201203051515:default:false"/> +<setEntry value="com.google.guava:12.0.0.v201212092141:default:false"/> </setAttribute> <booleanAttribute key="append.args" value="true"/> <booleanAttribute key="automaticAdd" value="false"/> @@ -11,33 +11,28 @@ <stringAttribute key="checked" value="[NONE]"/> <booleanAttribute key="clearConfig" value="true"/> <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/OSEE_Application_Server_[HSQLDB]"/> -<booleanAttribute key="default" value="true"/> +<booleanAttribute key="default" value="false"/> <booleanAttribute key="default_auto_start" value="true"/> <intAttribute key="default_start_level" value="4"/> <stringAttribute key="featureDefaultLocation" value="workspace"/> <stringAttribute key="featurePluginResolution" value="workspace"/> <booleanAttribute key="includeOptional" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m -Xmx1024m -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=hsql -Dosee.db.embedded.server=0.0.0.0:8088 -Dosee.log.default=INFO -Dosee.authentication.protocol=demo -Dosee.connection.info.uri="${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.demo.db.connection.xml""/> <stringAttribute key="pde.version" value="3.3"/> <setAttribute key="selected_features"> -<setEntry value="org.eclipse.osee.orcs.feature.source:default"/> <setEntry value="org.eclipse.osee.orcs.feature:default"/> <setEntry value="org.eclipse.osee.x.core.external.feature:default"/> -<setEntry value="org.eclipse.osee.x.core.feature.source:default"/> <setEntry value="org.eclipse.osee.x.core.feature:default"/> <setEntry value="org.eclipse.osee.x.server.external.feature:default"/> -<setEntry value="org.eclipse.osee.x.server.feature.source:default"/> <setEntry value="org.eclipse.osee.x.server.feature:default"/> -<setEntry value="org.eclipse.osee.x.server.legacy.feature.source:default"/> <setEntry value="org.eclipse.osee.x.server.legacy.feature:default"/> </setAttribute> -<booleanAttribute key="show_selected_only" value="false"/> -<stringAttribute key="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*12.0.0.v201212092141@default:default,com.google.inject@default:default,com.lowagie.text@default:default,javax.activation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.ant.core@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osee.cache.admin@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.team.core@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.util@default:default,org.eclipse.xtext@default:default,org.hamcrest.core@default:default,org.jsoup@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*4.0.0.v201302062210@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default"/> +<booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="timestamp" value="1369262663070"/> <booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="workspace_bundles" value="com.sun.jersey@default:default,com.vaadin@default:default,javax.ws.rs@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.presenter.test@default:false,org.eclipse.osee.ats.presenter@default:default,org.eclipse.osee.ats.rest@default:default,org.eclipse.osee.ats.ui.api@default:default,org.eclipse.osee.ats.view.web.test@default:false,org.eclipse.osee.ats.view.web@default:default,org.eclipse.osee.console.admin.test@default:false,org.eclipse.osee.console.admin@default:default,org.eclipse.osee.database.schema@default:default,org.eclipse.osee.database@default:default,org.eclipse.osee.display.api@default:default,org.eclipse.osee.display.mvp.test@default:false,org.eclipse.osee.display.mvp@default:default,org.eclipse.osee.display.presenter.mocks@default:default,org.eclipse.osee.display.presenter.test@default:false,org.eclipse.osee.display.presenter@default:default,org.eclipse.osee.display.view.web@default:default,org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin.test@default:false,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.authentication.ldap.core@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:default,org.eclipse.osee.mail.test@default:false,org.eclipse.osee.mail@default:default,org.eclipse.osee.orcs.core.test@default:false,org.eclipse.osee.orcs.core@default:default,org.eclipse.osee.orcs.db.mock@default:default,org.eclipse.osee.orcs.db.test@default:false,org.eclipse.osee.orcs.db@default:default,org.eclipse.osee.orcs.rest.model@default:default,org.eclipse.osee.orcs.rest.test@default:false,org.eclipse.osee.orcs.rest@default:default,org.eclipse.osee.orcs.test@default:false,org.eclipse.osee.orcs@default:default,org.eclipse.osee.rest.admin@default:default,org.eclipse.osee.vaadin.themes@default:false,org.eclipse.osee.vaadin.widgets@default:default,org.eclipse.osee.vaadin@default:default,org.hsqldb@default:default,org.jvnet.mimepull@default:default,org.mockito@default:default,org.objenesis@default:default"/> </launchConfiguration> diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch index 84127ce17f7..40e7c0385ff 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_Application_Server_[PostGreSQL].launch @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.EquinoxLauncher"> <setAttribute key="additional_plugins"> -<setEntry value="com.google.guava:10.0.1.v201203051515:default:true"/> -<setEntry value="com.google.guava:12.0.0.v201212092141:default:true"/> +<setEntry value="com.google.guava:10.0.1.v201203051515:default:false"/> +<setEntry value="com.google.guava:12.0.0.v201212092141:default:false"/> </setAttribute> <booleanAttribute key="append.args" value="true"/> <booleanAttribute key="automaticAdd" value="false"/> @@ -17,27 +17,23 @@ <stringAttribute key="featureDefaultLocation" value="workspace"/> <stringAttribute key="featurePluginResolution" value="workspace"/> <booleanAttribute key="includeOptional" value="false"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:MaxPermSize=256m -Xmx1024m -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.osgi.service.http.port=8089 -Dosee.db.connection.id=postgresqlLocalhost -Dosee.log.default=INFO -Dosee.db.connection.count=12 -Dosee.authentication.protocol=demo -Dosee.connection.info.uri="${project_loc:org.eclipse.osee.support.config}/launchConfig/osee.demo.db.connection.xml""/> <stringAttribute key="pde.version" value="3.3"/> <setAttribute key="selected_features"> -<setEntry value="org.eclipse.osee.orcs.feature.source:default"/> <setEntry value="org.eclipse.osee.orcs.feature:default"/> <setEntry value="org.eclipse.osee.x.core.external.feature:default"/> -<setEntry value="org.eclipse.osee.x.core.feature.source:default"/> <setEntry value="org.eclipse.osee.x.core.feature:default"/> <setEntry value="org.eclipse.osee.x.server.external.feature:default"/> -<setEntry value="org.eclipse.osee.x.server.feature.source:default"/> <setEntry value="org.eclipse.osee.x.server.feature:default"/> -<setEntry value="org.eclipse.osee.x.server.legacy.feature.source:default"/> <setEntry value="org.eclipse.osee.x.server.legacy.feature:default"/> +<setEntry value="org.postgresql.feature:default"/> </setAttribute> <booleanAttribute key="show_selected_only" value="true"/> -<stringAttribute key="target_bundles" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*12.0.0.v201212092141@default:default,com.google.inject@default:default,javax.activation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.servlet*2.5.0.v201103041518@default:default,javax.servlet*3.0.0.v201112011016@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.apache.commons.codec*1.7.0@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.pool@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.core.contenttype@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.util@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.eclipse.team.core@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.util@default:default,org.eclipse.xtext@default:default,org.h2@default:default,org.hamcrest.core@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.objectweb.asm@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default"/> <stringAttribute key="timestamp" value="1352843622328"/> <booleanAttribute key="tracing" value="false"/> <booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> -<stringAttribute key="workspace_bundles" value="com.sun.jersey@default:default,com.vaadin@default:default,javax.ws.rs@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.presenter.test@default:false,org.eclipse.osee.ats.presenter@default:default,org.eclipse.osee.ats.ui.api@default:default,org.eclipse.osee.ats.view.web.test@default:false,org.eclipse.osee.ats.view.web@default:default,org.eclipse.osee.console.admin.test@default:false,org.eclipse.osee.console.admin@default:default,org.eclipse.osee.database.schema@default:default,org.eclipse.osee.database@default:default,org.eclipse.osee.display.api@default:default,org.eclipse.osee.display.mvp.test@default:false,org.eclipse.osee.display.mvp@default:default,org.eclipse.osee.display.presenter.mocks@default:default,org.eclipse.osee.display.presenter.test@default:false,org.eclipse.osee.display.presenter@default:default,org.eclipse.osee.display.view.web@default:default,org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin.test@default:false,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.authentication.ldap.core@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.server.test@default:false,org.eclipse.osee.framework.core.server@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.h2@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.manager.servlet@default:default,org.eclipse.osee.framework.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger.slf4j@default:default,org.eclipse.osee.logger@default:default,org.eclipse.osee.mail.test@default:false,org.eclipse.osee.mail@default:default,org.eclipse.osee.orcs.core.test@default:false,org.eclipse.osee.orcs.core@default:default,org.eclipse.osee.orcs.db.mock@default:default,org.eclipse.osee.orcs.db.test@default:false,org.eclipse.osee.orcs.db@default:default,org.eclipse.osee.orcs.rest.model@default:default,org.eclipse.osee.orcs.rest.test@default:false,org.eclipse.osee.orcs.rest@default:default,org.eclipse.osee.orcs.test@default:false,org.eclipse.osee.orcs@default:default,org.eclipse.osee.rest.admin@default:default,org.eclipse.osee.vaadin.themes@default:false,org.eclipse.osee.vaadin.widgets@default:default,org.eclipse.osee.vaadin@default:default,org.jvnet.mimepull@default:default,org.mockito@default:default,org.objenesis@default:default"/> </launchConfiguration> diff --git a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_IDE_[localhost].launch b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_IDE_[localhost].launch index 196c73c49ab..5239ada1a6c 100644 --- a/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_IDE_[localhost].launch +++ b/plugins/org.eclipse.osee.support.config/launchConfig/OSEE_IDE_[localhost].launch @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="org.eclipse.pde.ui.RuntimeWorkbench"> -<setAttribute key="additional_plugins"/> +<setAttribute key="additional_plugins"> +<setEntry value="com.google.guava:12.0.0.v201212092141:default:false"/> +</setAttribute> <booleanAttribute key="askclear" value="true"/> <booleanAttribute key="automaticAdd" value="false"/> <booleanAttribute key="automaticValidate" value="true"/> @@ -17,6 +19,7 @@ <booleanAttribute key="includeOptional" value="false"/> <stringAttribute key="location" value="${workspace_loc}/runtime-workspace"/> <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/> +<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-debug"/> <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx1024M -XX:MaxPermSize=256m -Dosee.log.default=INFO -Dosee.application.server=http://localhost:8089 -Dosee.authentication.protocol=demo"/> @@ -49,11 +52,6 @@ <setEntry value="org.eclipse.emf.mapping.ecore:default"/> <setEntry value="org.eclipse.emf.mapping.ui:default"/> <setEntry value="org.eclipse.emf.mapping:default"/> -<setEntry value="org.eclipse.emf.mwe.ui:default"/> -<setEntry value="org.eclipse.emf.mwe2.language.sdk.source:default"/> -<setEntry value="org.eclipse.emf.mwe2.language.sdk:default"/> -<setEntry value="org.eclipse.emf.mwe2.runtime.sdk.source:default"/> -<setEntry value="org.eclipse.emf.mwe2.runtime.sdk:default"/> <setEntry value="org.eclipse.emf:default"/> <setEntry value="org.eclipse.equinox.p2.core.feature.source:default"/> <setEntry value="org.eclipse.equinox.p2.core.feature:default"/> @@ -77,6 +75,7 @@ <setEntry value="org.eclipse.osee.core.plugin.feature:default"/> <setEntry value="org.eclipse.osee.core.runtime.feature:default"/> <setEntry value="org.eclipse.osee.core.ui.feature:default"/> +<setEntry value="org.eclipse.osee.coverage.feature:default"/> <setEntry value="org.eclipse.osee.define.feature:default"/> <setEntry value="org.eclipse.osee.external.feature:default"/> <setEntry value="org.eclipse.osee.framework.feature:default"/> @@ -85,7 +84,6 @@ <setEntry value="org.eclipse.pde:default"/> <setEntry value="org.eclipse.platform.source:default"/> <setEntry value="org.eclipse.platform:default"/> -<setEntry value="org.eclipse.rcp.source:default"/> <setEntry value="org.eclipse.rcp:default"/> <setEntry value="org.eclipse.sdk:default"/> <setEntry value="org.eclipse.team.svn:default"/> @@ -99,15 +97,12 @@ <setEntry value="org.eclipse.xtext.ui:default"/> <setEntry value="org.eclipse.xtext.xtext.ui.source:default"/> <setEntry value="org.eclipse.xtext.xtext.ui:default"/> -<setEntry value="org.polarion.eclipse.team.svn.connector:default"/> </setAttribute> -<stringAttribute key="selected_target_plugins" value="ch.qos.logback.classic@default:default,ch.qos.logback.core@default:default,ch.qos.logback.slf4j@default:false,com.google.guava*10.0.1.v201203051515@default:default,com.google.guava*12.0.0.v201212092141@default:default,com.google.inject@default:default,com.ibm.icu@default:default,com.jcraft.jsch@default:default,com.lowagie.text@default:default,com.ning.async-http-client@default:default,com.sun.syndication@default:default,de.itemis.xtext.antlr@default:default,javax.activation@default:default,javax.annotation@default:default,javax.el@default:default,javax.inject@default:default,javax.mail.glassfish@default:default,javax.servlet.jsp@default:default,javax.servlet@default:default,javax.wsdl@default:default,javax.xml.rpc@default:default,javax.xml.soap@default:default,javax.xml@default:default,jcl.over.slf4j@default:default,jms.activemq.launch@default:default,jms.libraries@default:default,net.sourceforge.lpg.lpgjavaruntime@default:default,org.antlr.generator@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.ant@default:default,org.apache.axis@default:default,org.apache.batik.bridge@default:default,org.apache.batik.css@default:default,org.apache.batik.dom.svg@default:default,org.apache.batik.dom@default:default,org.apache.batik.ext.awt@default:default,org.apache.batik.parser@default:default,org.apache.batik.pdf@default:default,org.apache.batik.svggen@default:default,org.apache.batik.transcoder@default:default,org.apache.batik.util.gui@default:default,org.apache.batik.util@default:default,org.apache.batik.xml@default:default,org.apache.commons.cli@default:default,org.apache.commons.codec*1.4.0.v201209201156@default:default,org.apache.commons.dbcp@default:default,org.apache.commons.discovery@default:default,org.apache.commons.httpclient@default:default,org.apache.commons.lang@default:default,org.apache.commons.logging*1.1.1.v201101211721@default:default,org.apache.commons.net@default:default,org.apache.commons.pool@default:default,org.apache.derby.core@default:default,org.apache.felix.gogo.command@default:default,org.apache.felix.gogo.runtime@default:default,org.apache.felix.gogo.shell@default:default,org.apache.jasper.glassfish@default:default,org.apache.log4j@default:default,org.apache.lucene.analysis@default:default,org.apache.lucene.core@default:default,org.apache.lucene@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@default:default,org.cyberneko.html@default:default,org.eclipse.ant.core@default:default,org.eclipse.ant.launching@default:default,org.eclipse.ant.ui@default:default,org.eclipse.birt.axis.overlay@default:false,org.eclipse.birt.chart.device.extension@default:default,org.eclipse.birt.chart.device.pdf@default:default,org.eclipse.birt.chart.device.svg@default:default,org.eclipse.birt.chart.device.swt@default:default,org.eclipse.birt.chart.engine.extension@default:default,org.eclipse.birt.chart.engine@default:default,org.eclipse.birt.chart.examples.core@default:default,org.eclipse.birt.chart.reportitem.ui@default:default,org.eclipse.birt.chart.reportitem@default:default,org.eclipse.birt.chart.ui.extension@default:default,org.eclipse.birt.chart.ui@default:default,org.eclipse.birt.core.script.function@default:default,org.eclipse.birt.core.ui@default:default,org.eclipse.birt.core@default:default,org.eclipse.birt.data.aggregation@default:default,org.eclipse.birt.data@default:default,org.eclipse.birt.jetty.overlay@default:false,org.eclipse.birt.me.prettyprint.hector@default:default,org.eclipse.birt.report.data.adapter@default:default,org.eclipse.birt.report.data.bidi.utils.ui@default:default,org.eclipse.birt.report.data.bidi.utils@default:default,org.eclipse.birt.report.data.oda.excel.ui@default:default,org.eclipse.birt.report.data.oda.excel@default:default,org.eclipse.birt.report.data.oda.hive.ui@default:default,org.eclipse.birt.report.data.oda.hive@default:default,org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui@default:default,org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb@default:default,org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui@default:default,org.eclipse.birt.report.data.oda.jdbc.dbprofile@default:default,org.eclipse.birt.report.data.oda.jdbc.ui@default:default,org.eclipse.birt.report.data.oda.jdbc@default:default,org.eclipse.birt.report.data.oda.sampledb.ui@default:default,org.eclipse.birt.report.data.oda.sampledb@default:default,org.eclipse.birt.report.data.oda.xml.ui@default:default,org.eclipse.birt.report.data.oda.xml@default:default,org.eclipse.birt.report.debug.core@default:default,org.eclipse.birt.report.debug.ui@default:default,org.eclipse.birt.report.designer.core@default:default,org.eclipse.birt.report.designer.ui.cubebuilder@default:default,org.eclipse.birt.report.designer.ui.data@default:default,org.eclipse.birt.report.designer.ui.editor.script@default:default,org.eclipse.birt.report.designer.ui.editor.xml.wtp@default:default,org.eclipse.birt.report.designer.ui.editors.schematic@default:default,org.eclipse.birt.report.designer.ui.editors@default:default,org.eclipse.birt.report.designer.ui.ide@default:default,org.eclipse.birt.report.designer.ui.lib.explorer@default:default,org.eclipse.birt.report.designer.ui.lib@default:default,org.eclipse.birt.report.designer.ui.preview.web@default:default,org.eclipse.birt.report.designer.ui.views@default:default,org.eclipse.birt.report.designer.ui@default:default,org.eclipse.birt.report.engine.dataextraction.csv@default:default,org.eclipse.birt.report.engine.dataextraction@default:default,org.eclipse.birt.report.engine.emitter.config.excel@default:default,org.eclipse.birt.report.engine.emitter.config.html@default:default,org.eclipse.birt.report.engine.emitter.config.odp@default:default,org.eclipse.birt.report.engine.emitter.config.ods@default:default,org.eclipse.birt.report.engine.emitter.config.odt@default:default,org.eclipse.birt.report.engine.emitter.config.pdf@default:default,org.eclipse.birt.report.engine.emitter.config.postscript@default:default,org.eclipse.birt.report.engine.emitter.config.ppt@default:default,org.eclipse.birt.report.engine.emitter.config.wpml@default:default,org.eclipse.birt.report.engine.emitter.config@default:default,org.eclipse.birt.report.engine.emitter.html@default:default,org.eclipse.birt.report.engine.emitter.odp@default:default,org.eclipse.birt.report.engine.emitter.ods@default:default,org.eclipse.birt.report.engine.emitter.odt@default:default,org.eclipse.birt.report.engine.emitter.pdf@default:default,org.eclipse.birt.report.engine.emitter.postscript@default:default,org.eclipse.birt.report.engine.emitter.ppt@default:default,org.eclipse.birt.report.engine.emitter.prototype.excel@default:default,org.eclipse.birt.report.engine.emitter.wpml@default:default,org.eclipse.birt.report.engine.fonts@default:default,org.eclipse.birt.report.engine.odf@default:default,org.eclipse.birt.report.engine.script.javascript@default:default,org.eclipse.birt.report.engine@default:default,org.eclipse.birt.report.item.crosstab.core@default:default,org.eclipse.birt.report.item.crosstab.ui@default:default,org.eclipse.birt.report.model.adapter.oda@default:default,org.eclipse.birt.report.model@default:default,org.eclipse.birt.report.viewer@default:default,org.eclipse.birt.resources@default:default,org.eclipse.birt@default:default,org.eclipse.compare.core@default:default,org.eclipse.compare.win32@default:default,org.eclipse.compare@default:default,org.eclipse.core.commands@default:default,org.eclipse.core.contenttype@default:default,org.eclipse.core.databinding.beans@default:default,org.eclipse.core.databinding.observable@default:default,org.eclipse.core.databinding.property@default:default,org.eclipse.core.databinding@default:default,org.eclipse.core.expressions@default:default,org.eclipse.core.externaltools@default:default,org.eclipse.core.filebuffers@default:default,org.eclipse.core.filesystem.win32.x86_64@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86_64@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime.compatibility@default:default,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@default:default,org.eclipse.cvs@default:default,org.eclipse.datatools.connectivity.apache.derby.ui@default:default,org.eclipse.datatools.connectivity.apache.derby@default:default,org.eclipse.datatools.connectivity.db.generic@default:default,org.eclipse.datatools.connectivity.oda.consumer@default:default,org.eclipse.datatools.connectivity.oda.design.ui@default:default,org.eclipse.datatools.connectivity.oda.design@default:default,org.eclipse.datatools.connectivity.oda.profile@default:default,org.eclipse.datatools.connectivity.oda@default:default,org.eclipse.datatools.connectivity.sqm.core.ui@default:default,org.eclipse.datatools.connectivity.sqm.core@default:default,org.eclipse.datatools.connectivity.sqm.server.ui@default:default,org.eclipse.datatools.connectivity.ui@default:default,org.eclipse.datatools.connectivity@default:default,org.eclipse.datatools.enablement.oda.xml.ui@default:default,org.eclipse.datatools.enablement.oda.xml@default:default,org.eclipse.datatools.help@default:default,org.eclipse.datatools.modelbase.dbdefinition@default:default,org.eclipse.datatools.modelbase.derby@default:default,org.eclipse.datatools.modelbase.sql.edit@default:default,org.eclipse.datatools.modelbase.sql.query.edit@default:default,org.eclipse.datatools.modelbase.sql.query@default:default,org.eclipse.datatools.modelbase.sql.xml.query@default:default,org.eclipse.datatools.modelbase.sql@default:default,org.eclipse.datatools.sqltools.common.ui@default:default,org.eclipse.datatools.sqltools.editor.core.ui@default:default,org.eclipse.datatools.sqltools.editor.core@default:default,org.eclipse.datatools.sqltools.parsers.sql.lexer@default:default,org.eclipse.datatools.sqltools.parsers.sql.query@default:default,org.eclipse.datatools.sqltools.parsers.sql@default:default,org.eclipse.datatools.sqltools.plan@default:default,org.eclipse.datatools.sqltools.result.ui@default:default,org.eclipse.datatools.sqltools.result@default:default,org.eclipse.datatools.sqltools.sql.ui@default:default,org.eclipse.datatools.sqltools.sql@default:default,org.eclipse.datatools.sqltools.sqlbuilder@default:default,org.eclipse.datatools.sqltools.sqleditor@default:default,org.eclipse.debug.core@default:default,org.eclipse.debug.ui@default:default,org.eclipse.draw2d@default:default,org.eclipse.e4.core.commands@default:default,org.eclipse.e4.core.contexts@default:default,org.eclipse.e4.core.di.extensions@default:default,org.eclipse.e4.core.di@default:default,org.eclipse.e4.core.services@default:default,org.eclipse.e4.ui.bindings@default:default,org.eclipse.e4.ui.css.core@default:default,org.eclipse.e4.ui.css.swt.theme@default:default,org.eclipse.e4.ui.css.swt@default:default,org.eclipse.e4.ui.di@default:default,org.eclipse.e4.ui.model.workbench@default:default,org.eclipse.e4.ui.services@default:default,org.eclipse.e4.ui.widgets@default:default,org.eclipse.e4.ui.workbench.addons.swt@default:default,org.eclipse.e4.ui.workbench.renderers.swt@default:default,org.eclipse.e4.ui.workbench.swt@default:default,org.eclipse.e4.ui.workbench3@default:default,org.eclipse.e4.ui.workbench@default:default,org.eclipse.ecf.filetransfer@default:default,org.eclipse.ecf.identity@default:default,org.eclipse.ecf.provider.filetransfer.httpclient.ssl@default:false,org.eclipse.ecf.provider.filetransfer.httpclient@default:default,org.eclipse.ecf.provider.filetransfer.ssl@default:false,org.eclipse.ecf.provider.filetransfer@default:default,org.eclipse.ecf.ssl@default:false,org.eclipse.ecf@default:default,org.eclipse.egit.core@default:default,org.eclipse.egit.doc@default:default,org.eclipse.egit.ui@default:default,org.eclipse.egit@default:default,org.eclipse.emf.ant@default:default,org.eclipse.emf.cheatsheets@default:default,org.eclipse.emf.codegen.ecore.ui@default:default,org.eclipse.emf.codegen.ecore@default:default,org.eclipse.emf.codegen.ui@default:default,org.eclipse.emf.codegen@default:default,org.eclipse.emf.common.ui@default:default,org.eclipse.emf.common@default:default,org.eclipse.emf.compare.diff.edit@default:default,org.eclipse.emf.compare.diff@default:default,org.eclipse.emf.compare.epatch@default:default,org.eclipse.emf.compare.match@default:default,org.eclipse.emf.compare.ui@default:default,org.eclipse.emf.compare@default:default,org.eclipse.emf.converter@default:default,org.eclipse.emf.databinding.edit@default:default,org.eclipse.emf.databinding@default:default,org.eclipse.emf.doc@default:default,org.eclipse.emf.ecore.change.edit@default:default,org.eclipse.emf.ecore.change@default:default,org.eclipse.emf.ecore.edit@default:default,org.eclipse.emf.ecore.editor@default:default,org.eclipse.emf.ecore.xmi@default:default,org.eclipse.emf.ecore@default:default,org.eclipse.emf.edit.ui@default:default,org.eclipse.emf.edit@default:default,org.eclipse.emf.example.installer@default:default,org.eclipse.emf.exporter@default:default,org.eclipse.emf.importer.ecore@default:default,org.eclipse.emf.importer.java@default:default,org.eclipse.emf.importer.rose@default:default,org.eclipse.emf.importer@default:default,org.eclipse.emf.mapping.ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore.editor@default:default,org.eclipse.emf.mapping.ecore2ecore@default:default,org.eclipse.emf.mapping.ecore2xml.ui@default:default,org.eclipse.emf.mapping.ecore2xml@default:default,org.eclipse.emf.mapping.ecore@default:default,org.eclipse.emf.mapping.ui@default:default,org.eclipse.emf.mapping@default:default,org.eclipse.emf.mwe.activities@default:default,org.eclipse.emf.mwe.core@default:default,org.eclipse.emf.mwe.ui.simpleEditor@default:default,org.eclipse.emf.mwe.ui@default:default,org.eclipse.emf.mwe.utils@default:default,org.eclipse.emf.mwe2.language.ui@default:default,org.eclipse.emf.mwe2.language@default:default,org.eclipse.emf.mwe2.launch@default:default,org.eclipse.emf.mwe2.lib@default:default,org.eclipse.emf.mwe2.runtime@default:default,org.eclipse.emf@default:default,org.eclipse.equinox.app@default:default,org.eclipse.equinox.bidi@default:default,org.eclipse.equinox.common@2:true,org.eclipse.equinox.console@default:default,org.eclipse.equinox.ds@1:true,org.eclipse.equinox.event@default:default,org.eclipse.equinox.frameworkadmin.equinox@default:default,org.eclipse.equinox.frameworkadmin@default:default,org.eclipse.equinox.http.jetty@default:default,org.eclipse.equinox.http.registry@default:default,org.eclipse.equinox.http.servlet@default:default,org.eclipse.equinox.jsp.jasper.registry@default:default,org.eclipse.equinox.jsp.jasper@default:default,org.eclipse.equinox.p2.artifact.repository@default:default,org.eclipse.equinox.p2.console@default:default,org.eclipse.equinox.p2.core@default:default,org.eclipse.equinox.p2.director.app@default:default,org.eclipse.equinox.p2.director@default:default,org.eclipse.equinox.p2.directorywatcher@default:default,org.eclipse.equinox.p2.discovery.compatibility@default:default,org.eclipse.equinox.p2.discovery@default:default,org.eclipse.equinox.p2.engine@default:default,org.eclipse.equinox.p2.extensionlocation@default:default,org.eclipse.equinox.p2.garbagecollector@default:default,org.eclipse.equinox.p2.jarprocessor@default:default,org.eclipse.equinox.p2.metadata.repository@default:default,org.eclipse.equinox.p2.metadata@default:default,org.eclipse.equinox.p2.operations@default:default,org.eclipse.equinox.p2.publisher.eclipse@default:default,org.eclipse.equinox.p2.publisher@default:default,org.eclipse.equinox.p2.ql@default:default,org.eclipse.equinox.p2.repository.tools@default:default,org.eclipse.equinox.p2.repository@default:default,org.eclipse.equinox.p2.touchpoint.eclipse@default:default,org.eclipse.equinox.p2.touchpoint.natives@default:default,org.eclipse.equinox.p2.transport.ecf@default:default,org.eclipse.equinox.p2.ui.discovery@default:default,org.eclipse.equinox.p2.ui.importexport@default:default,org.eclipse.equinox.p2.ui.sdk.scheduler@default:default,org.eclipse.equinox.p2.ui.sdk@default:default,org.eclipse.equinox.p2.ui@default:default,org.eclipse.equinox.p2.updatechecker@default:default,org.eclipse.equinox.p2.updatesite@default:default,org.eclipse.equinox.preferences@default:default,org.eclipse.equinox.registry@default:default,org.eclipse.equinox.security.ui@default:default,org.eclipse.equinox.security.win32.x86_64@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.simpleconfigurator.manipulator@default:default,org.eclipse.equinox.simpleconfigurator@1:true,org.eclipse.equinox.util@default:default,org.eclipse.gef@default:default,org.eclipse.help.base@default:default,org.eclipse.help.ui@default:default,org.eclipse.help.webapp@default:default,org.eclipse.help@default:default,org.eclipse.jdt.annotation@default:default,org.eclipse.jdt.compiler.apt@default:false,org.eclipse.jdt.compiler.tool@default:false,org.eclipse.jdt.core.manipulation@default:default,org.eclipse.jdt.core@default:default,org.eclipse.jdt.debug.ui@default:default,org.eclipse.jdt.debug@default:default,org.eclipse.jdt.junit.core@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.jdt.junit@default:default,org.eclipse.jdt.launching@default:default,org.eclipse.jdt.ui@default:default,org.eclipse.jdt@default:default,org.eclipse.jetty.continuation@default:default,org.eclipse.jetty.http@default:default,org.eclipse.jetty.io@default:default,org.eclipse.jetty.security@default:default,org.eclipse.jetty.server@default:default,org.eclipse.jetty.servlet@default:default,org.eclipse.jetty.util@default:default,org.eclipse.jface.databinding@default:default,org.eclipse.jface.text@default:default,org.eclipse.jface@default:default,org.eclipse.jgit@default:default,org.eclipse.jsch.core@default:default,org.eclipse.jsch.ui@default:default,org.eclipse.ltk.core.refactoring@default:default,org.eclipse.ltk.ui.refactoring@default:default,org.eclipse.m2e.maven.runtime@default:default,org.eclipse.mylyn.commons.core@default:default,org.eclipse.mylyn.commons.identity.core@default:default,org.eclipse.mylyn.commons.net@default:default,org.eclipse.mylyn.commons.notifications.core@default:default,org.eclipse.mylyn.commons.notifications.feed@default:default,org.eclipse.mylyn.commons.notifications.ui@default:default,org.eclipse.mylyn.commons.repositories.core@default:default,org.eclipse.mylyn.commons.repositories.ui@default:default,org.eclipse.mylyn.commons.screenshots@default:default,org.eclipse.mylyn.commons.ui@default:default,org.eclipse.mylyn.commons.workbench@default:default,org.eclipse.mylyn.context.core@default:default,org.eclipse.mylyn.monitor.core@default:default,org.eclipse.mylyn.monitor.ui@default:default,org.eclipse.mylyn.tasks.bugs@default:default,org.eclipse.mylyn.tasks.core@default:default,org.eclipse.mylyn.tasks.ui@default:default,org.eclipse.nebula.widgets.calendarcombo@default:default,org.eclipse.nebula.widgets.ganttchart@default:default,org.eclipse.nebula.widgets.xviewer@default:default,org.eclipse.osee.cache.admin@default:default,org.eclipse.osgi.services@default:default,org.eclipse.osgi.util@default:default,org.eclipse.osgi@-1:true,org.eclipse.pde.api.tools.ui@default:default,org.eclipse.pde.api.tools@default:default,org.eclipse.pde.build@default:default,org.eclipse.pde.core@default:default,org.eclipse.pde.doc.user@default:default,org.eclipse.pde.ds.core@default:default,org.eclipse.pde.ds.ui@default:default,org.eclipse.pde.junit.runtime@default:default,org.eclipse.pde.launching@default:default,org.eclipse.pde.runtime@default:default,org.eclipse.pde.ua.core@default:default,org.eclipse.pde.ua.ui@default:default,org.eclipse.pde.ui.templates@default:default,org.eclipse.pde.ui@default:default,org.eclipse.pde@default:default,org.eclipse.platform.doc.isv@default:default,org.eclipse.platform.doc.user@default:default,org.eclipse.platform@default:default,org.eclipse.rcp@default:default,org.eclipse.sdk@default:default,org.eclipse.search@default:default,org.eclipse.swt.win32.win32.x86_64@default:false,org.eclipse.swt@default:default,org.eclipse.team.core@default:default,org.eclipse.team.cvs.core@default:default,org.eclipse.team.cvs.ssh2@default:default,org.eclipse.team.cvs.ui@default:default,org.eclipse.team.svn.core@default:default,org.eclipse.team.svn.help@default:default,org.eclipse.team.svn.ui@default:default,org.eclipse.team.svn@default:default,org.eclipse.team.ui@default:default,org.eclipse.text@default:default,org.eclipse.ui.browser@default:default,org.eclipse.ui.cheatsheets@default:default,org.eclipse.ui.console@default:default,org.eclipse.ui.editors@default:default,org.eclipse.ui.externaltools@default:default,org.eclipse.ui.forms@default:default,org.eclipse.ui.ide.application@default:default,org.eclipse.ui.ide@default:default,org.eclipse.ui.intro.universal@default:default,org.eclipse.ui.intro@default:default,org.eclipse.ui.navigator.resources@default:default,org.eclipse.ui.navigator@default:default,org.eclipse.ui.net@default:default,org.eclipse.ui.trace@default:default,org.eclipse.ui.views.log@default:default,org.eclipse.ui.views.properties.tabbed@default:default,org.eclipse.ui.views@default:default,org.eclipse.ui.win32@default:false,org.eclipse.ui.workbench.texteditor@default:default,org.eclipse.ui.workbench@default:default,org.eclipse.ui@default:default,org.eclipse.update.configurator@3:true,org.eclipse.wst.common.core@default:default,org.eclipse.wst.common.environment@default:default,org.eclipse.wst.common.frameworks@default:default,org.eclipse.wst.common.project.facet.core@default:default,org.eclipse.wst.common.uriresolver@default:default,org.eclipse.wst.sse.core@default:default,org.eclipse.wst.sse.ui@default:default,org.eclipse.wst.validation@default:default,org.eclipse.xpand@default:default,org.eclipse.xtend.typesystem.emf@default:default,org.eclipse.xtend@default:default,org.eclipse.xtext.builder@default:default,org.eclipse.xtext.common.types.ui@default:default,org.eclipse.xtext.common.types@default:default,org.eclipse.xtext.ecore@default:default,org.eclipse.xtext.generator@default:default,org.eclipse.xtext.logging@default:false,org.eclipse.xtext.smap@default:default,org.eclipse.xtext.ui.codetemplates.ui@default:default,org.eclipse.xtext.ui.codetemplates@default:default,org.eclipse.xtext.ui.shared@default:default,org.eclipse.xtext.ui@default:default,org.eclipse.xtext.util@default:default,org.eclipse.xtext.xbase.lib@default:default,org.eclipse.xtext@default:default,org.eclipse.zest.core@default:default,org.eclipse.zest.layouts@default:default,org.hamcrest.core@default:default,org.jboss.netty@default:default,org.jdom@default:default,org.jsoup@default:default,org.junit*4.10.0.v4_10_0_v20120426-0900@default:default,org.junit4@default:default,org.mozilla.javascript@default:default,org.objectweb.asm*3.3.1.v201105211655@default:default,org.objectweb.asm*4.0.0.v201302062210@default:default,org.polarion.eclipse.team.svn.connector.svnkit17@default:default,org.polarion.eclipse.team.svn.connector@default:default,org.sat4j.core@default:default,org.sat4j.pb@default:default,org.slf4j.api*1.7.2.v20121108-1250@default:default,org.w3c.css.sac@default:default,org.w3c.dom.smil@default:default,org.w3c.dom.svg@default:default,org.w3c.sac@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="com.sun.jersey.client.apache@default:default,com.sun.jersey@default:default,javax.ws.rs@default:default,jms.libraries@default:default,net.jini@default:default,org.eclipse.osee.ats.api@default:default,org.eclipse.osee.ats.core.client.test@default:false,org.eclipse.osee.ats.core.client@default:default,org.eclipse.osee.ats.core.test@default:false,org.eclipse.osee.ats.core@default:default,org.eclipse.osee.ats.dsl.ui@default:default,org.eclipse.osee.ats.dsl@default:default,org.eclipse.osee.ats.help.ui.test@default:false,org.eclipse.osee.ats.help.ui@default:default,org.eclipse.osee.ats.impl.test@default:false,org.eclipse.osee.ats.impl@default:default,org.eclipse.osee.ats.mocks@default:default,org.eclipse.osee.ats.reports.burndown@default:default,org.eclipse.osee.ats.reports.efficiency@default:default,org.eclipse.osee.ats.reports.split@default:default,org.eclipse.osee.ats.reports@default:default,org.eclipse.osee.ats.test@default:false,org.eclipse.osee.ats@default:default,org.eclipse.osee.cache.admin.test@default:false,org.eclipse.osee.coverage.help.ui.test@default:false,org.eclipse.osee.coverage.help.ui@default:default,org.eclipse.osee.coverage.test@default:false,org.eclipse.osee.coverage@default:default,org.eclipse.osee.define.test@default:false,org.eclipse.osee.define@default:default,org.eclipse.osee.event.osgi@default:default,org.eclipse.osee.event@default:default,org.eclipse.osee.executor.admin.test@default:false,org.eclipse.osee.executor.admin@default:default,org.eclipse.osee.framework.access.provider@default:default,org.eclipse.osee.framework.access.test@default:false,org.eclipse.osee.framework.access@default:default,org.eclipse.osee.framework.branch.gantt@default:default,org.eclipse.osee.framework.core.client@default:default,org.eclipse.osee.framework.core.dsl.integration.test@default:false,org.eclipse.osee.framework.core.dsl.integration@default:default,org.eclipse.osee.framework.core.dsl.ui.integration.test@default:false,org.eclipse.osee.framework.core.dsl.ui.integration@default:default,org.eclipse.osee.framework.core.dsl.ui@default:default,org.eclipse.osee.framework.core.dsl@default:default,org.eclipse.osee.framework.core.message.test@default:false,org.eclipse.osee.framework.core.message@default:default,org.eclipse.osee.framework.core.model.test@default:false,org.eclipse.osee.framework.core.model@default:default,org.eclipse.osee.framework.core.test@default:false,org.eclipse.osee.framework.core@default:default,org.eclipse.osee.framework.database.init@default:default,org.eclipse.osee.framework.database.test@default:false,org.eclipse.osee.framework.database@default:default,org.eclipse.osee.framework.dev.help.ui.test@default:false,org.eclipse.osee.framework.dev.help.ui@default:default,org.eclipse.osee.framework.help.ui.test@default:false,org.eclipse.osee.framework.help.ui@default:default,org.eclipse.osee.framework.jdk.core.test@default:false,org.eclipse.osee.framework.jdk.core@default:default,org.eclipse.osee.framework.jini@default:default,org.eclipse.osee.framework.lifecycle.test@default:false,org.eclipse.osee.framework.lifecycle@default:default,org.eclipse.osee.framework.logging.test@default:false,org.eclipse.osee.framework.logging@default:default,org.eclipse.osee.framework.messaging.event.res.test@default:false,org.eclipse.osee.framework.messaging.event.res@default:default,org.eclipse.osee.framework.messaging.test@default:false,org.eclipse.osee.framework.messaging@default:default,org.eclipse.osee.framework.plugin.core@default:default,org.eclipse.osee.framework.skynet.core.test@default:false,org.eclipse.osee.framework.skynet.core@default:default,org.eclipse.osee.framework.templates@default:default,org.eclipse.osee.framework.ui.admin@default:default,org.eclipse.osee.framework.ui.branch.graph@default:default,org.eclipse.osee.framework.ui.data.model.editor@default:default,org.eclipse.osee.framework.ui.plugin@default:default,org.eclipse.osee.framework.ui.product@default:default,org.eclipse.osee.framework.ui.skynet.test@default:false,org.eclipse.osee.framework.ui.skynet@default:default,org.eclipse.osee.framework.ui.swt@default:default,org.eclipse.osee.framework.ui.workspacebundleloader@default:default,org.eclipse.osee.framework.ui.ws@default:default,org.eclipse.osee.hsqldb@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger@default:default,org.eclipse.osee.orcs.rest.client@default:default,org.eclipse.osee.orcs.rest.model@default:default,org.eclipse.osee.ote.client.msg@default:default,org.eclipse.osee.ote.client@default:default,org.eclipse.osee.ote.connection.jini@default:default,org.eclipse.osee.ote.connection.service@default:default,org.eclipse.osee.ote.container@default:default,org.eclipse.osee.ote.core.test@default:false,org.eclipse.osee.ote.core@default:default,org.eclipse.osee.ote.define@default:default,org.eclipse.osee.ote.help.ui.test@default:false,org.eclipse.osee.ote.help.ui@default:default,org.eclipse.osee.ote.jms@default:default,org.eclipse.osee.ote.message.test@default:false,org.eclipse.osee.ote.message@default:default,org.eclipse.osee.ote.messaging.dds@default:default,org.eclipse.osee.ote.model.manager@default:default,org.eclipse.osee.ote.runtimeManager@default:default,org.eclipse.osee.ote.server@default:default,org.eclipse.osee.ote.ui.define@default:default,org.eclipse.osee.ote.ui.markers@default:default,org.eclipse.osee.ote.ui.output@default:default,org.eclipse.osee.ote.ui.test.manager@default:default,org.eclipse.osee.ote.ui.test.output@default:default,org.eclipse.osee.ote.ui@default:default,org.eclipse.osee.ote.version.git.test@default:false,org.eclipse.osee.ote.version.git@default:default,org.eclipse.osee.ote.version.svn@default:default,org.eclipse.osee.ote.version@default:default,org.eclipse.osee.support.test.util@default:default,org.hsqldb@default:default,org.jvnet.mimepull@default:default,org.mockito@default:default,org.objenesis@default:default,org.xerial.sqlite@default:default"/> <booleanAttribute key="show_selected_only" value="false"/> <stringAttribute key="templateConfig" value=""/> <stringAttribute key="timestamp" value="1349216380893"/> <booleanAttribute key="tracing" value="false"/> -<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useCustomFeatures" value="true"/> <booleanAttribute key="useDefaultConfig" value="true"/> <booleanAttribute key="useDefaultConfigArea" value="true"/> <booleanAttribute key="useProduct" value="true"/> diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip b/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip Binary files differindex 9c916b4ce66..32b385b4012 100644 --- a/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip +++ b/plugins/org.eclipse.osee.x.server.p2/demo/binary_data.zip diff --git a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip Binary files differindex def1c1fef9e..f7d4652a232 100644 --- a/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip +++ b/plugins/org.eclipse.osee.x.server.p2/demo/hsql.zip diff --git a/plugins/org.eclipse.osee.x.server.parent/pom.xml b/plugins/org.eclipse.osee.x.server.parent/pom.xml index 3361713b23d..01ad838f853 100644 --- a/plugins/org.eclipse.osee.x.server.parent/pom.xml +++ b/plugins/org.eclipse.osee.x.server.parent/pom.xml @@ -37,6 +37,8 @@ <module>../../plugins/org.eclipse.osee.ats.rest</module> <module>../../plugins/org.eclipse.osee.ats.presenter.test</module> + <module>../../plugins/org.eclipse.osee.database</module> + <module>../../features/org.eclipse.osee.x.server.legacy.feature</module> <module>../../features/org.eclipse.osee.x.server.feature</module> |