Attachment #151266 for bug #287562

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 215-221 Link Here

(-)src/org/eclipse/linuxtools/tmf/ui/views/TmfEventsView.java (-2 / +2 lines)
215	event.getSource().getSourceId().toString(),	215	event.getSource().getSourceId().toString(),
216	event.getType().getTypeId().toString(),	216	event.getType().getTypeId().toString(),
217	event.getReference().getValue().toString(),	217	event.getReference().getValue().toString(),
218	event.getContent().getContent()	218	event.getContent().toString()
219	};	219	};
220	}	220	}
221	return fields;	221	return fields;
Lines 292-295 Link Here
292	}	292	}
293	}	293	}
294		294
295	}	295	}

Lines 12-17 Link Here

(-)stubs/org/eclipse/linuxtools/tmf/event/TmfEventContentStub.java (-19 / +25 lines)
12		12
13	package org.eclipse.linuxtools.tmf.event;	13	package org.eclipse.linuxtools.tmf.event;
14		14
		15	import java.util.HashMap;
		16	import java.util.Map;
		17
15	/**	18	/**
16	* <b><u>TmfEventFormatStub</u></b>	19	* <b><u>TmfEventFormatStub</u></b>
17	* <p>	20	* <p>
Lines 17-23 Link Here
17	* <p>	20	* <p>
18	* TODO: Implement me. Please.	21	* TODO: Implement me. Please.
19	*/	22	*/
20	public class TmfEventFormatStub extends TmfEventFormat {	23	public class TmfEventContentStub extends TmfEventContent {
21		24
22	// ========================================================================	25	// ========================================================================
23	// Attributes	26	// Attributes
Lines 23-39 Link Here
23	// Attributes	26	// Attributes
24	// ========================================================================	27	// ========================================================================
25		28
26	// ========================================================================	29	private static final String fTypeId = "typeId";
		30	private static final String[] fLabels = new String[] { "label1", "label2", "label3", "label4", "label5" };
		31	private static final TmfEventType fType = new TmfEventType(fTypeId, fLabels);
		32
		33	private static final String[] fFields = new String[] { "Field1", "Field2", "Field3", "Field4", "Field5" };
		34
		35	// ========================================================================
27	// Constructors	36	// Constructors
28	// ========================================================================	37	// ========================================================================
29		38
30	public TmfEventFormatStub() {	39	public TmfEventContentStub() {
31	super(new String[] { "Field1", "Field2", "Field3", "Field4", "Field5" });	40	super(fType, fFields);
32	}	41	}
33		42
34	// ========================================================================	43	public TmfEventContentStub(TmfEventType type, Object content) {
35	// Accessors	44	super(type, content);
36	// ========================================================================	45	}
37		46
38	// ========================================================================	47	// ========================================================================
39	// Operators	48	// Operators
Lines 39-55 Link Here
39	// Operators	48	// Operators
40	// ========================================================================	49	// ========================================================================
41		50
42	/* (non-Javadoc)	51	@Override
43	* @see org.eclipse.linuxtools.tmf.event.TmfEventFormat#parse(java.lang.Object)	52	public Map<String, TmfEventField> parseContent() {
44	*/	53	Map<String, TmfEventField> fields = new HashMap<String, TmfEventField>();
45	@Override	54	for (int i = 0; i < fLabels.length; i++) {
46	public TmfEventField[] parse(Object content) {	55	TmfEventField field = new TmfEventField(this, fLabels[i], fFields[i]);
47	TmfEventField field1 = new TmfEventField(1);	56	fields.put(fLabels[i], field);
48	TmfEventField field2 = new TmfEventField(-10);	57	}
49	TmfEventField field3 = new TmfEventField(true);	58	return fields;
50	TmfEventField field4 = new TmfEventField("some string");
51	TmfEventField field5 = new TmfEventField(new TmfTimestamp(1, (byte) 2, 3));
52	return new TmfEventField[] { field1, field2, field3, field4, field5 };
53	}	59	}
54		60
55	// ========================================================================	61	// ========================================================================
Lines 56-59 Link Here
56	// Helper functions	62	// Helper functions
57	// ========================================================================	63	// ========================================================================
58		64
59	}	65	}

Lines 1-59 Link Here

