From b8926c75e41d949e2ee6a1d6142c760f0643e066 Mon Sep 17 00:00:00 2001 From: kwilk Date: Fri, 6 Apr 2012 14:22:20 -0700 Subject: refactor: Update ViewWordChangeAndDiffTest to operate on correct branch Putting back code removed by eariler commit, to address what looks like a intermittent test failure. --- .../framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java index 55d27d89278..64a5498157f 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java @@ -31,6 +31,7 @@ import org.eclipse.osee.framework.core.operation.Operations; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.skynet.core.artifact.Artifact; +import org.eclipse.osee.framework.skynet.core.artifact.BranchManager; import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery; import org.eclipse.osee.framework.skynet.core.change.ArtifactDelta; import org.eclipse.osee.framework.skynet.core.change.Change; @@ -118,7 +119,10 @@ public final class ViewWordChangeAndDiffTest { TestUtil.severeLoggingEnd(severeLoggingMonitor); } - private IOseeBranch getTestBranch() { + private IOseeBranch getTestBranch() throws OseeCoreException { + if (BranchManager.branchExists(DemoSawBuilds.SAW_Bld_2)) { + return DemoSawBuilds.SAW_Bld_2; + } return DemoSawBuilds.SAW_Bld_1; } -- cgit v1.2.3