Refactor TmfTrace and dependencies - remove getTrace()

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.core.tests / src / org / eclipse / linuxtools / lttng / core / tests / event / LttngEventTypeTest.java

diff --git a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
index 49000a680a7150c5dc96c4e775d9f1adc4319012..a877c7434e4c8a1c297b26820726be3bf2b92cd6 100644 (file)
--- a/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
+++ b/org.eclipse.linuxtools.lttng.core.tests/src/org/eclipse/linuxtools/lttng/core/tests/event/LttngEventTypeTest.java
@@ -17,105 +17,103 @@ import org.osgi.framework.FrameworkUtil;
     public LttngEventType()
     public LttngEventType(String thisTracefileName, Long thisCpuId, String thisMarkerName, String[] thisMarkerfieldsName)
     public LttngEventType(LttngEventType oldType)
-    
+
     public String getTracefileName()
     public Long getCpuId()
     public String getMarkerName()
-    
+
     public String toString()
  */
 
 @SuppressWarnings("nls")
 public class LttngEventTypeTest extends TestCase {
-       private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
+    private final static String tracepath1="traceset/trace-15316events_nolost_newformat.txt";
     private final static boolean skipIndexing=true;
-    
+
     private final static String firstEventChannel       = "metadata";
     private final static long firstEventCpu             = 0;
     private final static String firstEventMarker        = "core_marker_id";
-    
+
     private static LTTngTextTrace testStream = null;
     private LTTngTextTrace initializeEventStream() {
-               if (testStream == null) {
-                       try {
-                               URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
-                               File testfile = new File(FileLocator.toFileURL(location).toURI());
-                               LTTngTextTrace tmpStream = new LTTngTextTrace(testfile.getName(), testfile.getPath(), skipIndexing);
-                               testStream = tmpStream;
-                       } 
-                       catch (Exception e) {
-                               System.out.println("ERROR : Could not open " + tracepath1);
-                               testStream = null;
-                       }
-               }
-               else {
-                       testStream.seekEvent(0);
-               }
-               
-               return testStream;
-       }
-    
+        if (testStream == null)
+            try {
+                final URL location = FileLocator.find(FrameworkUtil.getBundle(this.getClass()), new Path(tracepath1), null);
+                final File testfile = new File(FileLocator.toFileURL(location).toURI());
+                final LTTngTextTrace tmpStream = new LTTngTextTrace(null, testfile.getPath(), skipIndexing);
+                testStream = tmpStream;
+            }
+        catch (final Exception e) {
+            System.out.println("ERROR : Could not open " + tracepath1);
+            testStream = null;
+        }
+        else
+            testStream.seekEvent(0);
+
+        return testStream;
+    }
+
     private LttngEventType prepareToTest() {
         LttngEventType tmpEventType = null;
 
         // This trace should be valid
         try {
-            LTTngTextTrace tmpStream = initializeEventStream();
+            final LTTngTextTrace tmpStream = initializeEventStream();
             tmpEventType = (LttngEventType)tmpStream.getNextEvent( new TmfContext(null, 0) ).getType();
-        } 
-        catch (Exception e) {
+        }
+        catch (final Exception e) {
             fail("ERROR : Failed to get reference!");
         }
 
         return tmpEventType;
     }
-    
+
     public void testConstructors() {
         LttngEventType tmpEventType = null;
-        
+
         // Default construction, no argument
         try {
             tmpEventType = new LttngEventType();
         }
-        catch( Exception e) { 
+        catch( final Exception e) {
             fail("Construction failed!");
         }
-        
+
         // Default construction with good arguments
         try {
             tmpEventType = new LttngEventType("test", 0L, "test",  0, new String[] { "test" });
         }
-        catch (Exception e) { 
+        catch (final Exception e) {
             fail("Construction failed!");
         }
-        
+
         // Copy constructor
         try {
             tmpEventType = new LttngEventType("test", 0L, "test", 0, new String[] { "test" });
             new LttngEventType(tmpEventType);
         }
-        catch (Exception e) { 
+        catch (final Exception e) {
             fail("Construction failed!");
         }
     }
-    
-    
+
+
     public void testGetter() {
-        LttngEventType tmpEventType = prepareToTest();
-        
-        assertTrue("Channel name not what was expected!",firstEventChannel.equals((String)tmpEventType.getTracefileName()) );
+        final LttngEventType tmpEventType = prepareToTest();
+
+        assertTrue("Channel name not what was expected!",firstEventChannel.equals(tmpEventType.getTracefileName()) );
         assertTrue("Cpu Id not what was expected!",firstEventCpu == tmpEventType.getCpuId() );
-        assertTrue("Marker Name not what was expected!",firstEventMarker.equals((String)tmpEventType.getMarkerName()) );
+        assertTrue("Marker Name not what was expected!",firstEventMarker.equals(tmpEventType.getMarkerName()) );
         // Just test the non-nullity of labels
         assertNotSame("getLabels returned null",null, tmpEventType.getFieldNames() );
     }
-    
+
     public void testToString() {
-        LttngEventType tmpEventType = prepareToTest();
-        
+        final LttngEventType tmpEventType = prepareToTest();
+
         // Just make sure toString() does not return null or the java reference
         assertNotSame("toString returned null",null, tmpEventType.toString() );
         assertNotSame("toString is not overridded!", tmpEventType.getClass().getName() + '@' + Integer.toHexString(tmpEventType.hashCode()), tmpEventType.toString() );
     }
-    
+
 }