(-)stubs/org/eclipse/linuxtools/tmf/event/TmfEventFormatStub.java (-59 lines)
1	/*******************************************************************************
2	* Copyright (c) 2009 Ericsson
3	*
4	* All rights reserved. This program and the accompanying materials are
5	* made available under the terms of the Eclipse Public License v1.0 which
6	* accompanies this distribution, and is available at
7	* http://www.eclipse.org/legal/epl-v10.html
8	*
9	* Contributors:
10	* Francois Chouinard - Initial API and implementation
11	*******************************************************************************/
12
13	package org.eclipse.linuxtools.tmf.event;
14
15	/**
16	* <b><u>TmfEventFormatStub</u></b>
17	* <p>
18	* TODO: Implement me. Please.
19	*/
20	public class TmfEventFormatStub extends TmfEventFormat {
21
22	// ========================================================================
23	// Attributes
24	// ========================================================================
25
26	// ========================================================================
27	// Constructors
28	// ========================================================================
29
30	public TmfEventFormatStub() {
31	super(new String[] { "Field1", "Field2", "Field3", "Field4", "Field5" });
32	}
33
34	// ========================================================================
35	// Accessors
36	// ========================================================================
37
38	// ========================================================================
39	// Operators
40	// ========================================================================
41
42	/* (non-Javadoc)
43	* @see org.eclipse.linuxtools.tmf.event.TmfEventFormat#parse(java.lang.Object)
44	*/
45	@Override
46	public TmfEventField[] parse(Object content) {
47	TmfEventField field1 = new TmfEventField(1);
48	TmfEventField field2 = new TmfEventField(-10);
49	TmfEventField field3 = new TmfEventField(true);
50	TmfEventField field4 = new TmfEventField("some string");
51	TmfEventField field5 = new TmfEventField(new TmfTimestamp(1, (byte) 2, 3));
52	return new TmfEventField[] { field1, field2, field3, field4, field5 };
53	}
54
55	// ========================================================================
56	// Helper functions
57	// ========================================================================
58
59	}




import java.io.EOFException;
import java.io.IOException;
import java.io.RandomAccessFile;
import java.util.Vector;

import org.eclipse.linuxtools.tmf.event.TmfEvent;
import org.eclipse.linuxtools.tmf.event.TmfEventContentStub;
import org.eclipse.linuxtools.tmf.event.TmfEventFormat;
import org.eclipse.linuxtools.tmf.event.TmfEventReference;
import org.eclipse.linuxtools.tmf.event.TmfEventSource;
import org.eclipse.linuxtools.tmf.event.TmfEventType;

    // Attributes
    // ========================================================================

	private final int NB_TYPES = 10;
    private final String[][] fFormats;

    // ========================================================================
    // Constructors

    // ========================================================================

    public TmfEventParserStub() {
    	fFormats = new String[NB_TYPES][];
    	for (int i = 0; i < NB_TYPES; i++) {
    		fFormats[i] = new String[i];
    		for (int j = 1; j <= i; j++) {
    			fFormats[i][j] = "Fmt-" + i + "-Fld-" + j;
    		}
    		String[] fields = new String[i];
    		fFormats[i] = new TmfEventFormat(format.toArray(fields));
    	}
    }


        		}
        		content += "]";

        		String[] labels = fFormats[typeIndex];
        		TmfEventType eventType = new TmfEventType(type, labels);

        		TmfEvent event = new TmfEvent(
        				new TmfTimestamp(ts, (byte) -3, 0),     // millisecs
        				new TmfEventSource(source),
        				eventType,
        				new TmfEventContentStub(eventType, labels),
        				new TmfEventReference(name));
        		return event;
        	} catch (EOFException e) {




    public void testEmptyConstructor() {
        TmfEventType type = new TmfEventType("", null);
        assertEquals("getValue", "", type.getTypeId());
        assertEquals("getFormat", null, type.getFormat());
   }

    @Test


    @Test
    public void testNormalConstructor() {
        TmfEventType type = new TmfEventType("Type", new String[] { "field1", "field2" });
        assertEquals("getValue", "Type", type.getTypeId());
        assertEquals("getFormat", "field1", type.getLabels()[0]);
        assertEquals("getFormat", "field2", type.getLabels()[1]);
   }

}




/*******************************************************************************
 * Copyright (c) 2009 Ericsson
 * 
 * All rights reserved. This program and the accompanying materials are
 * made available under the terms of the Eclipse Public License v1.0 which
 * accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *   Francois Chouinard - Initial API and implementation
 *******************************************************************************/

package org.eclipse.linuxtools.tmf.event;

