summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkwilk2011-06-06 14:10:34 (EDT)
committer Ryan D. Brooks2011-06-06 14:10:34 (EDT)
commitf569bf2b47d32a697b35c872faebe47cf450625a (patch)
treef028ccea6e471292a25bfd8984194b9e8b79e25d
parent85ba84b82f5afbfb30c07b9daeb214cc2f872d71 (diff)
downloadorg.eclipse.osee-f569bf2b47d32a697b35c872faebe47cf450625a.zip
org.eclipse.osee-f569bf2b47d32a697b35c872faebe47cf450625a.tar.gz
org.eclipse.osee-f569bf2b47d32a697b35c872faebe47cf450625a.tar.bz2
refactor: Minor quality fixes for tests
-rw-r--r--plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java4
-rw-r--r--plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java1
-rw-r--r--plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java15
3 files changed, 7 insertions, 13 deletions
diff --git a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java b/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java
index 0095fc2..e9bb839 100644
--- a/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java
+++ b/plugins/org.eclipse.osee.ats.config.demo.test/src/org/eclipse/osee/ats/config/demo/PopulateDemoActionsTest.java
@@ -54,12 +54,14 @@ public class PopulateDemoActionsTest {
@org.junit.Test
public void testSawBuild2Action1() throws OseeCoreException {
+
// {@link DemoDbActionData.getReqSawActionsData()} - 1
String title = "SAW (committed) Reqt Changes for Diagram View";
ActionArtifact action =
(ActionArtifact) ArtifactQuery.getArtifactFromTypeAndName(AtsArtifactTypes.Action, title,
AtsUtil.getAtsBranchToken());
Assert.assertNotNull(action);
+
// test teams
Assert.assertEquals(3, action.getTeams().size());
TeamWorkFlowArtifact codeTeamArt = null;
@@ -86,6 +88,7 @@ public class PopulateDemoActionsTest {
}
Assert.assertEquals(3, numTested);
Assert.assertNotNull(codeTeamArt);
+
// test reviews
Assert.assertEquals("Should only be two reviews", 2, ReviewManager.getReviews(codeTeamArt).size());
PeerToPeerReviewArtifact rev1 = null;
@@ -103,6 +106,7 @@ public class PopulateDemoActionsTest {
"Joe Smith; Kay Jones");
testReviewContents(rev2, "Peer Review first set of code changes", PeerToPeerReviewState.Prepare.getPageName(),
"Joe Smith");
+
// test tasks
List<String> taskNames = new ArrayList<String>();
taskNames.addAll(DemoTestUtil.getTaskTitles(true));
diff --git a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java
index bf869cd..79e055f 100644
--- a/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java
+++ b/plugins/org.eclipse.osee.ats.core/src/org/eclipse/osee/ats/core/workflow/StateManager.java
@@ -50,7 +50,6 @@ public class StateManager {
private static final Set<String> notValidAttributeType = new HashSet<String>();
public StateManager(AbstractWorkflowArtifact sma) {
- super();
this.sma = sma;
currentStateDam = new XCurrentStateDam(sma);
stateDam = new XStateDam(sma);
diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
index 3f63c84..70d13ea 100644
--- a/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
+++ b/plugins/org.eclipse.osee.framework.ui.skynet/src/org/eclipse/osee/framework/ui/skynet/blam/operation/RelationOrderRepairBlam.java
@@ -14,8 +14,6 @@ import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
-import javax.xml.parsers.ParserConfigurationException;
-import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes;
import org.eclipse.osee.framework.core.enums.RelationSide;
@@ -34,17 +32,10 @@ import org.eclipse.osee.framework.skynet.core.transaction.SkynetTransaction;
import org.eclipse.osee.framework.skynet.core.utility.Artifacts;
import org.eclipse.osee.framework.ui.skynet.blam.AbstractBlam;
import org.eclipse.osee.framework.ui.skynet.blam.VariableMap;
-import org.eclipse.osee.framework.ui.skynet.widgets.workflow.DynamicXWidgetLayoutData;
-import org.xml.sax.SAXException;
public class RelationOrderRepairBlam extends AbstractBlam {
- SkynetTransaction transaction;
- boolean recurse;
-
- @Override
- public List<DynamicXWidgetLayoutData> getLayoutDatas() throws IllegalArgumentException, ParserConfigurationException, SAXException, IOException, CoreException {
- return super.getLayoutDatas();
- }
+ private SkynetTransaction transaction;
+ private boolean recurse;
@Override
public String getName() {
@@ -68,11 +59,11 @@ public class RelationOrderRepairBlam extends AbstractBlam {
@Override
public void runOperation(VariableMap variableMap, IProgressMonitor monitor) throws Exception {
- recurse = variableMap.getBoolean("Recurse Over Hierarchy");
List<Artifact> inputArtifacts = variableMap.getArtifacts("Artifacts");
if (inputArtifacts.isEmpty()) {
return;
}
+ recurse = variableMap.getBoolean("Recurse Over Hierarchy");
Branch branch = getBranch(inputArtifacts);
transaction = new SkynetTransaction(branch, getName());
for (Artifact art : inputArtifacts) {