Rename xxx.lttng to xxx.lttng.core

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.tests / src / org / eclipse / linuxtools / lttng / tests / jni / JniMarkerTest.java

diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java
index 7db7a9ad115f71cb717775e85d7833a536488588..f0fb79c7fff1cfbd00ae5db652397208bb896a78 100644 (file)
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerTest.java
@@ -1,14 +1,14 @@
 
 package org.eclipse.linuxtools.lttng.tests.jni;
 
-import org.eclipse.linuxtools.lttng.jni.JniEvent;
-import org.eclipse.linuxtools.lttng.jni.JniException;
-import org.eclipse.linuxtools.lttng.jni.JniMarker;
-import org.eclipse.linuxtools.lttng.jni.JniTrace;
-import org.eclipse.linuxtools.lttng.jni.Jni_C_Pointer;
 
 import junit.framework.TestCase;
 
+import org.eclipse.linuxtools.lttng.jni.JniEvent;
+import org.eclipse.linuxtools.lttng.jni.JniMarker;
+import org.eclipse.linuxtools.lttng.jni.exception.JniException;
+import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory;
+
 /*
  Functions tested here :
         public JniMarker(JniMarker oldMarker)
@@ -24,11 +24,12 @@ import junit.framework.TestCase;
         public void printMarkerInformation()
 */
 
+@SuppressWarnings("nls")
 public class JniMarkerTest extends TestCase
 {
                private final static boolean printLttDebug = false;
                
-        private final static String tracepath="traceset/trace-618339events-1293lost-1cpu";
+        private final static String tracepath="traceset/trace-15316events_nolost_newformat";
         private final static String eventName="kernel0";
         
         private final static int    numberOfMarkersFieldInMarker = 3;
@@ -41,7 +42,7 @@ public class JniMarkerTest extends TestCase
                 // This trace should be valid
                 // We will read the second event to have something interesting to test on
                 try {
-                        tmpEvent = new JniTrace(tracepath, printLttDebug).requestEventByName(eventName);
+                        tmpEvent = JniTraceFactory.getJniTrace(tracepath, null, printLttDebug).requestEventByName(eventName);
                         tmpEvent.readNextEvent();
                         
                         tmpMarker = tmpEvent.requestEventMarker();
@@ -55,32 +56,26 @@ public class JniMarkerTest extends TestCase
                 
                 JniEvent tmpEvent = null;
                 
-                JniMarker testMarker1 = null;
-                JniMarker testMarker2 = null;
+                @SuppressWarnings("unused")
+                               JniMarker testMarker1 = null;
+                @SuppressWarnings("unused")
+                               JniMarker testMarker2 = null;
                 
                 // This event should be valid and will be used in test
                 try {
-                        tmpEvent = new JniTrace(tracepath, printLttDebug).requestEventByName(eventName);
+                        tmpEvent = JniTraceFactory.getJniTrace(tracepath, null, printLttDebug).requestEventByName(eventName);
                 }
                 catch( JniException e) { }
                 
-                // Test constructor with pointer on a wrong pointer
-                try {
-                        testMarker1 = new JniMarker( new Jni_C_Pointer(0) );
-                        fail("Construction with wrong pointer should fail!");
-                }
-                catch( JniException e) { 
-                }
-                
                 // Test constructor with pointer on a correct pointer
                 try {
-                        testMarker1 = new JniMarker( tmpEvent.requestEventMarker().getMarkerPtr() );
+                        testMarker1 = tmpEvent.getParentTracefile().allocateNewJniMarker( tmpEvent.requestEventMarker().getMarkerPtr() );
                 }
                 catch( JniException e) {
                         fail("Construction with correct pointer failed!");
                 }
                 
-                
+                /*
                 // Test copy constructor
                 try {
                         testMarker1 = new JniMarker( tmpEvent.requestEventMarker().getMarkerPtr() );
@@ -89,8 +84,8 @@ public class JniMarkerTest extends TestCase
                 catch( JniException e) {
                         fail("Copy constructor failed!");
                 }
-                
                 assertSame("JniMarker name not same after using copy constructor", testMarker1.getName() , testMarker2.getName());
+                */
                 
         }