Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyan D. Brooks2011-05-12 16:50:38 -0400
committerRyan D. Brooks2011-05-12 16:50:38 -0400
commit084b8cb450b0563c3d13ee0846c9f26f5e55a491 (patch)
tree63282f95e71f6055a852db1e2b76c1b8ae08c925 /plugins/org.eclipse.osee.framework.skynet.core.test
parent341402d13f806491a4dbdf3461b20510dc006e19 (diff)
downloadorg.eclipse.osee-084b8cb450b0563c3d13ee0846c9f26f5e55a491.tar.gz
org.eclipse.osee-084b8cb450b0563c3d13ee0846c9f26f5e55a491.tar.xz
org.eclipse.osee-084b8cb450b0563c3d13ee0846c9f26f5e55a491.zip
refactor: Replace usage of Branch with IOseeBranch where possible
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core.test')
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java19
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java9
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java12
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java8
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java14
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java6
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java12
8 files changed, 26 insertions, 60 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java
index 5f1f155873..8084875c86 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/Artifact_setAttributeValues.java
@@ -13,19 +13,15 @@ package org.eclipse.osee.framework.skynet.core.artifact;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.junit.Assert.assertTrue;
-
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
import org.junit.AfterClass;
-import org.junit.Assert;
import org.junit.BeforeClass;
/**
@@ -48,10 +44,9 @@ public class Artifact_setAttributeValues {
@org.junit.Test
public void testSetAttributeValues() throws Exception {
- Branch branch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid());
- Assert.assertNotNull(branch);
Artifact artifact =
- ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, branch, getClass().getSimpleName());
+ ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, DemoSawBuilds.SAW_Bld_1,
+ getClass().getSimpleName());
artifact.setAttributeValues(CoreAttributeTypes.StaticId, firstSet);
artifact.persist();
@@ -102,17 +97,13 @@ public class Artifact_setAttributeValues {
}
private Artifact getArtifact() throws Exception {
- Branch branch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid());
- Assert.assertNotNull(branch);
- return ArtifactQuery.getArtifactListFromName(getClass().getSimpleName(), branch, EXCLUDE_DELETED).iterator().next();
+ return ArtifactQuery.getArtifactListFromName(getClass().getSimpleName(), DemoSawBuilds.SAW_Bld_1, EXCLUDE_DELETED).iterator().next();
}
private static void cleanup() throws Exception {
- Branch branch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid());
- Assert.assertNotNull(branch);
Collection<Artifact> arts =
- ArtifactQuery.getArtifactListFromName(Artifact_setAttributeValues.class.getSimpleName(), branch,
- EXCLUDE_DELETED);
+ ArtifactQuery.getArtifactListFromName(Artifact_setAttributeValues.class.getSimpleName(),
+ DemoSawBuilds.SAW_Bld_1, EXCLUDE_DELETED);
new PurgeArtifacts(arts).execute();
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java
index f102ed0af5..ed3ebb89bb 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/BranchStateTest.java
@@ -13,10 +13,8 @@ package org.eclipse.osee.framework.skynet.core.artifact;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
-
import java.util.Arrays;
import java.util.Collection;
-
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.jobs.Job;
@@ -135,8 +133,7 @@ public class BranchStateTest {
assertEquals(BranchState.MODIFIED, workingBranch.getBranchState());
assertTrue(workingBranch.isEditable());
- ConflictManagerExternal conflictManager =
- new ConflictManagerExternal(BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1), workingBranch);
+ ConflictManagerExternal conflictManager = new ConflictManagerExternal(DemoSawBuilds.SAW_Bld_1, workingBranch);
BranchManager.commitBranch(null, conflictManager, true, false);
assertEquals(BranchState.COMMITTED, workingBranch.getBranchState());
@@ -253,8 +250,8 @@ public class BranchStateTest {
Artifact sameArtifact = null;
try {
baseArtifact =
- ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement,
- BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1), "Test Object");
+ ArtifactTypeManager.addArtifact(CoreArtifactTypes.SoftwareRequirement, DemoSawBuilds.SAW_Bld_1,
+ "Test Object");
baseArtifact.setSoleAttributeFromString(CoreAttributeTypes.Annotation, "This is the base annotation");
baseArtifact.persist();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java
index 507904beeb..64af554500 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/NativeArtifactTest.java
@@ -15,14 +15,11 @@ import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.InputStream;
import java.util.Collection;
-
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
import org.eclipse.osee.framework.plugin.core.util.OseeData;
@@ -42,8 +39,7 @@ public class NativeArtifactTest {
@org.junit.Test
public void testNativeArtifact() throws Exception {
- CsvArtifact csvArtifact =
- CsvArtifact.getCsvArtifact(getClass().getSimpleName(), BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1), true);
+ CsvArtifact csvArtifact = CsvArtifact.getCsvArtifact(getClass().getSimpleName(), DemoSawBuilds.SAW_Bld_1, true);
assertNotNull(csvArtifact);
Artifact artifact = csvArtifact.getArtifact();
assertTrue(artifact.isAttributeTypeValid(CoreAttributeTypes.NativeContent));
@@ -88,14 +84,12 @@ public class NativeArtifactTest {
}
private Artifact getNativeArtifact() throws Exception {
- Branch branch = BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1);
- return CsvArtifact.getCsvArtifact(getClass().getSimpleName(), branch, false).getArtifact();
+ return CsvArtifact.getCsvArtifact(getClass().getSimpleName(), DemoSawBuilds.SAW_Bld_1, false).getArtifact();
}
private void cleanup() throws Exception {
- Branch branch = BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1);
Collection<Artifact> arts =
- ArtifactQuery.getArtifactListFromName(getClass().getSimpleName(), branch, EXCLUDE_DELETED);
+ ArtifactQuery.getArtifactListFromName(getClass().getSimpleName(), DemoSawBuilds.SAW_Bld_1, EXCLUDE_DELETED);
new PurgeArtifacts(arts).execute();
}
}
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java
index eb15ef7caa..74c44e80bc 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/PurgeTransactionTest.java
@@ -17,10 +17,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.core.operation.IOperation;
import org.eclipse.osee.framework.core.test.mocks.Asserts;
import org.eclipse.osee.framework.database.core.ConnectionHandler;
@@ -35,7 +35,7 @@ import org.eclipse.osee.support.test.util.TestUtil;
* @author Ryan Schmitt
*/
public class PurgeTransactionTest {
- private Branch branch;
+ private IOseeBranch branch;
Collection<Artifact> softArts;
private SkynetTransaction createTransaction;
private SkynetTransaction modifyTransaction;
@@ -66,7 +66,7 @@ public class PurgeTransactionTest {
}
private void init() throws Exception {
- branch = BranchManager.getBranch(DemoSawBuilds.SAW_Bld_2);
+ branch = DemoSawBuilds.SAW_Bld_2;
preCreateCount = new HashMap<String, Integer>();
preModifyCount = new HashMap<String, Integer>();
postModifyPurgeCount = new HashMap<String, Integer>();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java
index e2fd5b61b0..d3ff6c795e 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/artifact/ReplaceWithAttributeTest.java
@@ -15,13 +15,10 @@ import static org.junit.Assert.assertTrue;
import java.util.Collections;
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.Attribute;
-import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
-import org.junit.Assert;
/**
* @author Jeff C. Phillips
@@ -30,10 +27,9 @@ public class ReplaceWithAttributeTest {
@org.junit.Test
public void testReplaceAttributeVersion() throws Exception {
- Branch branch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid());
- Assert.assertNotNull(branch);
Artifact artifact =
- ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, branch, getClass().getSimpleName());
+ ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, DemoSawBuilds.SAW_Bld_1,
+ getClass().getSimpleName());
artifact.setAttributeValues(CoreAttributeTypes.Name, Collections.singletonList("Name"));
artifact.persist();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java
index 5a981be75a..a927783208 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/relation/CrossBranchLinkTest.java
@@ -11,16 +11,13 @@
package org.eclipse.osee.framework.skynet.core.relation;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
-
import org.eclipse.osee.framework.core.enums.CoreArtifactTypes;
import org.eclipse.osee.framework.core.enums.CoreAttributeTypes;
import org.eclipse.osee.framework.core.enums.CoreRelationTypes;
import org.eclipse.osee.framework.core.exception.OseeCoreException;
-import org.eclipse.osee.framework.core.model.Branch;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
import org.eclipse.osee.framework.skynet.core.artifact.ArtifactTypeManager;
import org.eclipse.osee.framework.skynet.core.artifact.BranchManager;
@@ -57,18 +54,15 @@ public class CrossBranchLinkTest {
artifacts.addAll(ArtifactQuery.getArtifactListFromName(CrossBranchLinkTest.class.getSimpleName() + "%",
BranchManager.getCommonBranch(), EXCLUDE_DELETED));
artifacts.addAll(ArtifactQuery.getArtifactListFromName(CrossBranchLinkTest.class.getSimpleName() + "%",
- BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid()), EXCLUDE_DELETED));
+ DemoSawBuilds.SAW_Bld_1, EXCLUDE_DELETED));
new PurgeArtifacts(artifacts).execute();
TestUtil.sleep(4000);
}
@Test
public void testCrossBranchLink() throws OseeCoreException {
- Branch sawBranch = BranchManager.getBranchByGuid(DemoSawBuilds.SAW_Bld_1.getGuid());
- Assert.assertNotNull(sawBranch);
-
Artifact artifact1 =
- ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, sawBranch,
+ ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, DemoSawBuilds.SAW_Bld_1,
getClass().getSimpleName() + "-1");
artifact1.addAttribute(CoreAttributeTypes.StaticId, CrossBranchLinkTest.class.getSimpleName());
artifact1.persist();
@@ -90,7 +84,7 @@ public class CrossBranchLinkTest {
Assert.assertEquals(artifact1, link.getArtifact());
Artifact artifact2 =
- ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, sawBranch,
+ ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, DemoSawBuilds.SAW_Bld_1,
getClass().getSimpleName() + "-2");
artifact2.addAttribute(CoreAttributeTypes.StaticId, CrossBranchLinkTest.class.getSimpleName());
artifact2.persist();
@@ -98,7 +92,7 @@ public class CrossBranchLinkTest {
CrossBranchLinkManager.addRelation(folderArt, CoreRelationTypes.SupportingInfo_SupportingInfo, artifact2);
Artifact artifact3 =
- ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, sawBranch,
+ ArtifactTypeManager.addArtifact(CoreArtifactTypes.GeneralDocument, DemoSawBuilds.SAW_Bld_1,
getClass().getSimpleName() + "-3");
artifact3.addAttribute(CoreAttributeTypes.StaticId, CrossBranchLinkTest.class.getSimpleName());
artifact3.persist();
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java
index 76b73ec135..b0434824a4 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/util/FrameworkTestUtil.java
@@ -11,7 +11,6 @@
package org.eclipse.osee.framework.skynet.core.util;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -21,7 +20,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.List;
-
import org.eclipse.osee.framework.core.data.IArtifactType;
import org.eclipse.osee.framework.core.data.IOseeBranch;
import org.eclipse.osee.framework.core.enums.BranchArchivedState;
@@ -48,7 +46,7 @@ public class FrameworkTestUtil {
/**
* Creates a simple artifact and adds it to the root artifact default hierarchical relation
*/
- public static Artifact createSimpleArtifact(IArtifactType artifactType, String name, Branch branch) throws OseeCoreException {
+ public static Artifact createSimpleArtifact(IArtifactType artifactType, String name, IOseeBranch branch) throws OseeCoreException {
Artifact softArt = ArtifactTypeManager.addArtifact(artifactType, branch);
softArt.setName(name);
softArt.addAttribute(CoreAttributeTypes.Subsystem, "Electrical");
@@ -57,7 +55,7 @@ public class FrameworkTestUtil {
return softArt;
}
- public static Collection<Artifact> createSimpleArtifacts(IArtifactType artifactType, int numArts, String name, Branch branch) throws OseeCoreException {
+ public static Collection<Artifact> createSimpleArtifacts(IArtifactType artifactType, int numArts, String name, IOseeBranch branch) throws OseeCoreException {
List<Artifact> arts = new ArrayList<Artifact>();
for (int x = 1; x < numArts + 1; x++) {
arts.add(createSimpleArtifact(artifactType, name + " " + x, branch));
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java
index 41834a23aa..553b8875e6 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/CsvArtifactTest.java
@@ -14,11 +14,8 @@ package org.eclipse.osee.framework.skynet.core.utility;
import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
-
import java.util.Collection;
-
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.PurgeArtifacts;
import org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery;
import org.eclipse.osee.support.test.util.DemoSawBuilds;
@@ -39,7 +36,7 @@ public class CsvArtifactTest {
@org.junit.Test
public void testCreateCsvArtifact() throws Exception {
- CsvArtifact csv = CsvArtifact.getCsvArtifact(id, BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1), true);
+ CsvArtifact csv = CsvArtifact.getCsvArtifact(id, DemoSawBuilds.SAW_Bld_1, true);
assertEquals(csv.getCsvData(), "");
csv.getArtifact().setName(id);
csv.setCsvData(csvData);
@@ -48,7 +45,7 @@ public class CsvArtifactTest {
@org.junit.Test
public void testgetCsvArtifactAndAppendData() throws Exception {
- CsvArtifact csvArt = CsvArtifact.getCsvArtifact(id, BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1), false);
+ CsvArtifact csvArt = CsvArtifact.getCsvArtifact(id, DemoSawBuilds.SAW_Bld_1, false);
assertNotNull(csvArt);
assertEquals(csvData, csvArt.getCsvData());
csvArt.appendData(appendData);
@@ -57,7 +54,7 @@ public class CsvArtifactTest {
@org.junit.Test
public void testCsvGetData() throws Exception {
- CsvArtifact csvArt = CsvArtifact.getCsvArtifact(id, BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1), false);
+ CsvArtifact csvArt = CsvArtifact.getCsvArtifact(id, DemoSawBuilds.SAW_Bld_1, false);
assertNotNull(csvArt);
assertEquals(csvData + "\n" + appendData, csvArt.getCsvData());
}
@@ -68,8 +65,7 @@ public class CsvArtifactTest {
}
private void cleanup() throws Exception {
- Collection<Artifact> arts =
- ArtifactQuery.getArtifactListFromName(id, BranchManager.getBranch(DemoSawBuilds.SAW_Bld_1), EXCLUDE_DELETED);
+ Collection<Artifact> arts = ArtifactQuery.getArtifactListFromName(id, DemoSawBuilds.SAW_Bld_1, EXCLUDE_DELETED);
new PurgeArtifacts(arts).execute();
}
}

Back to the top