diff options
-rw-r--r-- | plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.parent/pom.xml | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/.classpath (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/.classpath) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/.gitignore (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/.gitignore) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/.project (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/.project) | 2 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/META-INF/MANIFEST.MF) | 14 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/OrcsIntegrationTestSuite.launch (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/OrcsIntegrationTestSuite.launch) | 0 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/OrcsTransactionTestSuite.launch | 49 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/build.properties (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/build.properties) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/pom.xml (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/pom.xml) | 8 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/OrcsIntegrationRule.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/OrcsIntegrationTestSuite.java) | 14 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsAttributeLoadingTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsAttributeSearchTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsBranchTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsQueryTest.java) | 5 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsRelationLoadingTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsTransactionTest.java) | 4 | ||||
-rw-r--r-- | plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java (renamed from plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/mock/TestBranches.java) | 2 |
19 files changed, 91 insertions, 40 deletions
diff --git a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch b/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch index a6af6130ed2..3231d3aa42f 100644 --- a/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch +++ b/plugins/org.eclipse.osee.orcs.db.test/OrcsDbTestSuite.launch @@ -32,8 +32,8 @@ <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.ibm.icu@default:default,javax.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@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.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@default:false,org.eclipse.core.filesystem@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net.win32.x86@default:false,org.eclipse.core.net@default:default,org.eclipse.core.resources.win32.x86@default:false,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.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@default:false,org.eclipse.equinox.security@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.h2@default:default,org.hamcrest.core@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/> -<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.event@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.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.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger@default:default,org.eclipse.osee.orcs.core.integration.test@default:false,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.mock@default:default,org.eclipse.osee.orcs@default:default"/> +<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.ibm.icu@default:default,javax.xml@default:default,org.apache.commons.codec@default:default,org.apache.commons.httpclient@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.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@default:default,org.eclipse.core.jobs@default:default,org.eclipse.core.net@default:default,org.eclipse.core.resources@default:default,org.eclipse.core.runtime.compatibility.registry@default:false,org.eclipse.core.runtime@default:true,org.eclipse.core.variables@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.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@default:default,org.eclipse.equinox.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,org.eclipse.osgi.services@default:default,org.eclipse.osgi@-1:true,org.h2@default:default,org.hamcrest.core@default:default,org.junit*4.8.2.v4_8_2_v20110321-1705@default:default,org.slf4j.api@default:default,org.slf4j.jcl@default:default"/> +<stringAttribute key="selected_workspace_plugins" value="org.eclipse.osee.event@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.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.resource.management.test@default:false,org.eclipse.osee.framework.resource.management@default:default,org.eclipse.osee.logback.config@default:false,org.eclipse.osee.logger@default:default,org.eclipse.osee.orcs.core.integration.test@default:false,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@default:default"/> <booleanAttribute key="show_selected_only" value="true"/> <stringAttribute key="timestamp" value="1318709749622"/> <booleanAttribute key="tracing" value="false"/> diff --git a/plugins/org.eclipse.osee.orcs.parent/pom.xml b/plugins/org.eclipse.osee.orcs.parent/pom.xml index de1574bb638..8ed8db7e4aa 100644 --- a/plugins/org.eclipse.osee.orcs.parent/pom.xml +++ b/plugins/org.eclipse.osee.orcs.parent/pom.xml @@ -26,6 +26,8 @@ <module>../../plugins/org.eclipse.osee.database.schema</module> <module>../../plugins/org.eclipse.osee.orcs</module> + <module>../../plugins/org.eclipse.osee.orcs.test</module> + <module>../../plugins/org.eclipse.osee.orcs.core</module> <module>../../plugins/org.eclipse.osee.orcs.core.test</module> <module>../../plugins/org.eclipse.osee.orcs.db</module> @@ -35,8 +37,6 @@ <module>../../plugins/org.eclipse.osee.framework.h2</module> <module>../../plugins/org.eclipse.osee.orcs.db.test</module> - <module>../../plugins/org.eclipse.osee.orcs.core.integration.test</module> - <module>../../features/org.eclipse.osee.orcs.feature</module> <module>../../features/org.eclipse.osee.orcs.feature.source</module> diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/.classpath b/plugins/org.eclipse.osee.orcs.test/.classpath index ad32c83a788..ad32c83a788 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/.classpath +++ b/plugins/org.eclipse.osee.orcs.test/.classpath diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/.gitignore b/plugins/org.eclipse.osee.orcs.test/.gitignore index 087e5c7a759..087e5c7a759 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/.gitignore +++ b/plugins/org.eclipse.osee.orcs.test/.gitignore diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/.project b/plugins/org.eclipse.osee.orcs.test/.project index dc4aadbe36d..71becd8289b 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/.project +++ b/plugins/org.eclipse.osee.orcs.test/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>org.eclipse.osee.orcs.core.integration.test</name> + <name>org.eclipse.osee.orcs.test</name> <comment></comment> <projects> </projects> diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF index c7a106eee50..4ec35fde0c0 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.orcs.test/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 -Bundle-Name: Test -Bundle-SymbolicName: org.eclipse.osee.orcs.core.integration.test +Bundle-Name: ORCS Integration Test +Bundle-SymbolicName: org.eclipse.osee.orcs.test Bundle-Version: 0.10.1.qualifier -Fragment-Host: org.eclipse.osee.orcs.core +Fragment-Host: org.eclipse.osee.orcs Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: junit.framework;version="4.8.2", org.eclipse.osee.event, @@ -11,11 +11,15 @@ Import-Package: junit.framework;version="4.8.2", org.eclipse.osee.framework.core.data, org.eclipse.osee.framework.core.enums, org.eclipse.osee.framework.core.exception, + org.eclipse.osee.framework.core.services, org.eclipse.osee.framework.database, org.eclipse.osee.orcs, + org.eclipse.osee.orcs.core, + org.eclipse.osee.orcs.core.ds, org.eclipse.osee.orcs.data, org.eclipse.osee.orcs.db.mock, org.eclipse.osee.orcs.search, + org.eclipse.osee.orcs.transaction, org.eclipse.osee.orcs.utility, org.junit;version="4.8.2", org.junit.runner;version="4.8.2", @@ -23,5 +27,5 @@ Import-Package: junit.framework;version="4.8.2", org.osgi.service.event;version="1.3.0" Require-Bundle: org.eclipse.osee.event.osgi, org.eclipse.equinox.event, - org.eclipse.osee.orcs, - org.junit + org.junit, + org.eclipse.osee.logger diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/OrcsIntegrationTestSuite.launch b/plugins/org.eclipse.osee.orcs.test/OrcsIntegrationTestSuite.launch index 0a716982b5b..0a716982b5b 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/OrcsIntegrationTestSuite.launch +++ b/plugins/org.eclipse.osee.orcs.test/OrcsIntegrationTestSuite.launch diff --git a/plugins/org.eclipse.osee.orcs.test/OrcsTransactionTestSuite.launch b/plugins/org.eclipse.osee.orcs.test/OrcsTransactionTestSuite.launch new file mode 100644 index 00000000000..8c01f05e19b --- /dev/null +++ b/plugins/org.eclipse.osee.orcs.test/OrcsTransactionTestSuite.launch @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig"> +<booleanAttribute key="append.args" value="true"/> +<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/> +<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"/> +<booleanAttribute key="default_auto_start" value="true"/> +<booleanAttribute key="includeOptional" value="false"/> +<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS"> +<listEntry value="/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES"> +<listEntry value="1"/> +</listAttribute> +<listAttribute key="org.eclipse.debug.ui.favoriteGroups"> +<listEntry value="org.eclipse.debug.ui.launchGroup.debug"/> +</listAttribute> +<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.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6.0_25"/> +<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.osee.orcs.api.OrcsTransactionTest"/> +<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"/> +<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/> +<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx384m -Dosee.log.default=ALL -Dlogback.configurationFile=logback-dev.xml -DNosgi.noShutdown=true"/> +<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.collect@default:default,com.google.inject@default:default,javax.servlet@default:default,javax.xml@default:default,org.antlr.runtime@default:default,org.aopalliance@default:default,org.apache.commons.codec@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.log4j@default:default,org.apache.xerces@default:default,org.apache.xml.resolver@default:default,org.apache.xml.serializer@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.auth@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.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.servletbridge.extensionbundle@default:false,org.eclipse.equinox.transforms.hook@default:false,org.eclipse.equinox.util@default:default,org.eclipse.equinox.weaving.hook@default:false,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.8.2.v4_8_2_v20110321-1705@default:default,org.slf4j.api@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.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.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:true,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.mockito@default:default,org.objenesis@default:default"/> +<booleanAttribute key="show_selected_only" value="false"/> +<stringAttribute key="timestamp" value="1342214111110"/> +<booleanAttribute key="tracing" value="false"/> +<booleanAttribute key="useCustomFeatures" value="false"/> +<booleanAttribute key="useDefaultConfig" value="true"/> +<booleanAttribute key="useDefaultConfigArea" value="false"/> +<booleanAttribute key="useProduct" value="false"/> +</launchConfiguration> diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/build.properties b/plugins/org.eclipse.osee.orcs.test/build.properties index 1efc8c8514e..4d6f021ca00 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/build.properties +++ b/plugins/org.eclipse.osee.orcs.test/build.properties @@ -8,4 +8,6 @@ additional.bundles = org.junit,\ org.eclipse.osee.orcs.db.mock,\ org.eclipse.osee.orcs,\ org.eclipse.osee.event,\ - org.eclipse.osgi.services + org.eclipse.osgi.services,\ + org.eclipse.osee.orcs.core,\ + org.eclipse.osee.logger diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/pom.xml b/plugins/org.eclipse.osee.orcs.test/pom.xml index 73496f53b72..9ee89c5fb8c 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/pom.xml +++ b/plugins/org.eclipse.osee.orcs.test/pom.xml @@ -10,9 +10,9 @@ <relativePath>../../plugins/org.eclipse.osee.orcs.parent</relativePath> </parent> - <artifactId>org.eclipse.osee.orcs.core.integration.test</artifactId> + <artifactId>org.eclipse.osee.orcs.test</artifactId> <packaging>eclipse-test-plugin</packaging> - <name>OSEE ORCS CORE INTEGRATION Test - (Incubation)</name> + <name>OSEE ORCS Test - (Incubation)</name> <build> <plugins> @@ -21,8 +21,8 @@ <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho-version}</version> <configuration> - <testSuite>org.eclipse.osee.orcs.core.integration.test</testSuite> - <testClass>org.eclipse.osee.orcs.core.OrcsIntegrationTestSuite</testClass> + <testSuite>org.eclipse.osee.orcs.test</testSuite> + <testClass>org.eclipse.osee.orcs.OrcsIntegrationTestSuite</testClass> <dependencies> <dependency> <type>eclipse-plugin</type> diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/OrcsIntegrationRule.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java index 3b611e28715..bd71e8e6f08 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/OrcsIntegrationRule.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationRule.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core; +package org.eclipse.osee.orcs; import org.eclipse.osee.event.EventService; import org.eclipse.osee.executor.admin.ExecutorAdmin; @@ -18,10 +18,8 @@ import org.eclipse.osee.framework.core.services.IOseeModelingService; 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.DataStoreTypeCache; import org.eclipse.osee.orcs.core.SystemPreferences; import org.eclipse.osee.orcs.core.ds.OrcsDataStore; -import org.eclipse.osee.orcs.core.internal.attribute.AttributeClassResolver; import org.eclipse.osee.orcs.db.mock.OsgiRule; import org.eclipse.osee.orcs.db.mock.OsgiService; import org.osgi.service.event.EventAdmin; @@ -49,7 +47,6 @@ public class OrcsIntegrationRule extends OsgiRule { @OsgiService public IOseeCachingService cachingService; @OsgiService public OrcsDataStore dataStore; @OsgiService public DataStoreTypeCache typeCache; - @OsgiService public AttributeClassResolver resolver; // @formatter:on } diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/OrcsIntegrationTestSuite.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java index 8d5b57e40ad..4759e91adc5 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/OrcsIntegrationTestSuite.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/OrcsIntegrationTestSuite.java @@ -8,14 +8,14 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core; +package org.eclipse.osee.orcs; -import org.eclipse.osee.orcs.core.internal.OrcsAttributeLoadingTest; -import org.eclipse.osee.orcs.core.internal.OrcsAttributeSearchTest; -import org.eclipse.osee.orcs.core.internal.OrcsBranchTest; -import org.eclipse.osee.orcs.core.internal.OrcsQueryTest; -import org.eclipse.osee.orcs.core.internal.OrcsRelationLoadingTest; -import org.eclipse.osee.orcs.core.internal.OrcsTransactionTest; +import org.eclipse.osee.orcs.api.OrcsAttributeLoadingTest; +import org.eclipse.osee.orcs.api.OrcsAttributeSearchTest; +import org.eclipse.osee.orcs.api.OrcsBranchTest; +import org.eclipse.osee.orcs.api.OrcsQueryTest; +import org.eclipse.osee.orcs.api.OrcsRelationLoadingTest; +import org.eclipse.osee.orcs.api.OrcsTransactionTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsAttributeLoadingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java index 3bec8e18bd8..b57cbcd83a9 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsAttributeLoadingTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeLoadingTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core.internal; +package org.eclipse.osee.orcs.api; import java.util.Arrays; import java.util.HashMap; @@ -22,7 +22,7 @@ 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.core.OrcsIntegrationRule; +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; diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsAttributeSearchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java index ac4c5e31c53..6de6e092601 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsAttributeSearchTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsAttributeSearchTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core.internal; +package org.eclipse.osee.orcs.api; import java.util.HashMap; import java.util.List; @@ -22,7 +22,7 @@ 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.core.OrcsIntegrationRule; +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; diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsBranchTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java index bc44dca4304..0a9fac70795 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsBranchTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsBranchTest.java @@ -3,7 +3,7 @@ * * PLACE_YOUR_DISTRIBUTION_STATEMENT_RIGHT_HERE */ -package org.eclipse.osee.orcs.core.internal; +package org.eclipse.osee.orcs.api; import java.util.Collections; import java.util.List; @@ -17,7 +17,7 @@ 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.core.OrcsIntegrationRule; +import org.eclipse.osee.orcs.OrcsIntegrationRule; import org.eclipse.osee.orcs.data.ArtifactReadable; import org.eclipse.osee.orcs.data.CreateBranchData; import org.eclipse.osee.orcs.db.mock.OseeDatabase; diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsQueryTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java index 5ca1034ee1f..eb07707baa3 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsQueryTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsQueryTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core.internal; +package org.eclipse.osee.orcs.api; import java.util.Arrays; import java.util.Collection; @@ -25,8 +25,7 @@ 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.core.OrcsIntegrationRule; -import org.eclipse.osee.orcs.core.mock.TestBranches; +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; diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsRelationLoadingTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java index 13f9753b15e..4582a189791 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsRelationLoadingTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsRelationLoadingTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core.internal; +package org.eclipse.osee.orcs.api; import java.util.Arrays; import java.util.HashMap; @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.core.enums.CoreRelationTypes; 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.core.OrcsIntegrationRule; +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; diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsTransactionTest.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java index aa3a29a170a..8fcbc5054ff 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/internal/OrcsTransactionTest.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/OrcsTransactionTest.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core.internal; +package org.eclipse.osee.orcs.api; import java.lang.reflect.Proxy; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; @@ -21,7 +21,7 @@ import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.orcs.ApplicationContext; import org.eclipse.osee.orcs.OrcsApi; -import org.eclipse.osee.orcs.core.OrcsIntegrationRule; +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; diff --git a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/mock/TestBranches.java b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java index 2432d3ba404..7e1f63e1ef5 100644 --- a/plugins/org.eclipse.osee.orcs.core.integration.test/src/org/eclipse/osee/orcs/core/mock/TestBranches.java +++ b/plugins/org.eclipse.osee.orcs.test/src/org/eclipse/osee/orcs/api/TestBranches.java @@ -8,7 +8,7 @@ * Contributors: * Boeing - initial API and implementation *******************************************************************************/ -package org.eclipse.osee.orcs.core.mock; +package org.eclipse.osee.orcs.api; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.TokenFactory; |