From: William Bourque <william.bourque@polymtl.ca>
Date: Wed, 27 Jan 2010 22:34:35 +0000 (+0000)
Subject: Remove unreliable tests, fixes bugs #300750, #300751, #300752 (all related to the... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=0a9422df5c475456005d566efa3dd5713b9c6849;p=deliverable%2Ftracecompass.git

Remove unreliable tests, fixes bugs #300750, #300751, #300752 (all related to the same issue)
---

diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java
index fa15957998..777b36292c 100644
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventContentTest.java
@@ -143,8 +143,16 @@ public class LttngEventContentTest extends TestCase {
 		testContent = prepareToTest();
     	// getFieldS()
     	assertNotSame("getFields() returned null!",null,testContent.getFields() );
+    	
+    	// *** FIXME ***
+    	// Depending from the Java version because of the "hashcode()" on String. 
+    	// We can't really test that safetly
+    	//
     	// getField(int)
-    	assertEquals("getField(int) returned unexpected result!",firstEventContentFirstField, testContent.getField(0).toString());
+    	//assertEquals("getField(int) returned unexpected result!",firstEventContentFirstField, testContent.getField(0).toString());
+    	assertNotSame("getField(int) returned unexpected result!",null, testContent.getField(0).toString());
+    	
+    	
     	// getField(name)
     	assertEquals("getField(name) returned unexpected result!",firstEventContentFirstField, testContent.getField(firstEventContentFirstFieldName).toString());
     	// getRawContent
diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java
index 9b77883329..cf9d7031cf 100644
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventFieldTest.java
@@ -97,7 +97,13 @@ public class LttngEventFieldTest extends TestCase {
     	LttngEventField testField 	= (LttngEventField)tmpStream.getNextEvent( new TmfTraceContext(0, new LttngTimestamp(0L), 0) ).getContent().getField(0);
     	assertNotSame("getField is null!",null,testField);
     	
-    	assertTrue("getName() returned unexpected result!",firstEventName.equals(testField.getId().toString()));
+    	// *** FIXME ***
+    	// Depending from the Java version because of the "hashcode()" on String. 
+    	// We can't really test that safetly
+    	//
+    	//assertTrue("getName() returned unexpected result!",firstEventName.equals(testField.getId().toString()));
+    	assertNotSame("getName() returned unexpected result!",null, testField.getId());
+    	
     	assertTrue("getValue() returned unexpected result!",firstEventValue.equals(testField.getValue().toString()));
     	
     	
diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java
index 996826cd88..ab2be8d7a4 100644
--- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java
+++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/event/LttngEventTest.java
@@ -152,7 +152,13 @@ public class LttngEventTest extends TestCase {
     	assertEquals("Channel not what expected!",eventChannel,testEvent.getChannelName());
     	assertEquals("CpuId not what expected!",eventCpu,testEvent.getCpuId());
     	assertEquals("Marker not what expected!",eventMarker,testEvent.getMarkerName());
-    	assertEquals("Content not what expected!",eventContent,testEvent.getContent().toString());
+    	
+    	// *** FIXME ***
+    	// Depending from the Java version because of the "hashcode()" on String. 
+    	// We can't really test that safetly
+    	//
+    	//assertEquals("Content not what expected!",eventContent,testEvent.getContent().toString());
+    	assertNotSame("Content is null!", null,testEvent.getContent());
     }
     
 	public void testSetter() {