diff options
165 files changed, 214 insertions, 297 deletions
diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/AtsLogTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/AtsLogTest.java index 3f1a7ccd2cf..78a441d821b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/AtsLogTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/AtsLogTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.test.artifact.log; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.log.AtsLog; import org.eclipse.osee.ats.artifact.log.ILogStorageProvider; import org.eclipse.osee.ats.artifact.log.LogItem; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/LogItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/LogItemTest.java index cc16c5972b3..2af87581ca9 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/LogItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/log/LogItemTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.test.artifact.log; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.log.LogItem; import org.eclipse.osee.ats.artifact.log.LogType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/AtsNoteTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/AtsNoteTest.java index 72d0aa77971..039677e18a6 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/AtsNoteTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/AtsNoteTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.ats.test.artifact.note; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.note.AtsNote; import org.eclipse.osee.ats.artifact.note.INoteStorageProvider; import org.eclipse.osee.ats.artifact.note.NoteItem; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/NoteItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/NoteItemTest.java index c0b4b33cccd..1d882232a2a 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/NoteItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/artifact/note/NoteItemTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.test.artifact.note; import java.util.Arrays; import java.util.Date; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.NoteType; import org.eclipse.osee.ats.artifact.note.NoteItem; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java index 7fc44daff73..159a23fc824 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ActionableItemsColumnTest.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java index 379bd9bf673..5cfce920209 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/AssigneeColumnTest.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.ActionableItemsColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java index 7035979fda4..a871d3f16c8 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/BranchStatusColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CancelledDateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CancelledDateColumnTest.java index 0f3c21bf864..6a0465fcc05 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CancelledDateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CancelledDateColumnTest.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; import org.eclipse.osee.ats.column.CancelledDateColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java index 5acb8694647..9cf818b4313 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CategoryColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java index 3a3a10fc1a9..e10344d2a2b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ChangeTypeColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CompletedDateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CompletedDateColumnTest.java index 85341a5f31e..38b0cf50f0e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CompletedDateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CompletedDateColumnTest.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; import org.eclipse.osee.ats.column.CompletedDateColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java index 81469ee332b..6fd603ee453 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/CreatedDateColumnTest.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DeadlineColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DeadlineColumnTest.java index e623c59f8bf..e29ca782ebd 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DeadlineColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DeadlineColumnTest.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Calendar; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.DeadlineColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java index 343132b950a..4ef1f8aa43e 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/DescriptionColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java index 38184f3e845..41657e1e326 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/EstimatedHoursColumnTest.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java index c41b8dfec28..03a37310ec7 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/GroupsColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java index d259f902bc5..e5f68f4143d 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/NumberOfTasksAndInWorkTasksColumnsTest.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java index 585d9c4541e..8e652e18873 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/OriginatorColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java index 0cdf813b924..bf1caa0eac1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/ParentStateAndIdColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PeerToPeerReviewColumnsTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PeerToPeerReviewColumnsTest.java index adb2967bb22..9eaa51e500c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PeerToPeerReviewColumnsTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PeerToPeerReviewColumnsTest.java @@ -8,7 +8,7 @@ package org.eclipse.osee.ats.test.column; import java.util.Arrays; import java.util.Date; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.ReviewAuthorColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java index 9241cff8b76..373e502edf1 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/PriorityColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java index ecb65e7267b..beb86e9ed87 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/RelatedToStateColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java index a980012e2f3..6ee50d6aa6b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/StateColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java index 84ca4be09f9..e64c656f659 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TargetedVersionColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java index 6495769196b..9a36ff98604 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TeamColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java index c1ab62b3e59..bf9c068ca59 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/column/TypeColumnTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.column; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.column.AssigneeColumn; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java index c201e237664..377f4d69309 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewDecisionStateItemTest.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.test.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.DecisionReviewArtifact; import org.eclipse.osee.ats.artifact.DecisionReviewState; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java index 754baec6fcc..f7e9b33825b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsDecisionReviewPrepareStateItemTest.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.test.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.DecisionReviewArtifact; import org.eclipse.osee.ats.artifact.DecisionReviewState; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java index ce9fea744a6..71b0278eece 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsForceAssigneesToTeamLeadsStateItemTest.java @@ -9,7 +9,7 @@ import static org.junit.Assert.assertFalse; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.editor.stateItem.AtsForceAssigneesToTeamLeadsStateItem; import org.eclipse.osee.ats.test.util.DemoTestUtil; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsHandleAddReviewRuleStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsHandleAddReviewRuleStateItemTest.java index bb1a4bbab2b..9c080f5fc63 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsHandleAddReviewRuleStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsHandleAddReviewRuleStateItemTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.ats.test.editor.stateItem; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.editor.stateItem.AtsHandleAddReviewRuleStateItem; import org.eclipse.osee.ats.test.AtsTest_Demo_Suite; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java index d49da93ec44..e52ef2ffaa9 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewPrepareStateItemTest.java @@ -6,7 +6,7 @@ package org.eclipse.osee.ats.test.editor.stateItem; import static org.junit.Assert.assertFalse; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.PeerToPeerReviewState; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java index 8b1389eafc1..7d4fcc5ff86 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/editor/stateItem/AtsPeerToPeerReviewReviewStateItemTest.java @@ -7,7 +7,7 @@ package org.eclipse.osee.ats.test.editor.stateItem; import static org.junit.Assert.assertFalse; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.PeerToPeerReviewArtifact; import org.eclipse.osee.ats.artifact.PeerToPeerReviewState; import org.eclipse.osee.ats.editor.stateItem.AtsPeerToPeerReviewReviewStateItem; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java index 4357ef41ea8..67f8adbd827 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/navigate/AtsNavigateItemsToMassEditorTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.test.navigate; import java.util.Collection; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.TeamDefinitionArtifact; import org.eclipse.osee.ats.artifact.VersionArtifact; import org.eclipse.osee.ats.navigate.AtsXNavigateItemLauncher; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsNotifyUsersTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsNotifyUsersTest.java index abecf7ab8fe..1527cefd14c 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsNotifyUsersTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/AtsNotifyUsersTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.util.AtsNotifyUsers; import org.eclipse.osee.ats.util.AtsNotifyUsers.NotifyType; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java index e379f74578e..59a550a1c1b 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/DemoTestUtil.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.logging.Level; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.ActionArtifact; import org.eclipse.osee.ats.artifact.ActionableItemArtifact; import org.eclipse.osee.ats.artifact.TaskArtifact; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/ImportActionsViaSpreadsheetTest.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/ImportActionsViaSpreadsheetTest.java index 08158ef2139..31de69fe214 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/ImportActionsViaSpreadsheetTest.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/ImportActionsViaSpreadsheetTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertFalse; import java.io.File; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.artifact.TeamWorkFlowArtifact; import org.eclipse.osee.ats.config.AtsBulkLoad; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java index 86b68e776e8..039ebbf1bf2 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/NavigateTestUtil.java @@ -13,7 +13,7 @@ package org.eclipse.osee.ats.test.util; import java.util.ArrayList; import java.util.Collection; import java.util.logging.Level; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.internal.AtsPlugin; import org.eclipse.osee.ats.navigate.AtsNavigateViewItems; import org.eclipse.osee.framework.jdk.core.type.HashCollection; diff --git a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/SMATestUtil.java b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/SMATestUtil.java index 71f35c2b130..f313c2922d5 100644 --- a/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/SMATestUtil.java +++ b/plugins/org.eclipse.osee.ats.test/src/org/eclipse/osee/ats/test/util/SMATestUtil.java @@ -12,7 +12,7 @@ package org.eclipse.osee.ats.test.util; import java.util.Arrays; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ats.artifact.AbstractWorkflowArtifact; import org.eclipse.osee.ats.artifact.AtsAttributeTypes; import org.eclipse.osee.ats.internal.workflow.SMAState; diff --git a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF index 3b97bba3e58..65a5c71700e 100644 --- a/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.coverage.test/META-INF/MANIFEST.MF @@ -6,8 +6,8 @@ Bundle-Version: 0.9.9.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.coverage Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit, - org.eclipse.osee.support.test.util +Require-Bundle: org.junit +Import-Package: org.eclipse.osee.support.test.util Export-Package: org.eclipse.osee.coverage.test, org.eclipse.osee.coverage.test.import1, org.eclipse.osee.coverage.test.import2, diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java index 5611151132f..7709eee7740 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoveragePackageImportTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.coverage.test; import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.coverage.event.CoverageEventType; import org.eclipse.osee.coverage.event.CoveragePackageEvent; import org.eclipse.osee.coverage.merge.IMergeItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java index 604785904cf..f5a63f1efe6 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/CoverageParametersTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.coverage.test; import java.util.Arrays; import java.util.Collections; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.coverage.editor.params.CoverageParameters; import org.eclipse.osee.coverage.model.CoverageImport; import org.eclipse.osee.coverage.model.CoverageItem; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java index 1872bf61bf0..458c253df99 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/VectorCastImportTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.coverage.test; import java.io.File; import java.io.IOException; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.coverage.event.CoverageEventType; import org.eclipse.osee.coverage.event.CoveragePackageEvent; import org.eclipse.osee.coverage.internal.Activator; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemTest.java index 13544e01e16..0b91b1576d8 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageItemTest.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.coverage.test.model; -import junit.framework.Assert; import org.eclipse.osee.coverage.model.CoverageItem; import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; @@ -18,6 +17,7 @@ import org.eclipse.osee.coverage.model.CoverageUnit; import org.eclipse.osee.coverage.model.SimpleTestUnitProvider; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -256,7 +256,7 @@ public class CoverageItemTest { */ @Test public void testGetCoveragePercent() { - Assert.assertEquals(100.0, ci1.getCoveragePercent()); + Assert.assertEquals(Double.valueOf(100.0), ci1.getCoveragePercent()); } /** diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java index e9ce2b355fa..cbb0f5abb3c 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageOptionManagerStoreTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.test.model; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.coverage.model.CoverageOption; import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitTest.java index 5ec93bf60dd..b2a532e91ea 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/CoverageUnitTest.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.eclipse.osee.coverage.test.model; -import junit.framework.Assert; import org.eclipse.osee.coverage.model.CoverageItem; import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageUnit; @@ -18,6 +17,7 @@ import org.eclipse.osee.coverage.model.SimpleCoverageUnitFileContentsProvider; import org.eclipse.osee.coverage.test.util.CoverageTestUtil; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.GUID; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -371,10 +371,10 @@ public class CoverageUnitTest { public void testGetCoveragePercentAndStr() { CoverageTestUtil.setAllCoverageMethod(cu, CoverageOptionManager.Not_Covered, true); Assert.assertFalse(cu.isCovered()); - Assert.assertEquals(0.0, cu.getCoveragePercent()); + Assert.assertEquals(Double.valueOf(0.0), cu.getCoveragePercent()); Assert.assertEquals("0% - 0 / 4", cu.getCoveragePercentStr()); CoverageTestUtil.setAllCoverageMethod(cu, CoverageOptionManager.Test_Unit, true); - Assert.assertEquals(100.0, cu.getCoveragePercent()); + Assert.assertEquals(Double.valueOf(100.0), cu.getCoveragePercent()); Assert.assertEquals("100% - 4 / 4", cu.getCoveragePercentStr()); } diff --git a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java index 91638e8c4e7..84f5dd11974 100644 --- a/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java +++ b/plugins/org.eclipse.osee.coverage.test/src/org/eclipse/osee/coverage/test/model/SimpleTestUnitProviderTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.coverage.test.model; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.coverage.model.CoverageItem; import org.eclipse.osee.coverage.model.CoverageOptionManager; import org.eclipse.osee.coverage.model.CoverageOptionManagerDefault; diff --git a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/exchange/transformer/ExchangeTransformProviderTest.java b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/exchange/transformer/ExchangeTransformProviderTest.java index 40d006ac4db..6dec262970b 100644 --- a/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/exchange/transformer/ExchangeTransformProviderTest.java +++ b/plugins/org.eclipse.osee.framework.branch.management.test/src/org/eclipse/osee/framework/branch/management/test/exchange/transformer/ExchangeTransformProviderTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.branch.management.test.exchange.transformer; import java.util.Collection; import java.util.Iterator; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.branch.management.exchange.transform.ExchangeTransformProvider; import org.eclipse.osee.framework.branch.management.exchange.transform.IExchangeTransformProvider; import org.eclipse.osee.framework.branch.management.exchange.transform.IOseeExchangeVersionTransformer; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java index 2f2f65b073c..2f3abd2f63f 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AccessModelInterpreterImplTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.dsl.integration.internal; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.AccessContextId; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.dsl.integration.internal.AccessModelInterpreterImpl; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java index ce382b52091..977e73f4b53 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/ArtifactMatchInterpreterTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.dsl.integration.internal; import java.util.Collection; import java.util.Iterator; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.Identity; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java index 7c82e6e4435..a89ce2475ee 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/AttributeTypeRestrictionHandlerTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.dsl.integration.internal; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/BaseRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/BaseRestrictionHandlerTest.java index 085d09f9d2a..423deaef4fe 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/BaseRestrictionHandlerTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/BaseRestrictionHandlerTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.dsl.integration.internal; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.dsl.integration.RestrictionHandler; import org.eclipse.osee.framework.core.dsl.integration.mocks.DslAsserts; import org.eclipse.osee.framework.core.dsl.integration.mocks.MockModel; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java index 61fb25086a5..7b9824c5ef2 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/internal/RelationTypeRestrictionHandlerTest.java @@ -15,7 +15,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.List; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.dsl.integration.internal.RelationTypeRestrictionHandler; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java index d345bfb1c0d..9bc2b73fd99 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/DslAsserts.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.dsl.integration.mocks; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.dsl.integration.ArtifactDataProvider.ArtifactProxy; import org.eclipse.osee.framework.core.dsl.integration.RestrictionHandler; import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessContext; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java index eaaae27655b..3b72c834661 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/mocks/MockModel.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.dsl.integration.mocks; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.dsl.oseeDsl.AccessContext; import org.eclipse.osee.framework.core.dsl.oseeDsl.ArtifactMatchRestriction; import org.eclipse.osee.framework.core.dsl.oseeDsl.ArtifactTypeRestriction; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java index 866959c8840..f2752b5afa3 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeDslSegmentParserTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.dsl.integration.util; import java.util.Arrays; import java.util.Collection; import java.util.Iterator; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.dsl.integration.util.OseeDslSegmentParser; import org.eclipse.osee.framework.core.dsl.integration.util.OseeDslSegmentParser.OseeDslSegment; diff --git a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java index 14a22362c35..6b1633900d5 100644 --- a/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java +++ b/plugins/org.eclipse.osee.framework.core.dsl.integration.test/src/org/eclipse/osee/framework/core/dsl/integration/util/OseeUtilTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.dsl.integration.util; import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IRelationType; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java index 8841880fb1b..cedf1e3cc5b 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitRequestTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.message.test.data; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.BranchCommitRequest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java index a1dcad29b27..d5daf0b60e5 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/BranchCommitResponseTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.message.test.data; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.BranchCommitResponse; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.core.model.test.mocks.MockDataFactory; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/CacheUpdateRequestTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/CacheUpdateRequestTest.java index f711ea57055..3f12f587c22 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/CacheUpdateRequestTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/CacheUpdateRequestTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.message.test.data; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.OseeCacheEnum; import org.eclipse.osee.framework.core.message.CacheUpdateRequest; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java index c1dc822c714..67df8e93b50 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/PurgeBranchRequestTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.message.test.data; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.PurgeBranchRequest; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchRequestTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchRequestTest.java index 4b9ed26548e..c7e42b2f2e1 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchRequestTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchRequestTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.message.test.data; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreBranches; import org.eclipse.osee.framework.core.message.SearchOptions; import org.eclipse.osee.framework.core.message.SearchRequest; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchResponseTest.java index 13c38faecea..bf1a8c749ec 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchResponseTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/SearchResponseTest.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Iterator; import java.util.Map; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.SearchResponse; import org.eclipse.osee.framework.core.message.SearchResponse.ArtifactMatchMetaData; import org.eclipse.osee.framework.core.message.SearchResponse.AttributeMatchMetaData; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java index d2ece186b9a..776f62b322a 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/data/TransactionCacheUpdateResponseTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.message.test.data; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.message.TransactionCacheUpdateResponse; import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java index b035e72b198..cf739f52679 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/mocks/DataAsserts.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.core.message.test.mocks; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.message.BranchCommitRequest; import org.eclipse.osee.framework.core.message.BranchCommitResponse; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java index 5e0e0980f59..604fae17c1b 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/CacheUpdateRequestTranslatorTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.message.test.translation; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.OseeCacheEnum; import org.eclipse.osee.framework.core.message.CacheUpdateRequest; import org.eclipse.osee.framework.core.message.internal.translation.CacheUpdateRequestTranslator; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java index 25cc542fa31..864390694ec 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DataTranslationServiceFactoryTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.message.test.translation; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreTranslatorId; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.message.internal.DataTranslationServiceFactory; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java index e1b775a28f3..2325bfc72f9 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/DatastoreInitRequestTranslatorTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.message.test.translation; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.DatastoreInitRequest; import org.eclipse.osee.framework.core.message.TableData; import org.eclipse.osee.framework.core.message.internal.translation.DatastoreInitRequestTranslator; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java index abe41484c75..c6f9eede866 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelRequestTranslatorTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.message.test.translation; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.OseeImportModelRequest; import org.eclipse.osee.framework.core.message.internal.translation.OseeImportModelRequestTranslator; import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java index 97bdf7d0539..3d3dd08b9fa 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/OseeImportModelResponseTranslatorTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreTranslatorId; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.message.OseeImportModelResponse; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java index 5a4594d1109..545990ae3c9 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TableDataTranslatorTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.TableData; import org.eclipse.osee.framework.core.message.internal.translation.TableDataTranslator; import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; diff --git a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java index 16de15c8f4d..ed6b3b5d54a 100644 --- a/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java +++ b/plugins/org.eclipse.osee.framework.core.message.test/src/org/eclipse/osee/framework/core/message/test/translation/TransactionCacheUpdateResponseTranslatorTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.message.test.translation; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.message.TransactionCacheUpdateResponse; import org.eclipse.osee.framework.core.message.internal.translation.TransactionCacheUpdateResponseTranslator; import org.eclipse.osee.framework.core.message.test.mocks.DataAsserts; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java index b898db629f1..f57c1be88db 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataQueryTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.model.test.access; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java index 6b7c77509dc..48c9001a601 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDataTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.data.IOseeBranch; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDetailTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDetailTest.java index f8f76760967..35e8192db0f 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDetailTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/AccessDetailTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.model.test.access; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.access.AccessDetail; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionStatusTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionStatusTest.java index fca62ecebaf..f116137b992 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionStatusTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/PermissionStatusTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.model.test.access; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.model.access.PermissionStatus; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/exp/AccessFilterChainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/exp/AccessFilterChainTest.java index 14398675efd..b56509ae629 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/exp/AccessFilterChainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/access/exp/AccessFilterChainTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.model.test.access.exp; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.PermissionEnum; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AbstractOseeCacheTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AbstractOseeCacheTest.java index ed284906d8b..7850170d0e7 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AbstractOseeCacheTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/cache/AbstractOseeCacheTest.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactSuperTypeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactSuperTypeFieldTest.java index 3f7bf0cf08a..efd2f3906b3 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactSuperTypeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactSuperTypeFieldTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeInvalidInheritanceException; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactTypeAttributesFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactTypeAttributesFieldTest.java index a363afcd196..66432874cba 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactTypeAttributesFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/ArtifactTypeAttributesFieldTest.java @@ -15,7 +15,7 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BaseOseeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BaseOseeFieldTest.java index 530e7fcd7be..5e860cda74e 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BaseOseeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BaseOseeFieldTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.model.test.fields; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.OseeField; import org.eclipse.osee.framework.jdk.core.util.Compare; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BranchAliasesFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BranchAliasesFieldTest.java index 5871c3526c8..31784c87773 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BranchAliasesFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/BranchAliasesFieldTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.internal.fields.BranchAliasesField; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/CollectionFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/CollectionFieldTest.java index 53049555506..54b3a0ca70a 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/CollectionFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/CollectionFieldTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.internal.fields.CollectionField; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/EnumEntryFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/EnumEntryFieldTest.java index 0e8da7da802..ef79533628f 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/EnumEntryFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/EnumEntryFieldTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.OseeEnumEntry; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestUtil.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestUtil.java index 82c05bc9fe6..13422fe3d52 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestUtil.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/FieldTestUtil.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.model.test.fields; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.internal.fields.CollectionField; import org.eclipse.osee.framework.jdk.core.util.Collections; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldMainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldMainTest.java index 5dbeb06e2a2..ce2fd8c42f9 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldMainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/fields/OseeFieldMainTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.model.test.fields; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.OseeField; import org.eclipse.osee.framework.jdk.core.util.Compare; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java index 9a9afa10e69..afd2db41b9a 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockDataFactory.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.core.model.test.mocks; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.AccessContextId; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.TokenFactory; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeDataAccessor.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeDataAccessor.java index af3faf164fb..ea49c07f43e 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeDataAccessor.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/MockOseeDataAccessor.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.core.model.test.mocks; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.IOseeStorable; import org.eclipse.osee.framework.core.model.cache.IOseeCache; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/ModelAsserts.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/ModelAsserts.java index 9efd77c7dd5..b40dba497ed 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/ModelAsserts.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/mocks/ModelAsserts.java @@ -15,7 +15,7 @@ import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.BranchState; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AbstractOseeTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AbstractOseeTypeTest.java index 516b4d801e2..0d3e1002ef8 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AbstractOseeTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/AbstractOseeTypeTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.model.test.type; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.StorageState; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/ArtifactTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/ArtifactTypeTest.java index 9425f5bb97b..70f1d9809c7 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/ArtifactTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/test/type/ArtifactTypeTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.model.test.type; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/BuildTypeIdentifierTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/BuildTypeIdentifierTest.java index 6b04e786b6b..21a7f6b11f1 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/BuildTypeIdentifierTest.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/BuildTypeIdentifierTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.server.internal.BuildInfo; import org.eclipse.osee.framework.core.server.internal.BuildTypeIdentifier; diff --git a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java index 93584798eb4..ca93aaad905 100644 --- a/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java +++ b/plugins/org.eclipse.osee.framework.core.server.test/src/org/eclipse/osee/framework/core/server/test/internal/session/SessionFactoryTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.core.server.test.internal.session; import java.util.ArrayList; import java.util.Collection; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.StorageState; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.model.IOseeStorable; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/DeletionFlagTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/DeletionFlagTest.java index 6dd75ac7d10..7c5aaabfdb1 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/DeletionFlagTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/DeletionFlagTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.test.enums; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/PermissionEnumTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/PermissionEnumTest.java index a2d3082a7e1..eee846f835b 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/PermissionEnumTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/enums/PermissionEnumTest.java @@ -18,7 +18,7 @@ import static org.eclipse.osee.framework.core.enums.PermissionEnum.READ; import static org.eclipse.osee.framework.core.enums.PermissionEnum.WRITE; import java.util.ArrayList; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.PermissionEnum; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeCoreExceptionTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeCoreExceptionTest.java index c6e6bcd1c9f..8c445a0127b 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeCoreExceptionTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/OseeCoreExceptionTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.test.exception; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.core.runtime.IStatus; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/TestStringFormatMessages.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/TestStringFormatMessages.java index 395a70aef0d..e9196f56a7d 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/TestStringFormatMessages.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/exception/TestStringFormatMessages.java @@ -16,7 +16,7 @@ import java.util.Date; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.text.tool.Find; import org.eclipse.osee.framework.jdk.core.text.tool.FindResultsIterator; import org.eclipse.osee.framework.jdk.core.util.Lib; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockTrackingHandler.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockTrackingHandler.java index cd62283fd79..c34371917e4 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockTrackingHandler.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/mocks/MockTrackingHandler.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.core.test.mocks; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.util.AbstractTrackingHandler; import org.eclipse.osee.framework.core.util.ServiceBindType; import org.eclipse.osee.framework.jdk.core.type.Pair; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/RenameFilesOperationTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/RenameFilesOperationTest.java index a5dd448d6db..634cf099476 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/RenameFilesOperationTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/ops/RenameFilesOperationTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.core.test.ops; import java.io.File; import java.io.IOException; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.operation.NullOperationLogger; import org.eclipse.osee.framework.core.operation.Operations; diff --git a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractTrackingHandlerTest.java b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractTrackingHandlerTest.java index fd156ae4459..de90078ce32 100644 --- a/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractTrackingHandlerTest.java +++ b/plugins/org.eclipse.osee.framework.core.test/src/org/eclipse/osee/framework/core/test/util/AbstractTrackingHandlerTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.core.test.util; import java.util.Map; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.test.mocks.MockTrackingHandler; import org.eclipse.osee.framework.core.util.AbstractTrackingHandler; import org.eclipse.osee.framework.core.util.ServiceBindType; diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ArtifactJoinQueryTest.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ArtifactJoinQueryTest.java index 5f75a2c9b31..30395f1d2c3 100644 --- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ArtifactJoinQueryTest.java +++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ArtifactJoinQueryTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.sql.Timestamp; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.test.mocks.MockJoinAccessor; diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/CharJoinQueryTest.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/CharJoinQueryTest.java index 21ce892168c..3b7591c65ce 100644 --- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/CharJoinQueryTest.java +++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/CharJoinQueryTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.database.core; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.test.mocks.MockJoinAccessor; diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ExportImportJoinQueryTest.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ExportImportJoinQueryTest.java index aab450e313c..9f18d551ced 100644 --- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ExportImportJoinQueryTest.java +++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/ExportImportJoinQueryTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.sql.Timestamp; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.test.mocks.MockJoinAccessor; diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/IdJoinQueryTest.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/IdJoinQueryTest.java index 62f61fad083..4b563e9bf13 100644 --- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/IdJoinQueryTest.java +++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/IdJoinQueryTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.sql.Timestamp; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.test.mocks.MockJoinAccessor; diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/SearchTagJoinQueryTest.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/SearchTagJoinQueryTest.java index 04f635503f5..43325f95593 100644 --- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/SearchTagJoinQueryTest.java +++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/SearchTagJoinQueryTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.sql.Timestamp; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.test.mocks.MockJoinAccessor; diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TagQueueJoinQueryTest.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TagQueueJoinQueryTest.java index a1e1cb0f4ed..7c11d7cb9a0 100644 --- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TagQueueJoinQueryTest.java +++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TagQueueJoinQueryTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.sql.Timestamp; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.test.mocks.MockJoinAccessor; diff --git a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TransactionJoinQueryTest.java b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TransactionJoinQueryTest.java index ba25a2a3936..53ca0c9375f 100644 --- a/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TransactionJoinQueryTest.java +++ b/plugins/org.eclipse.osee.framework.database.test/src/org/eclipse/osee/framework/database/core/TransactionJoinQueryTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.database.core; import java.sql.Timestamp; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeDataStoreException; import org.eclipse.osee.framework.database.test.mocks.MockJoinAccessor; diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/WordMLNewLineMakerRuleTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/WordMLNewLineMakerRuleTest.java index bc47c6371f7..86f72e42a5c 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/WordMLNewLineMakerRuleTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/rules/WordMLNewLineMakerRuleTest.java @@ -16,12 +16,11 @@ import java.nio.charset.IllegalCharsetNameException; import java.nio.charset.UnsupportedCharsetException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Assert; -import junit.framework.TestCase; import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet; import org.eclipse.osee.framework.jdk.core.text.rules.WordMLNewLineMaker; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; +import org.junit.Assert; import org.junit.Test; /** @@ -31,7 +30,7 @@ import org.junit.Test; * @link:WordMLNewLineMaker * @author Karol M. Wilk */ -public final class WordMLNewLineMakerRuleTest extends TestCase { +public final class WordMLNewLineMakerRuleTest { private final static String INPUT_FILE_NAME = "sample_icd_formatted.xml"; private final static String NEW_WP_INJECTION_FINGERPRINT = diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/UtfReadingRuleTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/UtfReadingRuleTest.java index c27b19a9728..aee16d7782d 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/UtfReadingRuleTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/text/UtfReadingRuleTest.java @@ -18,7 +18,6 @@ import java.io.UnsupportedEncodingException; import java.net.URL; import java.nio.charset.UnsupportedCharsetException; import java.util.Stack; -import junit.framework.TestCase; import org.eclipse.osee.framework.jdk.core.text.Rule; import org.eclipse.osee.framework.jdk.core.text.change.ChangeSet; import org.eclipse.osee.framework.jdk.core.util.Lib; @@ -36,7 +35,7 @@ import org.junit.rules.TemporaryFolder; * * @author Karol M. Wilk */ -public final class UtfReadingRuleTest extends TestCase { +public final class UtfReadingRuleTest { private static final String FILE_INPUT = "utf8_input.xml"; diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CollectionsTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CollectionsTest.java index e7fdfe7d6f8..588bfd5c416 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CollectionsTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/CollectionsTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.jdk.core.test.util; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.Collections; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HashCollectionTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HashCollectionTest.java index 15c866b50f6..9827f9ef484 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HashCollectionTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/HashCollectionTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.jdk.core.test.util; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.type.HashCollection; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/FileWatcherTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/FileWatcherTest.java index ac56c6cbad8..364a8f6c664 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/FileWatcherTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/FileWatcherTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.jdk.core.test.util.io; import java.io.File; import java.util.Collection; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.test.mock.MockFileWatcherListener; import org.eclipse.osee.framework.jdk.core.util.io.FileChangeEvent; import org.eclipse.osee.framework.jdk.core.util.io.FileChangeType; diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/ExcelXmlWriterTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/ExcelXmlWriterTest.java index c5fa97d54f8..11bb1508d3d 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/ExcelXmlWriterTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/io/xml/ExcelXmlWriterTest.java @@ -14,7 +14,7 @@ import java.io.IOException; import java.io.StringWriter; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.io.xml.ExcelXmlWriter; import org.eclipse.osee.framework.jdk.core.util.io.xml.ISheetWriter; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/JAXPTest.java b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/JAXPTest.java index 98a789cd5f7..3169b202f82 100644 --- a/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/JAXPTest.java +++ b/plugins/org.eclipse.osee.framework.jdk.core.test/src/org/eclipse/osee/framework/jdk/core/test/util/xml/JAXPTest.java @@ -19,7 +19,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.xml.Jaxp; import org.junit.Test; import org.w3c.dom.Document; diff --git a/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF index ba893798f3a..af63bc61f92 100644 --- a/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.messaging.event.res.test/META-INF/MANIFEST.MF @@ -6,9 +6,7 @@ Bundle-Version: 0.9.9.qualifier Bundle-Vendor: Eclipse Open System Engineering Environment Fragment-Host: org.eclipse.osee.framework.messaging.event.res Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit, - org.eclipse.osee.support.test.util, - org.eclipse.osee.framework.core +Require-Bundle: org.junit Import-Package: org.eclipse.osee.framework.core.client, org.eclipse.osee.framework.logging Export-Package: org.eclipse.osee.framework.messaging.event.res.test diff --git a/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF index e610821b2ed..ed1ac34198c 100644 --- a/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.messaging.test/META-INF/MANIFEST.MF @@ -4,8 +4,7 @@ Bundle-Name: OSEE Messaging Test Fragment Bundle-SymbolicName: org.eclipse.osee.framework.messaging.test;singleton:=true Bundle-Version: 0.9.9.qualifier Fragment-Host: org.eclipse.osee.framework.messaging;bundle-version="0.9.0.qualifier" -Require-Bundle: org.junit, - org.eclipse.osee.framework.jdk.core +Require-Bundle: org.junit Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.framework.messaging.test/src/org/eclipse/osee/framework/messaging/services/internal/TestMessageServices.java b/plugins/org.eclipse.osee.framework.messaging.test/src/org/eclipse/osee/framework/messaging/services/internal/TestMessageServices.java index 3b7b3365200..9ae5f9a3b27 100644 --- a/plugins/org.eclipse.osee.framework.messaging.test/src/org/eclipse/osee/framework/messaging/services/internal/TestMessageServices.java +++ b/plugins/org.eclipse.osee.framework.messaging.test/src/org/eclipse/osee/framework/messaging/services/internal/TestMessageServices.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.logging.Level; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.messaging.ConnectionNode; diff --git a/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/attribute/AttributeDataTest.java b/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/attribute/AttributeDataTest.java index b2be6da80c5..ce943ea6e7b 100644 --- a/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/attribute/AttributeDataTest.java +++ b/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/attribute/AttributeDataTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.search.engine.test.attribute; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.search.engine.attribute.AttributeData; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/mocks/EngineAsserts.java b/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/mocks/EngineAsserts.java index 9abdd1e113f..cd074256eaa 100644 --- a/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/mocks/EngineAsserts.java +++ b/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/mocks/EngineAsserts.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.search.engine.test.mocks; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.type.MatchLocation; import org.eclipse.osee.framework.jdk.core.type.Pair; import org.eclipse.osee.framework.search.engine.attribute.AttributeData; diff --git a/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/utility/SearchTagQueryBuilderTest.java b/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/utility/SearchTagQueryBuilderTest.java index 2307eff67d0..fbe3bb9c09b 100644 --- a/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/utility/SearchTagQueryBuilderTest.java +++ b/plugins/org.eclipse.osee.framework.search.engine.test/src/org/eclipse/osee/framework/search/engine/test/utility/SearchTagQueryBuilderTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.search.engine.test.utility; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.search.engine.utility.SearchTagQueryBuilder; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF index b4ca171938b..be154a49bd3 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/META-INF/MANIFEST.MF @@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.osee.framework.skynet.core.test;singleton:=true Bundle-Version: 0.9.9.qualifier Fragment-Host: org.eclipse.osee.framework.skynet.core Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.junit, - org.eclipse.osee.support.test.util +Require-Bundle: org.junit Export-Package: org.eclipse.osee.framework.skynet.core.test, org.eclipse.osee.framework.skynet.core.test.branch, org.eclipse.osee.framework.skynet.core.test.cases, @@ -23,5 +22,6 @@ Import-Package: org.apache.commons.lang;version="2.4.0", org.eclipse.osee.framework.core.model.test.mocks, org.eclipse.osee.framework.core.test.mocks, org.eclipse.osee.framework.jdk.core.util, - org.eclipse.osee.framework.skynet.core.event + org.eclipse.osee.framework.skynet.core.event, + org.eclipse.osee.support.test.util Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java index bc249615d43..86f805bafb7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/FrameworkCore_Production_Suite.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.test; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryPerformanceTests; import org.eclipse.osee.framework.skynet.core.test.cases.ArtifactQueryTestProduction; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchManagerTest.java index 47bb1f38f1a..d61a82bba3c 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/branch/BranchManagerTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.branch; import static org.junit.Assert.assertFalse; import java.util.Arrays; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.skynet.core.UserManager; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactLoaderTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactLoaderTest.java index e8a5f2a55ff..131b303f318 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactLoaderTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactLoaderTest.java @@ -21,7 +21,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.exception.OseeStateException; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java index b1dcd3f60ed..b23da3ae492 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactQueryTestDemo.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.test.cases; import static org.eclipse.osee.framework.core.enums.DeletionFlag.INCLUDE_DELETED; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java index 787e5f45367..57c37a72000 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/ArtifactTypeInheritanceTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.test.cases; import java.util.Collection; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IAttributeType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreBranches; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_getLastModified.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_getLastModified.java index dfa7fb3f2be..bda59fd4bb3 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_getLastModified.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_getLastModified.java @@ -14,7 +14,7 @@ package org.eclipse.osee.framework.skynet.core.test.cases; import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED; import java.util.Collection; import java.util.Date; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.SystemUser; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java index c74fa21121f..02d35ad1301 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/Artifact_setAttributeValues.java @@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.model.Branch; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java index 92223d7b608..742874a98de 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/BranchStateTest.java @@ -15,7 +15,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import java.util.Arrays; import java.util.Collection; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.jobs.Job; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeLinkParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeLinkParserTest.java index 1ef9956ce2d..c73216b7ca3 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeLinkParserTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/OseeLinkParserTest.java @@ -11,7 +11,7 @@ package org.eclipse.osee.framework.skynet.core.test.cases; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.skynet.core.linking.OseeLinkParser; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/TransactionManagerTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/TransactionManagerTest.java index 622f1324231..6db39f9f624 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/TransactionManagerTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/cases/TransactionManagerTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.cases; import static org.junit.Assert.assertFalse; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.model.TransactionRecord; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java index 32e15d2f865..bee74098ac5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventFiltersTest.java @@ -13,7 +13,7 @@ package org.eclipse.osee.framework.skynet.core.test.event; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventTest.java index 176cefa2a2a..408cc391df5 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/ArtifactEventTest.java @@ -15,7 +15,7 @@ import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IRelationType; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventFiltersTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventFiltersTest.java index 4f98d1fc2ea..4639a2468fc 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventFiltersTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventFiltersTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.event; import java.util.Arrays; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; import org.eclipse.osee.framework.messaging.event.skynet.event.NetworkSender; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java index 58cac0177d5..b3a9f126c78 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/BranchEventTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.logging.Level; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.data.TokenFactory; import org.eclipse.osee.framework.core.enums.BranchArchivedState; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidArtifactTest.java index 354a91796bd..47294c816d1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidArtifactTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.event; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact; import org.eclipse.osee.framework.core.model.event.IBasicGuidArtifact; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidRelationTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidRelationTest.java index 5782ecad245..eebb7219f5b 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidRelationTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventBasicGuidRelationTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.event; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.model.event.DefaultBasicGuidArtifact; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidRelation; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventChangeTypeBasicGuidArtifactTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventChangeTypeBasicGuidArtifactTest.java index 8a60e94cb4b..899a169a06a 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventChangeTypeBasicGuidArtifactTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/event/EventChangeTypeBasicGuidArtifactTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.event; import java.util.HashSet; import java.util.Set; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.skynet.core.event.model.EventBasicGuidArtifact; import org.eclipse.osee.framework.skynet.core.event.model.EventChangeTypeBasicGuidArtifact; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ArtifactExtractorTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ArtifactExtractorTest.java index da8fe71a205..0c44ef88b92 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ArtifactExtractorTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/ArtifactExtractorTest.java @@ -18,7 +18,7 @@ import java.net.URL; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.type.PropertyStore; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactUtil.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactUtil.java index c41b3aa6f0d..12b8bc3cfdd 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactUtil.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/RoughArtifactUtil.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.importing; import java.net.URL; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.GUID; import org.eclipse.osee.framework.jdk.core.util.HumanReadableId; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/OutlineResolutionAndNumberTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/OutlineResolutionAndNumberTest.java index ffe5a5da372..a9f8f9d6b22 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/OutlineResolutionAndNumberTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/OutlineResolutionAndNumberTest.java @@ -10,15 +10,14 @@ *******************************************************************************/ package org.eclipse.osee.framework.skynet.core.test.importing.parsers; -import junit.framework.Assert; -import junit.framework.TestCase; import org.eclipse.osee.framework.skynet.core.importing.parsers.OutlineResolution; +import org.junit.Assert; import org.junit.Test; /** * @author Karol M. Wilk */ -public final class OutlineResolutionAndNumberTest extends TestCase { +public final class OutlineResolutionAndNumberTest { private static final String LAST_OUTLINE_NUMBER = "3.1.1.2.1.7"; /* realistic outline number */ private final OutlineResolution outlineResolution = new OutlineResolution(); diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java index 40a98895fbd..7225fa91107 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMLExtractorDelegateTableOfContentsTest.java @@ -14,7 +14,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.operation.OperationLogger; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.skynet.core.importing.parsers.WordOutlineExtractorDelegate; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMlResolutionGuiTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMlResolutionGuiTest.java index 2ad59716d9e..994f2df2f11 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMlResolutionGuiTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordMlResolutionGuiTest.java @@ -14,7 +14,7 @@ import java.io.IOException; import java.io.InputStream; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.eclipse.osee.framework.skynet.core.importing.RoughArtifact; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordOutlineTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordOutlineTest.java index a683bfd4c49..cba63ce02b1 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordOutlineTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/importing/parsers/WordOutlineTest.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.jdk.core.util.ReservedCharacters; import org.eclipse.osee.framework.jdk.core.util.Strings; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchLinkTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchLinkTest.java index 8d94138f56b..21923316030 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchLinkTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/CrossBranchLinkTest.java @@ -14,7 +14,7 @@ import static org.eclipse.osee.framework.core.enums.DeletionFlag.EXCLUDE_DELETED import java.util.ArrayList; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.CoreAttributeTypes; import org.eclipse.osee.framework.core.enums.CoreRelationTypes; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java index 1e5c1ddc917..b5d1ee28870 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationCacheTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.skynet.core.test.relation; import java.util.ArrayList; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.enums.DeletionFlag; import org.eclipse.osee.framework.core.enums.ModificationType; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java index 1fdc5088c59..353161eb464 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/RelationTypeSideSorterTest.java @@ -20,7 +20,7 @@ import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Random; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IArtifactType; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.data.IRelationType; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderParserTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderParserTest.java index 2b148df91c2..e1f60af75a7 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderParserTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/order/RelationOrderParserTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map.Entry; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.RelationSide; import org.eclipse.osee.framework.core.exception.OseeArgumentException; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java index a187e948885..eca54c709e8 100644 --- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java +++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/test/relation/sorters/RelationSorterTest.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.data.IRelationSorterId; import org.eclipse.osee.framework.core.enums.RelationOrderBaseTypes; import org.eclipse.osee.framework.jdk.core.util.GUID; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java index b4b7f4bcdca..6634ec67f2b 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/renderer/RenderingUtilTest.java @@ -12,7 +12,7 @@ package org.eclipse.osee.framework.ui.skynet.test.renderer; import java.io.UnsupportedEncodingException; import java.net.URLEncoder; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.framework.core.enums.BranchState; import org.eclipse.osee.framework.core.enums.BranchType; import org.eclipse.osee.framework.core.exception.OseeCoreException; diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/util/enumeration/AbstractEnumerationTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/util/enumeration/AbstractEnumerationTest.java index a0038f42e2e..8d2f35955b9 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/util/enumeration/AbstractEnumerationTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/util/enumeration/AbstractEnumerationTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.framework.ui.skynet.test.util.enumeration; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/widgets/workflow/WorkPageAdapterTest.java b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/widgets/workflow/WorkPageAdapterTest.java index fc77940cca1..44fb9562eec 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/widgets/workflow/WorkPageAdapterTest.java +++ b/plugins/org.eclipse.osee.framework.ui.skynet.test/src/org/eclipse/osee/framework/ui/skynet/test/widgets/workflow/WorkPageAdapterTest.java @@ -5,7 +5,7 @@ */ package org.eclipse.osee.framework.ui.skynet.test.widgets.workflow; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF index 7a371d7538c..eeb0ea418cc 100644 --- a/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.framework.ui.skynet/META-INF/MANIFEST.MF @@ -33,7 +33,6 @@ Require-Bundle: javax.mail.glassfish, org.eclipse.osee.framework.ui.ws, org.eclipse.osee.framework.help.ui;resolution:=optional, org.eclipse.osee.framework.access, - org.junit, org.eclipse.core.filesystem Bundle-ActivationPolicy: lazy Bundle-Vendor: Eclipse Open System Engineering Environment diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/ElementTestSuite.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/ElementTestSuite.java index 598777b326e..4752a31e8bb 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/ElementTestSuite.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/ElementTestSuite.java @@ -26,5 +26,5 @@ Float32ElementTest.class,// StringElementTest.class,// }) public class ElementTestSuite { - + // Test Suite } diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float32ElementTest.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float32ElementTest.java index 3ebde3e56a7..b19bbf859b0 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float32ElementTest.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float32ElementTest.java @@ -11,10 +11,10 @@ package org.eclipse.osee.ote.message.test.element; import java.util.Random; -import junit.framework.Assert; import org.eclipse.osee.ote.message.data.HeaderData; import org.eclipse.osee.ote.message.data.MemoryResource; import org.eclipse.osee.ote.message.elements.Float32Element; +import org.junit.Assert; import org.junit.Test; public class Float32ElementTest { @@ -55,11 +55,9 @@ public class Float32ElementTest { Float32Element el = e[i]; el.setValue(val); expectedVals[i] = val; - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - expectedVals[i], el.getValue()); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + Double.valueOf(expectedVals[i]), el.getValue()); } } @@ -69,11 +67,9 @@ public class Float32ElementTest { Float32Element el = e[i]; el.setValue(val); expectedVals[i] = val; - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - Double.toHexString(expectedVals[i]), Double.toHexString(el.getValue())); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + Double.toHexString(expectedVals[i]), Double.toHexString(el.getValue())); } } diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float64ElementTest.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float64ElementTest.java index 395b5dd8f4c..a4c04373436 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float64ElementTest.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/Float64ElementTest.java @@ -11,10 +11,10 @@ package org.eclipse.osee.ote.message.test.element; import java.util.Random; -import junit.framework.Assert; import org.eclipse.osee.ote.message.data.HeaderData; import org.eclipse.osee.ote.message.data.MemoryResource; import org.eclipse.osee.ote.message.elements.Float64Element; +import org.junit.Assert; import org.junit.Test; public class Float64ElementTest { @@ -51,12 +51,9 @@ public class Float64ElementTest { Float64Element el = e[i]; el.setValue(val); expectedVals[i] = val; - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - expectedVals[i], el.getValue()); - } - + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + (Double) expectedVals[i], el.getValue()); } } @@ -66,29 +63,23 @@ public class Float64ElementTest { Float64Element el = e[i]; el.setValue(val); expectedVals[i] = val; - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - Double.toHexString(expectedVals[i]), Double.toHexString(el.getValue())); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + Double.toHexString(expectedVals[i]), Double.toHexString(el.getValue())); } } private void check(Float64Element[] e, double[] expectedVals, int length) { for (int i = 0; i < length; i++) { Float64Element el = e[i]; - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("corruption detect on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - expectedVals[i], e[i].getValue()); - } + Assert.assertEquals( + String.format("corruption detect on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + (Double) expectedVals[i], e[i].getValue()); String v = Double.toString(expectedVals[i]); - if (!el.valueOf().equals(v)) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), v, - el.valueOf()); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), v, + el.valueOf()); } } } diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/IntegerElementTest.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/IntegerElementTest.java index 49148662eba..f1b50227c6b 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/IntegerElementTest.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/IntegerElementTest.java @@ -11,10 +11,10 @@ package org.eclipse.osee.ote.message.test.element; import java.util.Random; -import junit.framework.Assert; import org.eclipse.osee.ote.message.data.HeaderData; import org.eclipse.osee.ote.message.data.MemoryResource; import org.eclipse.osee.ote.message.elements.IntegerElement; +import org.junit.Assert; import org.junit.Test; public class IntegerElementTest { @@ -233,11 +233,9 @@ public class IntegerElementTest { } else { expectedVals[i] = val; } - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - expectedVals[i], el.getValue()); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + (Integer) expectedVals[i], el.getValue()); } } @@ -252,22 +250,18 @@ public class IntegerElementTest { } else { expectedVals[i] = val; } - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - Long.toHexString(expectedVals[i]), Long.toHexString(el.getValue())); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + Long.toHexString(expectedVals[i]), Long.toHexString(el.getValue())); } } private void check(IntegerElement[] e, int[] expectedVals, int length) { for (int i = 0; i < length; i++) { IntegerElement el = e[i]; - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("corruption detect on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - expectedVals[i], e[i].getValue()); - } + Assert.assertEquals( + String.format("corruption detect on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + (Integer) expectedVals[i], el.getValue()); } } } diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/LongIntegerElementTest.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/LongIntegerElementTest.java index b483b0fea59..0bce23c311b 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/LongIntegerElementTest.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/LongIntegerElementTest.java @@ -11,10 +11,10 @@ package org.eclipse.osee.ote.message.test.element; import java.util.Random; -import junit.framework.Assert; import org.eclipse.osee.ote.message.data.HeaderData; import org.eclipse.osee.ote.message.data.MemoryResource; import org.eclipse.osee.ote.message.elements.LongIntegerElement; +import org.junit.Assert; import org.junit.Test; public class LongIntegerElementTest { @@ -186,11 +186,9 @@ public class LongIntegerElementTest { } else { expectedVals[i] = val; } - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - Long.toHexString(expectedVals[i]), Long.toHexString(el.getValue())); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + Long.toHexString(expectedVals[i]), Long.toHexString(el.getValue())); } } @@ -205,22 +203,18 @@ public class LongIntegerElementTest { } else { expectedVals[i] = val; } - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - expectedVals[i], el.getValue()); - } + Assert.assertEquals( + String.format("set/get fail on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + (Long) expectedVals[i], el.getValue()); } } private void check(LongIntegerElement[] e, long[] expectedVals, int length) { for (int i = 0; i < length; i++) { LongIntegerElement el = e[i]; - if (el.getValue() != expectedVals[i]) { - Assert.failNotEquals( - String.format("corruption detect on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), - expectedVals[i], e[i].getValue()); - } + Assert.assertEquals( + String.format("corruption detect on %s: msb=%d, lsb=%d", el.getName(), el.getMsb(), el.getLsb()), + (Long) expectedVals[i], e[i].getValue()); } } diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/SignedInteger16ElementTest.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/SignedInteger16ElementTest.java index a2193aa66ef..35ec935b288 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/SignedInteger16ElementTest.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/SignedInteger16ElementTest.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.test.element; -import junit.framework.Assert; import org.eclipse.osee.ote.message.data.HeaderData; import org.eclipse.osee.ote.message.data.MemoryResource; import org.eclipse.osee.ote.message.elements.SignedInteger16Element; +import org.junit.Assert; import org.junit.Test; public class SignedInteger16ElementTest { @@ -59,10 +59,8 @@ public class SignedInteger16ElementTest { } private void check(SignedInteger16Element e, int expectedVals) { - if (e.getValue() != expectedVals) { - Assert.failNotEquals( - String.format("corruption detect on %s: msb=%d, lsb=%d", e.getName(), e.getMsb(), e.getLsb()), - expectedVals, e.getValue()); - } + Assert.assertEquals( + String.format("corruption detect on %s: msb=%d, lsb=%d", e.getName(), e.getMsb(), e.getLsb()), + (Integer) expectedVals, e.getValue()); } } diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/StringElementTest.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/StringElementTest.java index c074719f835..198ead03623 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/StringElementTest.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/element/StringElementTest.java @@ -10,10 +10,10 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.test.element; -import junit.framework.Assert; import org.eclipse.osee.ote.message.data.HeaderData; import org.eclipse.osee.ote.message.data.MemoryResource; import org.eclipse.osee.ote.message.elements.StringElement; +import org.junit.Assert; import org.junit.Test; public class StringElementTest { @@ -128,13 +128,13 @@ public class StringElementTest { private void check(StringElement elem, String value) { if (!elem.getValue().equals(value)) { - Assert.failNotEquals(elem.getName(), value, elem.getValue()); + Assert.assertEquals(elem.getName(), value, elem.getValue()); } } private void checkEmpty(StringElement elem) { if (!elem.isEmpty()) { - Assert.failNotEquals(elem.getName(), "rmpty", "not empty"); + Assert.assertEquals(elem.getName(), "rmpty", "not empty"); } } } diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/mock/UnitTestSupport.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/mock/UnitTestSupport.java index 6e2aa9d5767..01c13966e3d 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/mock/UnitTestSupport.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/mock/UnitTestSupport.java @@ -15,7 +15,7 @@ import java.util.concurrent.CancellationException; import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ote.core.TestException; import org.eclipse.osee.ote.core.environment.EnvironmentTask; import org.eclipse.osee.ote.core.testPoint.CheckGroup; diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/other/TestStringOperations.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/other/TestStringOperations.java index b71461b85ed..6492d7a6450 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/other/TestStringOperations.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/other/TestStringOperations.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.test.other; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ote.message.test.mock.TestMessage; import org.eclipse.osee.ote.message.test.mock.UnitTestSupport; import org.junit.After; diff --git a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/recordMap/RecordMapTest.java b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/recordMap/RecordMapTest.java index 8024a471455..dc2f1273632 100644 --- a/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/recordMap/RecordMapTest.java +++ b/plugins/org.eclipse.osee.ote.message.test/src/org/eclipse/osee/ote/message/test/recordMap/RecordMapTest.java @@ -10,7 +10,7 @@ *******************************************************************************/ package org.eclipse.osee.ote.message.test.recordMap; -import junit.framework.Assert; +import org.junit.Assert; import org.eclipse.osee.ote.message.test.mock.TestMessage; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF index dfc312f4aa0..ca56e9bc775 100644 --- a/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.osee.support.test.util/META-INF/MANIFEST.MF @@ -1,9 +1,8 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Test Support Util Plug-in -Bundle-SymbolicName: org.eclipse.osee.support.test.util;singleton:=true +Bundle-SymbolicName: org.eclipse.osee.support.test.util Bundle-Version: 0.9.9.qualifier -Bundle-Activator: org.eclipse.osee.support.test.util.Activator Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.osee.support.test.util diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/Activator.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/Activator.java deleted file mode 100644 index ce2d5ed73b7..00000000000 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/Activator.java +++ /dev/null @@ -1,29 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2004, 2007 Boeing. - * All rights reserved. This program and the accompanying materials - * are made available under the terms of the Eclipse Public License v1.0 - * which accompanies this distribution, and is available at - * http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Boeing - initial API and implementation - *******************************************************************************/ -package org.eclipse.osee.support.test.util; - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * The activator class controls the plug-in life cycle - */ -public class Activator implements BundleActivator { - public static final String PLUGIN_ID = "org.eclipse.osee.support.test.demo"; - - @Override - public void start(BundleContext context) throws Exception { - } - - @Override - public void stop(BundleContext context) throws Exception { - } -} diff --git a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java index 81901b559ee..8c9297853d0 100644 --- a/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java +++ b/plugins/org.eclipse.osee.support.test.util/src/org/eclipse/osee/support/test/util/TestUtil.java @@ -14,14 +14,15 @@ import java.util.Arrays; import java.util.Collection; import java.util.Map; import java.util.logging.Level; -import junit.framework.Assert; import org.eclipse.osee.framework.core.client.ClientSessionManager; import org.eclipse.osee.framework.core.exception.OseeCoreException; import org.eclipse.osee.framework.core.exception.OseeStateException; import org.eclipse.osee.framework.database.core.OseeInfo; +import org.eclipse.osee.framework.jdk.core.util.Lib; import org.eclipse.osee.framework.logging.IHealthStatus; import org.eclipse.osee.framework.logging.OseeLog; import org.eclipse.osee.framework.logging.SevereLoggingMonitor; +import org.junit.Assert; /** * @author Donald G. Dunne @@ -103,9 +104,7 @@ public class TestUtil { continue; } if (status.getException() != null) { - StringBuilder sb = new StringBuilder(); - exceptionToString(status.getException(), sb); - System.err.println("SevereLogging Exception: " + sb.toString()); + System.err.println("SevereLogging Exception: " + Lib.exceptionToString(status.getException())); } else { System.err.println("SevereLogging Exception: " + status.getMessage()); } @@ -119,24 +118,6 @@ public class TestUtil { } } - private static void exceptionToString(Throwable ex, StringBuilder sb) { - if (ex == null) { - sb.append("Exception == null; can't display stack"); - return; - } - sb.append(ex.getMessage() + "\n"); - StackTraceElement st[] = ex.getStackTrace(); - for (int i = 0; i < st.length; i++) { - StackTraceElement ste = st[i]; - sb.append(" at " + ste.toString() + "\n"); - } - Throwable cause = ex.getCause(); - if (cause != null) { - sb.append(" caused by "); - exceptionToString(cause, sb); - } - } - public static void checkThatIncreased(Map<String, Integer> prevCount, Map<String, Integer> postCount) { for (String name : prevCount.keySet()) { String incStr = postCount.get(name) > prevCount.get(name) ? "Increased" : "ERROR, Not Increased"; |