import static org.junit.Assert.assertEquals;

import org.junit.Test;

/**
 * <b><u>TmfEventFormatTest</u></b>
 * <p>
 * JUnit test suite for the TmfEventFormat class.
 */
public class TmfEventFormatTest {

    // ========================================================================
    // Constructors
    // ========================================================================

    @Test
    public void testBasicTmfEventFormat() {
        TmfEventFormat format = new TmfEventFormat();
        assertEquals("getLabels", 1, format.getLabels().length);
        assertEquals("getValue", "Content", format.getLabels()[0]);
    }

    @Test
    public void testEmptyConstructor() {
        TmfEventFormat format = new TmfEventFormat(new String[] {});
        assertEquals("getLabels", 0, format.getLabels().length);
    }

    @Test
    public void testNormalConstructor() {
        TmfEventFormat format = new TmfEventFormat(new String[] { "field1", "field2", "field3" });
        assertEquals("getLabels", 3, format.getLabels().length);
        assertEquals("getLabels", "field1", format.getLabels()[0]);
        assertEquals("getLabels", "field2", format.getLabels()[1]);
        assertEquals("getLabels", "field3", format.getLabels()[2]);
    }

    @Test
    public void testExtendedConstructor() {
        TmfEventFormatStub format = new TmfEventFormatStub();
        assertEquals("getLabels", 5, format.getLabels().length);
        assertEquals("getLabels", "Field1", format.getLabels()[0]);
        assertEquals("getLabels", "Field2", format.getLabels()[1]);
        assertEquals("getLabels", "Field3", format.getLabels()[2]);
        assertEquals("getLabels", "Field4", format.getLabels()[3]);
        assertEquals("getLabels", "Field5", format.getLabels()[4]);
    }

    // ========================================================================
    // parse
    // ========================================================================

    @Test
    public void testBasicParse() {
        TmfEventFormat format = new TmfEventFormat();
        TmfEventField[] content = format.parse(new TmfTimestamp());
        assertEquals("length", 1, content.length);
        assertEquals("getValue", "[TmfTimestamp:0,0,0]", content[0].toString());
    }

