| author | kwilk | 2012-04-06 17:22:20 (EDT) |
|---|---|---|
| committer | Roberto E. Escobar | 2012-04-06 17:22:20 (EDT) |
| commit | b8926c75e41d949e2ee6a1d6142c760f0643e066 (patch) (side-by-side diff) | |
| tree | 545a98408b7950875d4447cb72305d79a427f355 | |
| parent | bd1ba6260391302aaba0212fd6e3cb0366522d2f (diff) | |
| download | org.eclipse.osee-b8926c75e41d949e2ee6a1d6142c760f0643e066.zip org.eclipse.osee-b8926c75e41d949e2ee6a1d6142c760f0643e066.tar.gz org.eclipse.osee-b8926c75e41d949e2ee6a1d6142c760f0643e066.tar.bz2 | |
refactor: Update ViewWordChangeAndDiffTest to operate on correct branch
Putting back code removed by eariler commit, to address what looks like a
intermittent test failure.
| -rw-r--r-- | plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/cases/ViewWordChangeAndDiffTest.java | 6 |
1 files changed, 5 insertions, 1 deletions
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 55d27d8..64a5498 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; } |

