X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=org.eclipse.linuxtools.lttng.tests%2Fsrc%2Forg%2Feclipse%2Flinuxtools%2Flttng%2Fevent%2FLttngEventContentTest.java;h=f74ec634e483b63b432c5a1bb197a4374329403e;hb=b5983975990feedd1c935372b396999faf1407dc;hp=f66f1ebbbd8b6a43f81dc31e889349ae0914f230;hpb=eddd9002080faa77afaf80c3159220f4ff2d056e;p=deliverable%2Ftracecompass.git

diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/event/LttngEventContentTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/event/LttngEventContentTest.java
index f66f1ebbbd..f74ec634e4 100644
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/event/LttngEventContentTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/event/LttngEventContentTest.java
@@ -1,12 +1,8 @@
 package org.eclipse.linuxtools.lttng.event;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.fail;
-
 import org.eclipse.linuxtools.lttng.trace.LTTngTrace;
 import org.eclipse.linuxtools.tmf.trace.TmfTraceContext;
-import org.junit.Test;
+import junit.framework.TestCase;
 
 /*
  Functions tested here :
@@ -20,7 +16,7 @@ import org.junit.Test;
     public String toString()
  */
 
-public class LttngEventContentTest {
+public class LttngEventContentTest extends TestCase {
 	private final static boolean skipIndexing=true;
 	private final static boolean waitForCompletion=true;
     private final static String tracepath1="traceset/trace-618339events-1293lost-1cpu";
@@ -58,18 +54,16 @@ public class LttngEventContentTest {
 		return tmpEventContent;
 	}
 
-	@Test
 	public void testConstructors() {
-		LttngEventContent testContent 	= null;
-		@SuppressWarnings("unused")
-		LttngEventContent testContent2 	= null;
-		LttngEventFormat	testFormat	= new LttngEventFormat(new String[1]); 
-        LttngEventField[] 	testFields  = new LttngEventField[1];
-        testFields[0] = new LttngEventField("test", "test");
+		LttngEvent 		  testEvent    = null;
+		LttngEventContent testContent  = null;
+		LttngEventContent testContent2 = null;
+        LttngEventField[] testFields   = new LttngEventField[1];
+        testFields[0] = new LttngEventField(testContent2, "test");
         
 	    // Default construction with good argument
         try {
-        	testContent = new LttngEventContent(testFormat);
+        	testContent = new LttngEventContent();
         }
         catch( Exception e) { 
         	fail("Construction with format failed!");
@@ -77,7 +71,7 @@ public class LttngEventContentTest {
         
         // Construction with good parameters
         try {
-        	testContent = new LttngEventContent(testFormat, "test", testFields);
+        	testContent = new LttngEventContent(testEvent);
         }
         catch( Exception e) { 
         	fail("Construction with format, content and fields failed!");
@@ -85,7 +79,7 @@ public class LttngEventContentTest {
         
         // Copy constructor with correct parameters
         try {
-        	testContent = new LttngEventContent(testFormat);
+        	testContent = new LttngEventContent(testEvent);
         	testContent2 = new LttngEventContent(testContent);
         }
         catch( Exception e) { 
@@ -95,22 +89,13 @@ public class LttngEventContentTest {
 	}
 	
 	
-    @Test
 	public void testGetter() {
     	LttngEventContent testContent = null;
     	LTTngTrace tmpStream = null;
-    	LttngEvent tmpEvent = null;
+    	@SuppressWarnings("unused")
+		LttngEvent tmpEvent = null;
     	TmfTraceContext tmpContext = null;
     	
-    	//*** Basic (very bad) interface ***
-    	testContent =  prepareToTest();
-    	// getFieldS()
-    	assertNotSame("getFields() returned null!",null,testContent.getFields().toString());
-    	// getField(int)
-    	assertEquals("getField(int) returned unexpected result!",firstEventContentFirstField, testContent.getField(0).toString());
-    	
-    	
-    	//*** Upgraded (better) interface ***
     	// Require an event
     	tmpStream = initializeEventStream();
     	tmpContext = new TmfTraceContext(null, null, 0);
@@ -118,9 +103,9 @@ public class LttngEventContentTest {
     	
 		testContent = prepareToTest();
     	// getFieldS()
-    	assertNotSame("getFields(event) returned null!",null,testContent.getFields(tmpEvent) );
+    	assertNotSame("getFields() returned null!",null,testContent.getFields() );
     	// getField(int)
-    	assertEquals("getField(int, event) returned unexpected result!",firstEventContentFirstField, testContent.getField(0, tmpEvent).toString());
+    	assertEquals("getField(int) returned unexpected result!",firstEventContentFirstField, testContent.getField(0).toString());
     	
     	
     	
@@ -134,23 +119,13 @@ public class LttngEventContentTest {
     	// Second event past metadata should have more fields
     	tmpEvent = (LttngEvent)tmpStream.parseEvent(tmpContext);
     	
-    	//*** Basic (very bad) interface ***
-    	testContent =  (LttngEventContent)tmpEvent.getContent();
     	// getFieldS()
-    	assertNotSame("getFields() returned null!",null,testContent.getFields().toString());
+    	assertNotSame("getFields() returned null!",null,testContent.getFields() );
     	// getField(int)
     	assertEquals("getField(int) returned unexpected result!",secondEventContentSecondField, testContent.getField(1).toString());
     	
-    	
-    	//*** Upgraded (better) interface ***
-    	// getFieldS()
-    	assertNotSame("getFields(event) returned null!",null,testContent.getFields(tmpEvent) );
-    	// getField(int)
-    	assertEquals("getField(int, event) returned unexpected result!",secondEventContentSecondField, testContent.getField(1, tmpEvent).toString());
-    	
     }
     
-    @Test
 	public void testToString() {
     	LttngEventContent tmpContent = prepareToTest();