    @Test
    public void testExtendedParse() {
        TmfEventFormatStub format = new TmfEventFormatStub();
        TmfEventField[] content = format.parse(new TmfTimestamp());
        assertEquals("length", 5, content.length);
        assertEquals("getValue", "1",                    content[0].toString());
        assertEquals("getValue", "-10",                  content[1].toString());
        assertEquals("getValue", "true",                 content[2].toString());
        assertEquals("getValue", "some string",          content[3].toString());
        assertEquals("getValue", "[TmfTimestamp:1,2,3]", content[4].toString());
    }

}





    @Test
    public void testTmfTraceEvent() throws Exception {

    	String[] labels = new String[] { "label1", "label2" };
        String[] fields = new String[] { "field1", "field2" };

    	TmfTimestamp      timestamp = new TmfTimestamp(12345, (byte) 2, 5);
        TmfEventSource    source    = new TmfEventSource("Source");
        TmfEventType      type      = new TmfEventType("Type", labels);
        TmfEventContent   content   = new TmfEventContentStub(type, fields);
        TmfEventContent   content   = new TmfEventContent("Some content", format);
        TmfEventReference reference = new TmfEventReference("Reference");

        // Create the trace event

        // Check the event type
        TmfEventType evType = event.getType();
        assertEquals("getValue", "Type", evType.getTypeId());
        assertEquals("getFormat", "label1", evType.getLabels()[0]);
        assertEquals("getFormat", "label2", evType.getLabels()[1]);

        // Check the event content
        TmfEventContent evContent = event.getContent();
        assertEquals("getField", 2, evContent.getFields().length);
        assertEquals("getField", "[field:label1,value:Field1]", evContent.getField(evType.getLabels()[0]).toString());

        // Check the event reference
        TmfEventReference evRef = event.getReference();





	@Test
	public void testTmfEventContent() {
		TmfEventContent content = new TmfEventContentStub();
		assertEquals("getType", "typeId", content.getType().getTypeId());
		if (content.getContent() instanceof String) {
			String value = (String) content.getContent();
			assertEquals("getContent", "Some content", value);
		}
	}

	// ========================================================================

	// ========================================================================

	@Test
	public void testGetField() {
		TmfEventContent content = new TmfEventContentStub();
		assertEquals("getField", 1, content.getFields().length);
		assertEquals("getField", "Some content", content.getField(0).toString());
	}

	@Test
	public void testExtendedGetField() {
		TmfEventContent content = new TmfEventContent("", new TmfEventFormatStub());
		assertEquals("getField", 5, content.getFields().length);
		assertEquals("getField", "[field:label1,value:Field1]", content.getField("label1").toString());
		assertEquals("getField", "[field:label2,value:Field2]", content.getField("label2").toString());
		assertEquals("getField", "[field:label3,value:Field3]", content.getField("label3").toString());
		assertEquals("getField", "[field:label4,value:Field4]", content.getField("label4").toString());
		assertEquals("getField", "[field:label5,value:Field5]", content.getField("label5").toString());
	}

}




    
    @Test
    public void testTmfEvent() {

    	String[] labels = new String[] { "label1", "label2" };
        String[] fields = new String[] { "field1", "field2" };

        TmfTimestamp      timestamp = new TmfTimestamp(12345, (byte) 2, 5);
        TmfEventSource    source    = new TmfEventSource("Source");
        TmfEventType      type      = new TmfEventType("Type", labels);
        TmfEventContent   content   = new TmfEventContentStub(type, fields);
        TmfEventContent   content   = new TmfEventContent("Some content", format);
        TmfEventReference reference = new TmfEventReference("Reference");

        // Create the event

        // Check the event type
        TmfEventType tp = event.getType();
        assertEquals("getValue", "Type", tp.getTypeId());
        assertEquals("getFormat", "label1", tp.getLabels()[0]);
        assertEquals("getFormat", "label2", tp.getLabels()[1]);

        // Check the event content
        TmfEventContent cnt = event.getContent();
        assertEquals("getField", 2, cnt.getFields().length);
        assertEquals("getField", "[field:label1,value:Field1]", cnt.getField(tp.getLabels()[0]).toString());

        // Check the event reference
        TmfEventReference ref = event.getReference();


    @Test
    public void testTmfEvent2() {

    	String[] labels = new String[] { "label1", "label2" };
        String[] fields = new String[] { "field1", "field2" };

    	TmfTimestamp      original  = new TmfTimestamp(12345, (byte) 2, 5);
        TmfTimestamp      effective = new TmfTimestamp(12350, (byte) 2, 5);
        TmfEventSource    source    = new TmfEventSource("Source");
        TmfEventType      type      = new TmfEventType("Type", labels);
        TmfEventContent   content   = new TmfEventContentStub(type, fields);
        TmfEventContent   content   = new TmfEventContent("Some content", format);
        TmfEventReference reference = new TmfEventReference("Reference");

        // Create the event

        // Check the event type
        TmfEventType tp = event.getType();
        assertEquals("getValue", "Type", tp.getTypeId());
        assertEquals("getFormat", "label1", tp.getLabels()[0]);
        assertEquals("getFormat", "label2", tp.getLabels()[1]);

        // Check the event content
        TmfEventContent cnt = event.getContent();
        assertEquals("getField", 2, cnt.getFields().length);
        assertEquals("getField", "[field:label1,value:Field1]", cnt.getField(tp.getLabels()[0]).toString());

        // Check the event reference
        TmfEventReference ref = event.getReference();

Lines 20-26 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/AllEventTests.java (-1 lines)
20	TmfTimestampTest.class,	20	TmfTimestampTest.class,
21	TmfTimeRangeTest.class,	21	TmfTimeRangeTest.class,
22	TmfEventTypeTest.class,	22	TmfEventTypeTest.class,
23	TmfEventFormatTest.class,
24	TmfEventContentTest.class,	23	TmfEventContentTest.class,
25	TmfEventTest.class,	24	TmfEventTest.class,
26	TmfTraceEventTest.class	25	TmfTraceEventTest.class

Return to bug 287562

Lines 15-25 Link Here

(-)stubs/org/eclipse/linuxtools/tmf/trace/TmfEventParserStub.java (-13 / +12 lines)
15	import java.io.EOFException;	15	import java.io.EOFException;
16	import java.io.IOException;	16	import java.io.IOException;
17	import java.io.RandomAccessFile;	17	import java.io.RandomAccessFile;
18	import java.util.Vector;
19		18
20	import org.eclipse.linuxtools.tmf.event.TmfEvent;	19	import org.eclipse.linuxtools.tmf.event.TmfEvent;
21	import org.eclipse.linuxtools.tmf.event.TmfEventContent;	20	import org.eclipse.linuxtools.tmf.event.TmfEventContentStub;
22	import org.eclipse.linuxtools.tmf.event.TmfEventFormat;
23	import org.eclipse.linuxtools.tmf.event.TmfEventReference;	21	import org.eclipse.linuxtools.tmf.event.TmfEventReference;
24	import org.eclipse.linuxtools.tmf.event.TmfEventSource;	22	import org.eclipse.linuxtools.tmf.event.TmfEventSource;
25	import org.eclipse.linuxtools.tmf.event.TmfEventType;	23	import org.eclipse.linuxtools.tmf.event.TmfEventType;
Lines 36-43 Link Here
36	// Attributes	34	// Attributes
37	// ========================================================================	35	// ========================================================================
38		36
39	private final int NB_FORMATS = 10;	37	private final int NB_TYPES = 10;
40	private final TmfEventFormat[] fFormats;	38	private final String[][] fFormats;
41		39
42	// ========================================================================	40	// ========================================================================
43	// Constructors	41	// Constructors
Lines 44-57 Link Here
44	// ========================================================================	42	// ========================================================================
45		43
46	public TmfEventParserStub() {	44	public TmfEventParserStub() {
47	fFormats = new TmfEventFormat[NB_FORMATS];	45	fFormats = new String[NB_TYPES][];
48	for (int i = 0; i < NB_FORMATS; i++) {	46	for (int i = 0; i < NB_TYPES; i++) {
49	Vector<String> format = new Vector<String>();	47	fFormats[i] = new String[i];
50	for (int j = 1; j <= i; j++) {	48	for (int j = 1; j <= i; j++) {
51	format.add(new String("Fmt-" + i + "-Fld-" + j));	49	fFormats[i][j] = "Fmt-" + i + "-Fld-" + j;
52	}	50	}
53	String[] fields = new String[i];
54	fFormats[i] = new TmfEventFormat(format.toArray(fields));
55	}	51	}
56	}	52	}
57		53
Lines 105-115 Link Here
105	}	101	}
106	content += "]";	102	content += "]";
107		103
		104	String[] labels = fFormats[typeIndex];
		105	TmfEventType eventType = new TmfEventType(type, labels);
		106
