diff options
2 files changed, 4 insertions, 10 deletions
diff --git a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/test/blam/TestPlanComplianceReportTest.java b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/test/blam/TestPlanComplianceReportTest.java index 8c40930ea8f..5a920ec82fd 100644 --- a/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/test/blam/TestPlanComplianceReportTest.java +++ b/plugins/org.eclipse.osee.define.test/src/org/eclipse/osee/define/test/blam/TestPlanComplianceReportTest.java @@ -87,7 +87,6 @@ public final class TestPlanComplianceReportTest { resultBuffer.toString().contains(EXPECTED_OSEE_ERROR_STYLE)); Assert.assertTrue("No \"OseeBoldStyle\" string found.", resultBuffer.toString().contains(EXPECTED_OSEE_BOLD_STYLE)); - System.out.println(resultBuffer.toString()); new PurgeArtifacts(dummyArtifactList).execute(); buildTest(1, TestStatusEnum.COMPLETED_WITH_ISSUES_CODE, 0); @@ -95,7 +94,6 @@ public final class TestPlanComplianceReportTest { resultBuffer.toString().contains(EXPECTED_OSEE_ERROR_STYLE)); Assert.assertTrue("No \"OseeBoldStyle\" string found.", resultBuffer.toString().contains(EXPECTED_OSEE_BOLD_STYLE)); - System.out.println(resultBuffer.toString()); new PurgeArtifacts(dummyArtifactList).execute(); buildTest(1, TestStatusEnum.COMPLETED_WITH_ISSUES_RESOLVED_CODE, 0); @@ -103,7 +101,6 @@ public final class TestPlanComplianceReportTest { resultBuffer.toString().contains(EXPECTED_OSEE_ERROR_STYLE)); Assert.assertTrue("No \"OseeBoldStyle\" string found.", resultBuffer.toString().contains(EXPECTED_OSEE_BOLD_STYLE)); - System.out.println(resultBuffer.toString()); new PurgeArtifacts(dummyArtifactList).execute(); } diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java index ec531cc3aa3..6d121fd26bb 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ConflictTestManager.java @@ -118,9 +118,9 @@ public class ConflictTestManager { protected Class<?> clas; protected Branch branch; protected int rootArtifact; - protected String type; + protected IArtifactType type; - protected ArtifactModification(Type itemToChange, Modification modificationToPerform, int rootArtifact, Branch branch, String type, String name) throws OseeCoreException { + protected ArtifactModification(Type itemToChange, Modification modificationToPerform, int rootArtifact, Branch branch, IArtifactType type, String name) throws OseeCoreException { if (!itemToChange.equals(Type.ARTIFACT)) { throw new OseeCoreException("This is the Artifact Constructor"); } @@ -133,23 +133,20 @@ public class ConflictTestManager { } protected ArtifactModification(Type itemToChange, Modification modificationToPerform, Object object, String name, Class<?> clas, String value) throws OseeCoreException { + this(itemToChange, modificationToPerform, -1, null, null, name); if (!itemToChange.equals(Type.ATTRIBUTE)) { throw new OseeCoreException("This is the Attribute Constructor"); } - this.itemToChange = itemToChange; - this.modificationToPerform = modificationToPerform; this.object = object; this.clas = clas; this.value = value; - this.name = name; } protected ArtifactModification(Type itemToChange, Modification modificationToPerform, Object object, Object object2) throws OseeCoreException { + this(itemToChange, modificationToPerform, object, null, null, null); if (!itemToChange.equals(Type.RELATION)) { throw new OseeCoreException("This is the Relation Constructor"); } - this.itemToChange = itemToChange; - this.modificationToPerform = modificationToPerform; this.object = object; this.object2 = object2; } |