Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2011-10-26 02:26:14 +0000
committerRoberto E. Escobar2011-10-26 02:26:14 +0000
commit5fc0989d6b56028e02ad98312db9f1a5292c8800 (patch)
treef3248ec49a0fab9ce5db54436e272ead5877eb87
parent201de81684d4719eecec698fb10c41aff288a6a3 (diff)
downloadorg.eclipse.osee-5fc0989d6b56028e02ad98312db9f1a5292c8800.tar.gz
org.eclipse.osee-5fc0989d6b56028e02ad98312db9f1a5292c8800.tar.xz
org.eclipse.osee-5fc0989d6b56028e02ad98312db9f1a5292c8800.zip
feature[ats_Q9NLC]: Update dependencies
-rw-r--r--plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java8
-rw-r--r--plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF1
-rw-r--r--plugins/org.eclipse.osee.display.view.web/build.properties3
4 files changed, 9 insertions, 4 deletions
diff --git a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF
index 62efdb4c388..adad5da26a8 100644
--- a/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.ats.api/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Import-Package: org.eclipse.osee.display.api.components,
org.eclipse.osee.framework.jdk.core.util,
org.eclipse.osee.orcs,
org.eclipse.osee.orcs.data
+Require-Bundle: org.eclipse.core.runtime
diff --git a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java
index 1ca3d25efd9..a516cebb9b8 100644
--- a/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java
+++ b/plugins/org.eclipse.osee.display.presenter.test/src/org/eclipse/osee/display/presenter/internal/SearchPresenterTest.java
@@ -37,6 +37,7 @@ import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.data.IRelationTypeSide;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
+import org.eclipse.osee.framework.core.enums.CoreBranches;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.enums.RelationTypeMultiplicity;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
@@ -133,13 +134,16 @@ public class SearchPresenterTest {
CoreArtifactTypes.AbstractTestResult, RelationTypeMultiplicity.ONE_TO_ONE, "");
testArt.addRelationType(relType);
provider.addArtifact(testArt);
- String url = "/branch=" + Utility.encode(GUID.create()) + "&artifact=" + artGuid;
+ String url = "/branch=" + Utility.encode(CoreBranches.COMMON.getGuid()) + "&artifact=" + artGuid;
MockSearchHeaderComponent searchHeaderComp = new MockSearchHeaderComponent();
MockArtifactHeaderComponent artHeaderComp = new MockArtifactHeaderComponent();
MockRelationComponent relComp = new MockRelationComponent();
MockAttributeComponent attrComp = new MockAttributeComponent();
presenter.initArtifactPage(url, searchHeaderComp, artHeaderComp, relComp, attrComp, null);
- Assert.assertEquals(artGuid, artHeaderComp.getArtifact().getGuid());
+
+ ViewArtifact artifact = artHeaderComp.getArtifact();
+ Assert.assertNotNull(artifact);
+ Assert.assertEquals(artGuid, artifact.getGuid());
Assert.assertEquals(1, relComp.getRelationTypes().size());
Assert.assertEquals(1, attrComp.getAttributes().keySet().size());
diff --git a/plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF
index 9a5463c0549..e1fc044e703 100644
--- a/plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.osee.display.view.web/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Import-Package: com.vaadin,
org.eclipse.osee.display.api.components,
org.eclipse.osee.display.api.data,
org.eclipse.osee.display.api.search,
- org.eclipse.osee.display.presenter.mocks,
org.eclipse.osee.framework.core.data,
org.eclipse.osee.vaadin,
org.eclipse.osee.vaadin.widgets,
diff --git a/plugins/org.eclipse.osee.display.view.web/build.properties b/plugins/org.eclipse.osee.display.view.web/build.properties
index d053259375f..bbc9213db56 100644
--- a/plugins/org.eclipse.osee.display.view.web/build.properties
+++ b/plugins/org.eclipse.osee.display.view.web/build.properties
@@ -7,5 +7,6 @@ additional.bundles = org.eclipse.osee.vaadin,\
org.eclipse.osgi,\
org.eclipse.osee.display.api,\
com.vaadin,\
- javax.servlet
+ javax.servlet,\
+ org.eclipse.osee.framework.core

Back to the top