Improve test cases. Coverage of 85%+ and fix bugs.

Signed-off-by: Matthew Khouzam <matthew.khouzam@ericsson.com>

4 files changed, 81 insertions, 2 deletions

diff --git a/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF b/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
index 64b5eb13b5..8240824e6c 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
+++ b/lttng/org.eclipse.linuxtools.ctf.core/META-INF/MANIFEST.MF
@@ -13,4 +13,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
  org.eclipse.linuxtools.ctf.parser;bundle-version="0.1.0"
 Export-Package: org.eclipse.linuxtools.ctf.core.event,
  org.eclipse.linuxtools.ctf.core.event.types,
- org.eclipse.linuxtools.ctf.core.trace
+ org.eclipse.linuxtools.ctf.core.trace,
+ org.eclipse.linuxtools.internal.ctf.core.event.io
diff --git a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/FloatDeclaration.java b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/FloatDeclaration.java
index 89ef7e523b..5576e3fdf4 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/FloatDeclaration.java
+++ b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/event/types/FloatDeclaration.java
@@ -72,6 +72,7 @@ public class FloatDeclaration implements IDeclaration {
         return encoding;
     }
 
+    @Override
     public long getAlignment() {
         return alignment;
     }
@@ -81,7 +82,7 @@ public class FloatDeclaration implements IDeclaration {
     // ------------------------------------------------------------------------
 
     @Override
-    public Definition createDefinition(IDefinitionScope definitionScope,
+    public FloatDefinition createDefinition(IDefinitionScope definitionScope,
             String fieldName) {
         return new FloatDefinition(this, definitionScope, fieldName);
     }
diff --git a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java
index 1e0f3663ec..e6710aaad6 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java
+++ b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/ctf/core/trace/StreamInputReader.java
@@ -277,4 +277,45 @@ public class StreamInputReader {
         return packetReader;
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = (prime * result) + name;
+        result = (prime * result)
+                + ((streamInput == null) ? 0 : streamInput.hashCode());
+        return result;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof StreamInputReader)) {
+            return false;
+        }
+        StreamInputReader other = (StreamInputReader) obj;
+        if (name != other.name) {
+            return false;
+        }
+        if (streamInput == null) {
+            if (other.streamInput != null) {
+                return false;
+            }
+        } else if (!streamInput.equals(other.streamInput)) {
+            return false;
+        }
+        return true;
+    }
+
 }
diff --git a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java
index 7116c1be91..92b2945eb0 100644
--- a/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java
+++ b/lttng/org.eclipse.linuxtools.ctf.core/src/org/eclipse/linuxtools/internal/ctf/core/trace/StreamInput.java
@@ -362,4 +362,40 @@ public class StreamInput implements IDefinitionScope {
         index.getEntries().get(0).setIndexBegin(0L);
     }
 
+    /* (non-Javadoc)
+     * @see java.lang.Object#hashCode()
+     */
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = (prime * result) + ((file == null) ? 0 : file.hashCode());
+        return result;
+    }
+
+    /* (non-Javadoc)
+     * @see java.lang.Object#equals(java.lang.Object)
+     */
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (!(obj instanceof StreamInput)) {
+            return false;
+        }
+        StreamInput other = (StreamInput) obj;
+        if (file == null) {
+            if (other.file != null) {
+                return false;
+            }
+        } else if (!file.equals(other.file)) {
+            return false;
+        }
+        return true;
+    }
+
 }