From 8b63111ec721c17abb0f98e9b9e59df3265b7660 Mon Sep 17 00:00:00 2001 From: William Bourque Date: Mon, 19 Apr 2010 22:22:27 +0000 Subject: [PATCH] Unit tests to the tests the modification to the JNI. Removed test with bad pointer as they were likely to SegFault the JVM now --- .../lttng/tests/jni/JniEventTest.java | 14 ++------------ .../lttng/tests/jni/JniMarkerFieldTest.java | 9 --------- .../lttng/tests/jni/JniMarkerTest.java | 13 ++----------- .../lttng/tests/jni/JniTraceTest.java | 19 ------------------- .../lttng/tests/jni/JniTracefileTest.java | 14 ++------------ 5 files changed, 6 insertions(+), 63 deletions(-) diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java index e40cd7330c..a3bcf2d340 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniEventTest.java @@ -31,15 +31,14 @@ package org.eclipse.linuxtools.lttng.tests.jni; +import junit.framework.TestCase; + import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniTracefile; import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer; import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; -import junit.framework.TestCase; - public class JniEventTest extends TestCase { private final static boolean printLttDebug = false; @@ -106,15 +105,6 @@ public class JniEventTest extends TestCase catch( JniException e) { } - // Test the constructor with parameters using wrong arguments - // Test constructor on a wrong event pointer - try { - testEvent1 = testTracefile.allocateNewJniEvent( new Jni_C_Pointer(0), testTracefile.getTracefileMarkersMap(), testTracefile ); - fail("Construction with wrong event pointer should fail!"); - } - catch( JniException e) { - } - // Test constructor on a wrong marker HashMap try { testEvent1 = testTracefile.allocateNewJniEvent( testTracefile.getCurrentEvent().getEventPtr(), null, testTracefile ); diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java index 10c2194751..1d4fb5be7b 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniMarkerFieldTest.java @@ -7,7 +7,6 @@ import junit.framework.TestCase; import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; import org.eclipse.linuxtools.lttng.jni.JniMarkerField; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer; import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; @@ -65,14 +64,6 @@ public class JniMarkerFieldTest extends TestCase } catch( JniException e) { } - // Test constructor with pointer on a wrong pointer - try { - tmpMarkerField1 = tmpMarker.allocateNewJniMarkerField( new Jni_C_Pointer(0) ); - fail("Construction with wrong pointer should fail!"); - } - catch( JniException e) { - } - // Test constructor with pointer on a correct pointer try { tmpMarkerField1 = tmpMarker.allocateNewJniMarkerField( tmpMarker.getMarkerFieldsArrayList().get(0).getMarkerFieldPtr() ); 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 55a66c5ba5..739b9c085f 100644 --- 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 @@ -2,14 +2,13 @@ package org.eclipse.linuxtools.lttng.tests.jni; +import junit.framework.TestCase; + import org.eclipse.linuxtools.lttng.jni.JniEvent; import org.eclipse.linuxtools.lttng.jni.JniMarker; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer; import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; -import junit.framework.TestCase; - /* Functions tested here : public JniMarker(JniMarker oldMarker) @@ -67,14 +66,6 @@ public class JniMarkerTest extends TestCase } catch( JniException e) { } - // Test constructor with pointer on a wrong pointer - try { - testMarker1 = tmpEvent.getParentTracefile().allocateNewJniMarker( 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 = tmpEvent.getParentTracefile().allocateNewJniMarker( tmpEvent.requestEventMarker().getMarkerPtr() ); diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java index 957c86efb1..bdf7320995 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTraceTest.java @@ -124,25 +124,6 @@ public class JniTraceTest extends TestCase catch( JniException e) { fail("Construction with correct tracepath failed!"); } - - /* - // Test copy constructor that take a pointer with a good pointer - try { - testTrace1 = new JniTrace( new Jni_C_Pointer(0), printLttDebug); - fail("Construction with wrong pointer should fail!"); - } - catch( JniException e) { - } - - // Test copy constructor that take a pointer with a good pointer - try { - testTrace1 = new JniTrace(tracepath1, printLttDebug); // This trace should be valid - testTrace2 = new JniTrace( testTrace1.getTracePtr(), printLttDebug); - } - catch( JniException e) { - fail("Construction with correct pointer failed!"); - } - */ } public void testTraceOpenClose() { diff --git a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java index 0f85bac288..5901ff6d39 100644 --- a/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java +++ b/org.eclipse.linuxtools.lttng.tests/src/org/eclipse/linuxtools/lttng/tests/jni/JniTracefileTest.java @@ -1,15 +1,14 @@ package org.eclipse.linuxtools.lttng.tests.jni; +import junit.framework.TestCase; + import org.eclipse.linuxtools.lttng.jni.JniTrace; import org.eclipse.linuxtools.lttng.jni.JniTracefile; import org.eclipse.linuxtools.lttng.jni.common.JniTime; -import org.eclipse.linuxtools.lttng.jni.common.Jni_C_Pointer; import org.eclipse.linuxtools.lttng.jni.exception.JniException; import org.eclipse.linuxtools.lttng.jni.factory.JniTraceFactory; -import junit.framework.TestCase; - /* Functions tested here : public JniTracefile(JniTracefile oldTracefile) @@ -100,15 +99,6 @@ public class JniTracefileTest extends TestCase } catch( JniException e) { } - - // Test constructor with pointer on a wrong pointer - try { - testTracefile1 = testTrace.allocateNewJniTracefile( new Jni_C_Pointer(0), testTrace ); - fail("Construction with wrong pointer should fail!"); - } - catch( JniException e) { - } - // Test constructor with pointer on a correct pointer try { testTracefile1 = testTrace.allocateNewJniTracefile( testTrace.requestEventByName(tracefileName1).getTracefilePtr(), testTrace ); -- 2.34.1