diff options
Diffstat (limited to 'plugins/org.eclipse.osee.framework.core.model.test')
20 files changed, 107 insertions, 126 deletions
diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java index 52c96d9e022..7b6a2a1dc92 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataQueryTest.java @@ -152,9 +152,8 @@ public class AccessDataQueryTest { new MockArtifact(GUID.create(), "test3", branch, CoreArtifactTypes.Folder, 47); IArtifactType artType = TokenFactory.createArtifactType(0x01L, "Folder"); - AccessDetail<?> specificArtDetail = - MockDataFactory.createAccessDetails(accessArtifact, PermissionEnum.DENY, "", - new Scope().add("very").add("specific")); + AccessDetail<?> specificArtDetail = MockDataFactory.createAccessDetails(accessArtifact, PermissionEnum.DENY, "", + new Scope().add("very").add("specific")); AccessDetail<?> legacyArtDetail = MockDataFactory.createAccessDetails(accessArtifact, PermissionEnum.FULLACCESS, "", Scope.createLegacyScope()); AccessDetail<?> typeDetail = @@ -187,7 +186,8 @@ public class AccessDataQueryTest { AccessData data = new AccessData(); data.add(branchToCheck, new AccessDetail<IOseeBranch>(branchToCheck, PermissionEnum.WRITE, new Scope())); - data.add(artifactToCheck, new AccessDetail<IBasicArtifact<?>>(artifactToCheck, PermissionEnum.WRITE, new Scope())); + data.add(artifactToCheck, + new AccessDetail<IBasicArtifact<?>>(artifactToCheck, PermissionEnum.WRITE, new Scope())); data.add(artifactToCheck, new AccessDetail<IArtifactType>(artifactType, PermissionEnum.WRITE, new Scope())); return new TestObject(artifactToCheck, data); diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java index a73fc7e23cb..47f86fe420b 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDataTest.java @@ -130,12 +130,10 @@ public class AccessDataTest { public void testAccessDetailMerge() throws OseeCoreException { AccessData data = new AccessData(); - AccessDetail<?> detail1 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", - new Scope().add("same_scope")); - AccessDetail<?> detail2 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, "item 2 - write", - new Scope().add("same_scope")); + AccessDetail<?> detail1 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", + new Scope().add("same_scope")); + AccessDetail<?> detail2 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, + "item 2 - write", new Scope().add("same_scope")); data.add(artifactToCheck, detail1); data.add(artifactToCheck, detail2); @@ -152,12 +150,10 @@ public class AccessDataTest { @Test public void testAccessDetailMultipleKeys() throws OseeCoreException { - AccessDetail<?> detail1 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", - new Scope().add("same_scope")); - AccessDetail<?> detail2 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, "item 2 - write", - new Scope().add("same_scope")); + AccessDetail<?> detail1 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", + new Scope().add("same_scope")); + AccessDetail<?> detail2 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, + "item 2 - write", new Scope().add("same_scope")); AccessData data = new AccessData(); data.add(branchToCheck1, detail1); @@ -182,12 +178,10 @@ public class AccessDataTest { @Test public void testAccessDetailMultipleScopeLevels() throws OseeCoreException { - AccessDetail<?> detail1 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", - new Scope().add("more").add("specific").add("scope")); - AccessDetail<?> detail2 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, "item 2 - write", - new Scope().add("less").add("specific")); + AccessDetail<?> detail1 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", + new Scope().add("more").add("specific").add("scope")); + AccessDetail<?> detail2 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, + "item 2 - write", new Scope().add("less").add("specific")); AccessData data = new AccessData(); data.add(branchToCheck1, detail1); @@ -202,15 +196,12 @@ public class AccessDataTest { @Test public void testAccessDetailLegacyScope() throws OseeCoreException { - AccessDetail<?> specificDetail = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", - new Scope().add("more").add("specific").add("scope")); - AccessDetail<?> lessSpecificDetail = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, "item 2 - write", - new Scope().add("less").add("specific")); - AccessDetail<?> legacyDetail = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, "item 2 - write", - Scope.createLegacyScope()); + AccessDetail<?> specificDetail = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, + "item 1 - deny", new Scope().add("more").add("specific").add("scope")); + AccessDetail<?> lessSpecificDetail = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, + "item 2 - write", new Scope().add("less").add("specific")); + AccessDetail<?> legacyDetail = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, + "item 2 - write", Scope.createLegacyScope()); AccessData data = new AccessData(); data.add(branchToCheck1, specificDetail); @@ -227,12 +218,10 @@ public class AccessDataTest { @Test public void testToString() throws OseeCoreException { - AccessDetail<?> detail1 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", - new Scope().add("scope 1")); - AccessDetail<?> detail2 = - MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, "item 2 - write", - new Scope().add("scope 2")); + AccessDetail<?> detail1 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.DENY, "item 1 - deny", + new Scope().add("scope 1")); + AccessDetail<?> detail2 = MockDataFactory.createAccessDetails(relTypeSide1, PermissionEnum.WRITE, + "item 2 - write", new Scope().add("scope 2")); AccessData data = new AccessData(); Assert.assertEquals("accessData []", data.toString()); diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDetailTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDetailTest.java index ab292abb3b1..95a1ace803d 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDetailTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessDetailTest.java @@ -13,9 +13,7 @@ package org.eclipse.osee.framework.core.model.access; import java.util.ArrayList; import java.util.Collection; import org.eclipse.osee.framework.core.enums.PermissionEnum; -import org.eclipse.osee.framework.core.model.access.AccessDetail; import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; -import org.eclipse.osee.framework.core.model.access.Scope; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Strings; import org.junit.Assert; @@ -99,7 +97,8 @@ public class AccessDetailTest { @Test public void testToString() { String expected = - "AccessDetail [permission=" + expPermission + ", scope=" + scope + ", accessObject=" + expAccessObject + ", reason=" + (Strings.isValid(expReason) ? expReason : scope) + "]"; + "AccessDetail [permission=" + expPermission + ", scope=" + scope + ", accessObject=" + expAccessObject + ", reason=" + (Strings.isValid( + expReason) ? expReason : scope) + "]"; Assert.assertEquals(expected, target.toString()); } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessTestSuite.java index 49071170c23..9bc981a860d 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/AccessTestSuite.java @@ -15,7 +15,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({// -AccessDataTest.class, // + AccessDataTest.class, // AccessDataQueryTest.class, // AccessDetailTest.class, // PermissionStatusTest.class, // diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/PermissionStatusTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/PermissionStatusTest.java index 717b749ebc1..2c1b1e7378d 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/PermissionStatusTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/PermissionStatusTest.java @@ -11,7 +11,6 @@ package org.eclipse.osee.framework.core.model.access; 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/access/exp/AccessFilterChainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/exp/AccessFilterChainTest.java index 46f2cf4bbe3..c208d7b8f05 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/exp/AccessFilterChainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/access/exp/AccessFilterChainTest.java @@ -10,16 +10,12 @@ *******************************************************************************/ package org.eclipse.osee.framework.core.model.access.exp; -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; import org.eclipse.osee.framework.core.model.DefaultBasicArtifact; import org.eclipse.osee.framework.core.model.IBasicArtifact; -import org.eclipse.osee.framework.core.model.access.exp.AccessFilterChain; -import org.eclipse.osee.framework.core.model.access.exp.ArtifactAccessFilter; -import org.eclipse.osee.framework.core.model.access.exp.AttributeTypeAccessFilter; -import org.eclipse.osee.framework.core.model.access.exp.BranchAccessFilter; +import org.junit.Assert; import org.junit.Test; /** @@ -67,7 +63,8 @@ public class AccessFilterChainTest { chain.add(attributeTypeAccessFilter); PermissionEnum agrPermission = null; - Assert.assertFalse(chain.doFilter(basicArtifact2, attributeTypeAccessFilter, PermissionEnum.WRITE, agrPermission)); + Assert.assertFalse( + chain.doFilter(basicArtifact2, attributeTypeAccessFilter, PermissionEnum.WRITE, agrPermission)); } @Test diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/CacheTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/CacheTestSuite.java index d331390ec14..28928e25062 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/CacheTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/cache/CacheTestSuite.java @@ -16,7 +16,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({// -ArtifactTypeCacheTest.class, // + ArtifactTypeCacheTest.class, // AttributeTypeCacheTest.class, // RelationTypeCacheTest.class, // OseeEnumTypeCacheTest.class, // diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactSuperTypeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactSuperTypeFieldTest.java index 1e6765426d4..cf455dbca01 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactSuperTypeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactSuperTypeFieldTest.java @@ -14,13 +14,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.junit.Assert; import org.eclipse.osee.framework.core.enums.CoreArtifactTypes; import org.eclipse.osee.framework.core.exception.OseeInvalidInheritanceException; import org.eclipse.osee.framework.core.model.internal.fields.ArtifactSuperTypeField; import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.ArtifactType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactTypeAttributesFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactTypeAttributesFieldTest.java index b23bcfca038..9882c1d076d 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactTypeAttributesFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/ArtifactTypeAttributesFieldTest.java @@ -15,7 +15,6 @@ import java.util.Collection; import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import org.junit.Assert; import org.eclipse.osee.framework.core.data.IOseeBranch; import org.eclipse.osee.framework.core.model.Branch; import org.eclipse.osee.framework.core.model.internal.fields.ArtifactTypeAttributesField; @@ -23,6 +22,7 @@ import org.eclipse.osee.framework.core.model.mocks.MockDataFactory; import org.eclipse.osee.framework.core.model.type.AttributeType; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Compare; +import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java index 1c780f7c510..3cf99d00e9d 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BaseOseeFieldTest.java @@ -78,41 +78,41 @@ public abstract class BaseOseeFieldTest { Collection<Object[]> data = new ArrayList<>(); data.add(new Object[] {// - new OseeFieldTestData<Object>(new OseeField<Object>(), // - null, false, // - new FieldGetSetTestData<Object>(true, "one test", "one test", true), // - new FieldGetSetTestData<Object>(false, "two test", "two test", true), // - new FieldGetSetTestData<Object>(true, "three test", "three test", true)// - )});// + new OseeFieldTestData<Object>(new OseeField<Object>(), // + null, false, // + new FieldGetSetTestData<Object>(true, "one test", "one test", true), // + new FieldGetSetTestData<Object>(false, "two test", "two test", true), // + new FieldGetSetTestData<Object>(true, "three test", "three test", true)// + )});// data.add(new Object[] { // - new OseeFieldTestData<Integer>(new OseeField<Integer>(), // - null, false, // - new FieldGetSetTestData<Integer>(true, 1, 1, true), // - new FieldGetSetTestData<Integer>(false, 5, 5, true), // - new FieldGetSetTestData<Integer>(true, Integer.MIN_VALUE, Integer.MIN_VALUE, true)// - )}); + new OseeFieldTestData<Integer>(new OseeField<Integer>(), // + null, false, // + new FieldGetSetTestData<Integer>(true, 1, 1, true), // + new FieldGetSetTestData<Integer>(false, 5, 5, true), // + new FieldGetSetTestData<Integer>(true, Integer.MIN_VALUE, Integer.MIN_VALUE, true)// + )}); data.add(new Object[] { // - new OseeFieldTestData<Boolean>(new OseeField<Boolean>(), // - null, false, // - new FieldGetSetTestData<Boolean>(true, true, true, true), // - new FieldGetSetTestData<Boolean>(false, true, true, true), // - new FieldGetSetTestData<Boolean>(true, false, false, true),// - new FieldGetSetTestData<Boolean>(false, false, false, true)// - )}); + new OseeFieldTestData<Boolean>(new OseeField<Boolean>(), // + null, false, // + new FieldGetSetTestData<Boolean>(true, true, true, true), // + new FieldGetSetTestData<Boolean>(false, true, true, true), // + new FieldGetSetTestData<Boolean>(true, false, false, true), // + new FieldGetSetTestData<Boolean>(false, false, false, true)// + )}); data.add(new Object[] {new OseeFieldTestData<Object>(new OseeField<Object>("string1"), "string1", true)}); - data.add(new Object[] {new OseeFieldTestData<Integer>(new OseeField<Integer>(Integer.MIN_VALUE), - Integer.MIN_VALUE, true)}); + data.add(new Object[] { + new OseeFieldTestData<Integer>(new OseeField<Integer>(Integer.MIN_VALUE), Integer.MIN_VALUE, true)}); data.add(new Object[] {new OseeFieldTestData<Boolean>(new OseeField<Boolean>(true), true, true)}); data.add(new Object[] {new OseeFieldTestData<Boolean>(new OseeField<Boolean>(false), false, true)}); data.add(new Object[] {// - new OseeFieldTestData<String>(new OseeField<String>("string2"), "string2", true, // - new FieldGetSetTestData<String>(false, "another", "another", true), // - new FieldGetSetTestData<String>(true, "something", "something", true)// - )}); + new OseeFieldTestData<String>(new OseeField<String>("string2"), "string2", true, // + new FieldGetSetTestData<String>(false, "another", "another", true), // + new FieldGetSetTestData<String>(true, "something", "something", true)// + )}); // IOseeTypeFactory factory = new OseeTypeFactory(); // data.add(createAssociatedArtifactTest(factory)); diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BranchAliasesFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BranchAliasesFieldTest.java index 5164ff5173e..28ce455aea1 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BranchAliasesFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/BranchAliasesFieldTest.java @@ -14,9 +14,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import org.junit.Assert; import org.eclipse.osee.framework.core.model.internal.fields.BranchAliasesField; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; +import org.junit.Assert; import org.junit.Test; /** diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestSuite.java index 5e8d27d279e..f7836f2c399 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestSuite.java @@ -15,7 +15,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({// -ArtifactSuperTypeFieldTest.class, // + ArtifactSuperTypeFieldTest.class, // ArtifactTypeAttributesFieldTest.class, // AssociatedArtifactFieldTest.class, // BranchAliasesFieldTest.class, // diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestUtil.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestUtil.java index 865ba0fe3bc..315dff382e6 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestUtil.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/FieldTestUtil.java @@ -12,10 +12,10 @@ package org.eclipse.osee.framework.core.model.fields; import java.util.ArrayList; import java.util.List; -import org.junit.Assert; import org.eclipse.osee.framework.core.model.internal.fields.CollectionField; import org.eclipse.osee.framework.jdk.core.type.OseeCoreException; import org.eclipse.osee.framework.jdk.core.util.Collections; +import org.junit.Assert; /** * @author Roberto E. Escobar diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java index 6087adcc063..9adc16d7794 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/OseeFieldMainTest.java @@ -81,41 +81,41 @@ public class OseeFieldMainTest { Collection<Object[]> data = new ArrayList<>(); data.add(new Object[] {// - new OseeFieldTestData<Object>(new OseeField<Object>(), // - null, false, // - new FieldGetSetTestData<Object>(true, "one test", "one test", true), // - new FieldGetSetTestData<Object>(false, "two test", "two test", true), // - new FieldGetSetTestData<Object>(true, "three test", "three test", true)// - )});// + new OseeFieldTestData<Object>(new OseeField<Object>(), // + null, false, // + new FieldGetSetTestData<Object>(true, "one test", "one test", true), // + new FieldGetSetTestData<Object>(false, "two test", "two test", true), // + new FieldGetSetTestData<Object>(true, "three test", "three test", true)// + )});// data.add(new Object[] { // - new OseeFieldTestData<Integer>(new OseeField<Integer>(), // - null, false, // - new FieldGetSetTestData<Integer>(true, 1, 1, true), // - new FieldGetSetTestData<Integer>(false, 5, 5, true), // - new FieldGetSetTestData<Integer>(true, Integer.MIN_VALUE, Integer.MIN_VALUE, true)// - )}); + new OseeFieldTestData<Integer>(new OseeField<Integer>(), // + null, false, // + new FieldGetSetTestData<Integer>(true, 1, 1, true), // + new FieldGetSetTestData<Integer>(false, 5, 5, true), // + new FieldGetSetTestData<Integer>(true, Integer.MIN_VALUE, Integer.MIN_VALUE, true)// + )}); data.add(new Object[] { // - new OseeFieldTestData<Boolean>(new OseeField<Boolean>(), // - null, false, // - new FieldGetSetTestData<Boolean>(true, true, true, true), // - new FieldGetSetTestData<Boolean>(false, true, true, true), // - new FieldGetSetTestData<Boolean>(true, false, false, true),// - new FieldGetSetTestData<Boolean>(false, false, false, true)// - )}); + new OseeFieldTestData<Boolean>(new OseeField<Boolean>(), // + null, false, // + new FieldGetSetTestData<Boolean>(true, true, true, true), // + new FieldGetSetTestData<Boolean>(false, true, true, true), // + new FieldGetSetTestData<Boolean>(true, false, false, true), // + new FieldGetSetTestData<Boolean>(false, false, false, true)// + )}); data.add(new Object[] {new OseeFieldTestData<Object>(new OseeField<Object>("string1"), "string1", true)}); - data.add(new Object[] {new OseeFieldTestData<Integer>(new OseeField<Integer>(Integer.MIN_VALUE), - Integer.MIN_VALUE, true)}); + data.add(new Object[] { + new OseeFieldTestData<Integer>(new OseeField<Integer>(Integer.MIN_VALUE), Integer.MIN_VALUE, true)}); data.add(new Object[] {new OseeFieldTestData<Boolean>(new OseeField<Boolean>(true), true, true)}); data.add(new Object[] {new OseeFieldTestData<Boolean>(new OseeField<Boolean>(false), false, true)}); data.add(new Object[] {// - new OseeFieldTestData<String>(new OseeField<String>("string2"), "string2", true, // - new FieldGetSetTestData<String>(false, "another", "another", true), // - new FieldGetSetTestData<String>(true, "something", "something", true)// - )}); + new OseeFieldTestData<String>(new OseeField<String>("string2"), "string2", true, // + new FieldGetSetTestData<String>(false, "another", "another", true), // + new FieldGetSetTestData<String>(true, "something", "something", true)// + )}); return data; } } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java index 42ee81f10c8..c359e982a68 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/fields/UniqueIdFieldTest.java @@ -43,9 +43,9 @@ public class UniqueIdFieldTest extends BaseOseeFieldTest { new FieldGetSetTestData<Long>(false, IOseeStorable.UNPERSISTED_VALUE, IOseeStorable.UNPERSISTED_VALUE, true), // new FieldGetSetTestData<Long>(true, IOseeStorable.UNPERSISTED_VALUE, IOseeStorable.UNPERSISTED_VALUE, false), // new FieldGetSetTestData<Long>(false, 100L, 100L, true), // - new FieldGetSetTestData<Long>(false, 200L, 100L, true, OseeStateException.class),// + new FieldGetSetTestData<Long>(false, 200L, 100L, true, OseeStateException.class), // new FieldGetSetTestData<Long>(true, 300L, 100L, false, OseeStateException.class)// - )}); + )}); return data; } } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockArtifact.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockArtifact.java index b735e1c0606..7c0e4e6ffa4 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockArtifact.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockArtifact.java @@ -22,7 +22,7 @@ import org.eclipse.osee.framework.jdk.core.type.NamedIdentity; /** * @author Jeff C. Phillips */ -public class MockArtifact extends NamedIdentity<String> implements IBasicArtifact<Object> { +public class MockArtifact extends NamedIdentity<String>implements IBasicArtifact<Object> { private final Branch branch; private final ArtifactType artifactType; diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java index ba807a729de..412f4fd7817 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/MockDataFactory.java @@ -75,9 +75,8 @@ public final class MockDataFactory { public static AttributeType createAttributeType() throws OseeCoreException { OseeEnumTypeFactory oseeEnumTypeFactory = new OseeEnumTypeFactory(); - AttributeType attributeType = - new AttributeType(random.nextLong(), "name", "baseType", "providerName", ".xml", "", 1, 1, "description", - "tagger", "mediaType"); + AttributeType attributeType = new AttributeType(random.nextLong(), "name", "baseType", "providerName", ".xml", "", + 1, 1, "description", "tagger", "mediaType"); attributeType.setOseeEnumType(oseeEnumTypeFactory.createEnumType(0x01L, "enum type name")); return attributeType; } @@ -102,8 +101,8 @@ public final class MockDataFactory { } MockOseeDataAccessor<Long, Branch> accessor = new MockOseeDataAccessor<>(); BranchCache cache = new BranchCache(accessor, new TransactionCache()); - return new TransactionRecord(value * 47, branchUuid, "comment_" + value, new Date(), value * 37, value * 42, - type, cache); + return new TransactionRecord(value * 47, branchUuid, "comment_" + value, new Date(), value * 37, value * 42, type, + cache); } public static OseeEnumEntry createEnumEntry(int index) { @@ -115,10 +114,9 @@ public final class MockDataFactory { } public static AttributeType createAttributeType(int index, OseeEnumType oseeEnumType) throws OseeCoreException { - AttributeType type = - new AttributeType(random.nextLong(), "attrType_" + index, "baseClass_" + index, "providerId_" + index, - "ext_" + index, "default_" + index, index * 2, index * 7, "description_" + index, "tag_" + index, - "mediaType_" + index); + AttributeType type = new AttributeType(random.nextLong(), "attrType_" + index, "baseClass_" + index, + "providerId_" + index, "ext_" + index, "default_" + index, index * 2, index * 7, "description_" + index, + "tag_" + index, "mediaType_" + index); type.setOseeEnumType(oseeEnumType); return type; } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java index df2ba3edcce..379493b24f3 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/mocks/ModelAsserts.java @@ -136,9 +136,8 @@ public class ModelAsserts { } public static AttributeType createAttributeType(Long guid, String name) { - AttributeType attributeType = - new AttributeType(guid, name, "DummyBase", "DummyProvider", "none", "none", 1, 1, "test data", null, - "mediaType"); + AttributeType attributeType = new AttributeType(guid, name, "DummyBase", "DummyProvider", "none", "none", 1, 1, + "test data", null, "mediaType"); Assert.assertNotNull(attributeType); return attributeType; } @@ -254,9 +253,8 @@ public class ModelAsserts { Collection<IAttributeType> typesNotFound = org.eclipse.osee.framework.jdk.core.util.Collections.setComplement(expectedAttributes, actualTypes); - Assert.assertTrue( - String.format("Artifact [%s] for branch [%s] did not have the following attributes [%s]", - artifactType.getName(), branch.getName(), typesNotFound), typesNotFound.isEmpty()); + Assert.assertTrue(String.format("Artifact [%s] for branch [%s] did not have the following attributes [%s]", + artifactType.getName(), branch.getName(), typesNotFound), typesNotFound.isEmpty()); typesNotFound = org.eclipse.osee.framework.jdk.core.util.Collections.setComplement(actualTypes, expectedAttributes); @@ -285,7 +283,8 @@ public class ModelAsserts { Assert.assertTrue(String.format("ArtifactType [%s] was not allowed", artifactType), result); } else { Assert.assertFalse( - String.format("ArtifactType [%s] was allowed even though it should not have been", artifactType), result); + String.format("ArtifactType [%s] was allowed even though it should not have been", artifactType), + result); } } } diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java index d95c6b8ad0f..27a8a8ab8ad 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/AbstractOseeTypeTest.java @@ -52,8 +52,8 @@ public class AbstractOseeTypeTest<K, T extends AbstractOseeType<K>> { @Test public void testSetGetName() throws Exception { String newName = GUID.create(); - ModelAsserts.assertTypeSetGet(getType(), AbstractOseeType.NAME_FIELD_KEY, "getName", "setName", - getExpectedName(), newName); + ModelAsserts.assertTypeSetGet(getType(), AbstractOseeType.NAME_FIELD_KEY, "getName", "setName", getExpectedName(), + newName); } @Test diff --git a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TypeTestSuite.java b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TypeTestSuite.java index d98c9c9be72..5387ff057fc 100644 --- a/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TypeTestSuite.java +++ b/plugins/org.eclipse.osee.framework.core.model.test/src/org/eclipse/osee/framework/core/model/type/TypeTestSuite.java @@ -15,7 +15,7 @@ import org.junit.runners.Suite; @RunWith(Suite.class) @Suite.SuiteClasses({// -ArtifactTypeTest.class, // + ArtifactTypeTest.class, // AttributeTypeTest.class, // BaseOseeTypeTest.class, // BranchTest.class, // |