From 8b63ffb9cebad8b59826618171b7f849c1c54b26 Mon Sep 17 00:00:00 2001 From: Francois Chouinard Date: Thu, 17 May 2012 10:23:34 -0400 Subject: [PATCH] Fix some Sonar findings in TmfEvent --- .../tmf/core/tests/event/TmfEventFieldTest.java | 8 ++++---- .../tmf/core/tests/event/TmfEventTypeManagerTest.java | 4 ++-- .../linuxtools/tmf/core/tests/event/TmfEventTypeTest.java | 2 +- .../eclipse/linuxtools/tmf/core/event/TmfEventField.java | 2 +- .../eclipse/linuxtools/tmf/core/event/TmfEventType.java | 2 +- .../linuxtools/tmf/core/event/TmfEventTypeManager.java | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java index c710ee881c..9c408e5299 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventFieldTest.java @@ -79,7 +79,7 @@ public class TmfEventFieldTest extends TestCase { public void testTerminalStructConstructor() { assertSame("getName", fFieldName1, fStructTerminalField1.getName()); assertNull("getValue", fStructTerminalField1.getValue()); - assertNull("getFields", fStructTerminalField1.getFields()); + assertEquals("getFields", 0, fStructTerminalField1.getFields().length); assertNull("getField(name)", fStructTerminalField1.getField(fFieldName1)); assertNull("getField(index)", fStructTerminalField1.getField(0)); assertEquals("getFieldNames", 0, fStructTerminalField1.getFieldNames().length); @@ -109,7 +109,7 @@ public class TmfEventFieldTest extends TestCase { public void testTerminalConstructor() { assertSame("getName", fFieldName1, fField1.getName()); assertSame("getValue", fValue1, fField1.getValue()); - assertNull("getFields", fField1.getFields()); + assertEquals("getFields", 0, fField1.getFields().length); assertNull("getField(name)", fField1.getField(fFieldName1)); assertNull("getField(index)", fField1.getField(0)); assertEquals("getFieldNames", 0, fField1.getFieldNames().length); @@ -117,7 +117,7 @@ public class TmfEventFieldTest extends TestCase { assertSame("getName", fFieldName2, fField2.getName()); assertSame("getValue", fValue2, fField2.getValue()); - assertNull("getFields", fField2.getFields()); + assertEquals("getFields", 0, fField2.getFields().length); assertNull("getField(name)", fField2.getField(fFieldName2)); assertNull("getField(index)", fField2.getField(0)); assertEquals("getFieldNames", 0, fField2.getFieldNames().length); @@ -155,7 +155,7 @@ public class TmfEventFieldTest extends TestCase { final TmfEventField copy = new TmfEventField(fField1); assertSame("getName", fFieldName1, copy.getName()); assertSame("getValue", fValue1, copy.getValue()); - assertNull("getFields", copy.getFields()); + assertEquals("getFields", 0, copy.getFields().length); assertNull("getField(name)", copy.getField(fFieldName1)); assertNull("getField(index)", copy.getField(0)); assertEquals("getFieldNames", 0, copy.getFieldNames().length); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java index 4ef3ba445a..5463178f92 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeManagerTest.java @@ -151,7 +151,7 @@ public class TmfEventTypeManagerTest extends TestCase { public void testClear() { fInstance.clear(); assertEquals("clear", 0, fInstance.getContexts().length); - assertNull("clear", fInstance.getTypes(null)); + assertEquals("clear", 0, fInstance.getTypes(null).length); assertNull("clear", fInstance.getType(null, null)); assertEquals("clear", "TmfEventTypeManager [fEventTypes={}]", fInstance.toString()); } @@ -170,7 +170,7 @@ public class TmfEventTypeManagerTest extends TestCase { assertEquals("clear context", fContext2, contexts[0]); ITmfEventType[] types = fInstance.getTypes(fContext1); - assertNull("clear context", types); + assertEquals("clear context", 0, types.length); ITmfEventType type = fInstance.getType(fContext1, fType0.getName()); assertNull("clear context", type); diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java index ddd7889ffc..8d09a36235 100644 --- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java +++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/event/TmfEventTypeTest.java @@ -77,7 +77,7 @@ public class TmfEventTypeTest extends TestCase { assertEquals("getContext", TmfEventType.DEFAULT_CONTEXT_ID, type.getContext()); assertEquals("getName", TmfEventType.DEFAULT_TYPE_ID, type.getName()); assertNull("getRootField", type.getRootField()); - assertNull("getFieldNames", type.getFieldNames()); + assertEquals("getFieldNames", 0, type.getFieldNames().length); assertNull("getFieldName", type.getFieldName(0)); } diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java index 100e5ae478..7613941abf 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventField.java @@ -151,7 +151,7 @@ public class TmfEventField implements ITmfEventField, Cloneable { */ @Override public ITmfEventField[] getFields() { - return (fFields != null) ? Arrays.copyOf(fFields, fFields.length) : null; + return (fFields != null) ? Arrays.copyOf(fFields, fFields.length) : new ITmfEventField[0]; } /* (non-Javadoc) diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java index 14cff763c6..a0cc90cd9f 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventType.java @@ -109,7 +109,7 @@ public class TmfEventType implements ITmfEventType, Cloneable { */ @Override public String[] getFieldNames() { - return (fRootField != null) ? fRootField.getFieldNames() : null; + return (fRootField != null) ? fRootField.getFieldNames() : new String[0]; } /* (non-Javadoc) diff --git a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java index 5f170c7f9a..9e672e5f1d 100644 --- a/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java +++ b/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfEventTypeManager.java @@ -96,7 +96,7 @@ public final class TmfEventTypeManager { if (types != null) { return types.values().toArray(new ITmfEventType[types.size()]); } - return null; + return new ITmfEventType[0]; } /** -- 2.34.1