LTTng: CPU usage analysis from the LTTng kernel trace

[deliverable/tracecompass.git] / org.eclipse.linuxtools.tmf.core.tests / src / org / eclipse / linuxtools / tmf / core / tests / ctfadaptor / CtfLocationTest.java

diff --git a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfLocationTest.java b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfLocationTest.java
index 1f88ad9b187eeb4da7bb42a59f72bcd252a2d721..739cbc4b8a3ff95a6101571fb408a60ea2516837 100644 (file)
--- a/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfLocationTest.java
+++ b/org.eclipse.linuxtools.tmf.core.tests/src/org/eclipse/linuxtools/tmf/core/tests/ctfadaptor/CtfLocationTest.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2012 Ericsson
+ * Copyright (c) 2012, 2014 Ericsson
  *
  * All rights reserved. This program and the accompanying materials are
  * made available under the terms of the Eclipse Public License v1.0 which
@@ -18,8 +18,8 @@ import static org.junit.Assert.assertNotNull;
 
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocation;
 import org.eclipse.linuxtools.tmf.core.ctfadaptor.CtfLocationInfo;
-import org.eclipse.linuxtools.tmf.core.event.ITmfTimestamp;
-import org.eclipse.linuxtools.tmf.core.event.TmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.timestamp.ITmfTimestamp;
+import org.eclipse.linuxtools.tmf.core.timestamp.TmfTimestamp;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -51,7 +51,7 @@ public class CtfLocationTest {
         CtfLocation result = new CtfLocation(location);
 
         assertNotNull(result);
-        assertEquals(Long.valueOf(1), (Long)result.getLocationInfo().getTimestamp());
+        assertEquals(1L, result.getLocationInfo().getTimestamp());
     }
 
     /**
@@ -63,18 +63,7 @@ public class CtfLocationTest {
         CtfLocation result = new CtfLocation(timestamp);
 
         assertNotNull(result);
-        assertEquals(new Long(0L), (Long)result.getLocationInfo().getTimestamp());
-    }
-
-    /**
-     * Run the CtfLocation clone() method test.
-     */
-    @Test
-    public void testClone() {
-        CtfLocation result = fixture.clone();
-
-        assertNotNull(result);
-        assertEquals(Long.valueOf(1), (Long)result.getLocationInfo().getTimestamp());
+        assertEquals(0L, result.getLocationInfo().getTimestamp());
     }
 
     /**
@@ -83,15 +72,8 @@ public class CtfLocationTest {
     @Test
     public void testGetLocation() {
         CtfLocationInfo location = fixture.getLocationInfo();
-        Long result = location.getTimestamp();
-        assertNotNull(result);
-        assertEquals("1", result.toString()); //$NON-NLS-1$
-        assertEquals((byte) 1, result.byteValue());
-        assertEquals((short) 1, result.shortValue());
-        assertEquals(1, result.intValue());
-        assertEquals(1L, result.longValue());
-        assertEquals(1.0f, result.floatValue(), 1.0f);
-        assertEquals(1.0, result.doubleValue(), 1.0);
+        long result = location.getTimestamp();
+        assertEquals(1L, result);
     }
 
     /**
@@ -109,7 +91,7 @@ public class CtfLocationTest {
     @Test
     public void testToString_valid(){
         CtfLocation fixture2 = new CtfLocation(new CtfLocationInfo(1337, 7331));
-        assertEquals("CtfLocation: Element [1337/7331]",fixture2.toString()); //$NON-NLS-1$
+        assertEquals("CtfLocation [fLocationInfo=Element [1337/7331]]", fixture2.toString());
     }
 
     /**
@@ -118,6 +100,6 @@ public class CtfLocationTest {
     @Test
     public void testToString_invalid(){
         CtfLocation fixture2 = new CtfLocation(new CtfLocationInfo(-1, -1));
-        assertEquals("CtfLocation: INVALID",fixture2.toString()); //$NON-NLS-1$
+        assertEquals("CtfLocation [INVALID]", fixture2.toString());
     }
 }