108	TmfEvent event = new TmfEvent(	107	TmfEvent event = new TmfEvent(
109	new TmfTimestamp(ts, (byte) -3, 0), // millisecs	108	new TmfTimestamp(ts, (byte) -3, 0), // millisecs
110	new TmfEventSource(source),	109	new TmfEventSource(source),
111	new TmfEventType(type, fFormats[typeIndex]),	110	eventType,
112	new TmfEventContent(content, fFormats[typeIndex]),	111	new TmfEventContentStub(eventType, labels),
113	new TmfEventReference(name));	112	new TmfEventReference(name));
114	return event;	113	return event;
115	} catch (EOFException e) {	114	} catch (EOFException e) {

Lines 31-37 Link Here

(-)src/org/eclipse/linuxtools/tmf/event/TmfEventTypeTest.java (-4 / +3 lines)
31	public void testEmptyConstructor() {	31	public void testEmptyConstructor() {
32	TmfEventType type = new TmfEventType("", null);	32	TmfEventType type = new TmfEventType("", null);
33	assertEquals("getValue", "", type.getTypeId());	33	assertEquals("getValue", "", type.getTypeId());
34	assertEquals("getFormat", null, type.getFormat());
35	}	34	}
36		35
37	@Test	36	@Test
Lines 36-45 Link Here
36		35
37	@Test	36	@Test
38	public void testNormalConstructor() {	37	public void testNormalConstructor() {
39	TmfEventType type = new TmfEventType("Type", new TmfEventFormat(new String[] { "field1", "field2" }));	38	TmfEventType type = new TmfEventType("Type", new String[] { "field1", "field2" });
40	assertEquals("getValue", "Type", type.getTypeId());	39	assertEquals("getValue", "Type", type.getTypeId());
41	assertEquals("getFormat", "field1", type.getFormat().getLabels()[0]);	40	assertEquals("getFormat", "field1", type.getLabels()[0]);
42	assertEquals("getFormat", "field2", type.getFormat().getLabels()[1]);	41	assertEquals("getFormat", "field2", type.getLabels()[1]);
43	}	42	}
44		43
45	}	44	}