updates test cases

tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch

@@ -37,7 +37,7 @@
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.minres.scviewer.database.test"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2G"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx2G -ea"/>
     <stringAttribute key="pde.version" value="3.3"/>
     <stringAttribute key="product" value="com.minres.scviewer.e4.product"/>
     <booleanAttribute key="run_in_ui_thread" value="true"/>

tests/com.minres.scviewer.database.test/inputs/my_db.txlog

@@ -6,8 +6,8 @@ begin_attribute (ID 0, name "addr", type "UNSIGNED")
 end_attribute (ID 1, name "data", type "UNSIGNED")
 )
 scv_tr_generator (ID 5, name "write", scv_tr_stream 1,
-begin_attribute (ID 0, name "addr", type "UNSIGNED")
+begin_attribute (ID 0, name "wr.addr", type "UNSIGNED")
-end_attribute (ID 1, name "data", type "UNSIGNED")
+begin_attribute (ID 1, name "wr.data", type "UNSIGNED")
 )
 scv_tr_generator (ID 6, name "addr", scv_tr_stream 2,
 begin_attribute (ID 0, name "addr", type "UNSIGNED")
@@ -24,231 +24,231 @@ tx_record_attribute 1 "data_size" UNSIGNED = 24
 tx_begin 2 6 0 s
 a 0
 tx_relation "addr_phase" 2 1
-tx_end 2 6 180 ns
+tx_end 2 6 100 ns
-tx_begin 3 7 180 ns
+tx_begin 3 7 100 ns
 tx_relation "data_phase" 3 1
-tx_begin 4 4 180 ns
+tx_begin 4 4 100 ns
 a 0
 tx_record_attribute 4 "data_size" UNSIGNED = 24
-tx_begin 5 6 180 ns
+tx_begin 5 6 100 ns
 a 0
 tx_relation "addr_phase" 5 4
+tx_end 3 7 280 ns
+a 0
+tx_end 1 4 280 ns
+a 0
 tx_end 5 6 300 ns
-tx_end 3 7 420 ns
+tx_begin 6 7 300 ns
-a 0
+tx_relation "data_phase" 6 4
-tx_end 1 4 420 ns
+tx_begin 7 4 300 ns
-a 0
-tx_begin 6 4 420 ns
 a 1
-tx_record_attribute 6 "data_size" UNSIGNED = 24
+tx_record_attribute 7 "data_size" UNSIGNED = 24
-tx_begin 7 6 420 ns
+tx_begin 8 6 300 ns
 a 1
-tx_relation "addr_phase" 7 6
+tx_relation "addr_phase" 8 7
-tx_begin 8 7 420 ns
+tx_end 8 6 420 ns
-tx_relation "data_phase" 8 4
+tx_end 6 7 460 ns
-tx_end 7 6 480 ns
-tx_end 8 7 620 ns
 a 0
-tx_end 4 4 620 ns
+tx_end 4 4 460 ns
 a 0
-tx_begin 9 4 620 ns
+tx_begin 9 4 460 ns
 a 1
 tx_record_attribute 9 "data_size" UNSIGNED = 24
-tx_begin 10 6 620 ns
+tx_begin 10 6 460 ns
 a 1
 tx_relation "addr_phase" 10 9
-tx_begin 11 7 620 ns
+tx_begin 11 7 460 ns
-tx_relation "data_phase" 11 6
+tx_relation "data_phase" 11 7
-tx_end 11 7 700 ns
+tx_end 11 7 600 ns
 a 1
-tx_end 6 4 700 ns
+tx_end 7 4 600 ns
 a 1
-tx_end 10 6 760 ns
+tx_end 10 6 640 ns
-tx_begin 12 7 760 ns
+tx_begin 12 7 640 ns
 tx_relation "data_phase" 12 9
-tx_begin 13 4 760 ns
+tx_begin 13 4 640 ns
 a 2
 tx_record_attribute 13 "data_size" UNSIGNED = 24
-tx_begin 14 6 760 ns
+tx_begin 14 6 640 ns
 a 2
 tx_relation "addr_phase" 14 13
+tx_end 12 7 740 ns
+a 1
+tx_end 9 4 740 ns
+a 1
 tx_end 14 6 880 ns
-tx_end 12 7 980 ns
+tx_begin 15 7 880 ns
-a 1
+tx_relation "data_phase" 15 13
-tx_end 9 4 980 ns
+tx_begin 16 4 880 ns
-a 1
-tx_begin 15 4 980 ns
 a 2
-tx_record_attribute 15 "data_size" UNSIGNED = 24
+tx_record_attribute 16 "data_size" UNSIGNED = 24
-tx_begin 16 6 980 ns
+tx_begin 17 6 880 ns
 a 2
-tx_relation "addr_phase" 16 15
+tx_relation "addr_phase" 17 16
-tx_begin 17 7 980 ns
+tx_end 15 7 960 ns
-tx_relation "data_phase" 17 13
-tx_end 16 6 1040 ns
-tx_end 17 7 1200 ns
 a 2
-tx_end 13 4 1200 ns
+tx_end 13 4 960 ns
 a 2
-tx_begin 18 4 1200 ns
+tx_end 17 6 980 ns
-a 120
+tx_begin 18 7 980 ns
-tx_record_attribute 18 "data_size" UNSIGNED = 24
+tx_relation "data_phase" 18 16
-tx_begin 19 6 1200 ns
+tx_begin 19 4 980 ns
-a 120
+a 24
-tx_relation "addr_phase" 19 18
+tx_record_attribute 19 "data_size" UNSIGNED = 24
-tx_begin 20 7 1200 ns
+tx_begin 20 6 980 ns
-tx_relation "data_phase" 20 15
+a 24
-tx_end 19 6 1300 ns
+tx_relation "addr_phase" 20 19
-tx_end 20 7 1340 ns
+tx_end 20 6 1040 ns
+tx_end 18 7 1180 ns
 a 2
-tx_end 15 4 1340 ns
+tx_end 16 4 1180 ns
 a 2
-tx_begin 21 4 1340 ns
+tx_begin 21 4 1180 ns
-a 11
+a 79
 tx_record_attribute 21 "data_size" UNSIGNED = 24
-tx_begin 22 6 1340 ns
+tx_begin 22 6 1180 ns
-a 11
+a 79
 tx_relation "addr_phase" 22 21
-tx_begin 23 7 1340 ns
+tx_begin 23 7 1180 ns
-tx_relation "data_phase" 23 18
+tx_relation "data_phase" 23 19
-tx_end 23 7 1420 ns
+tx_end 22 6 1300 ns
-a 120
+tx_end 23 7 1400 ns
-tx_end 18 4 1420 ns
+a 24
-a 120
+tx_end 19 4 1400 ns
-tx_end 22 6 1540 ns
+a 24
-tx_begin 24 7 1540 ns
+tx_begin 24 4 1400 ns
-tx_relation "data_phase" 24 21
+a 232
-tx_begin 25 4 1540 ns
+tx_record_attribute 24 "data_size" UNSIGNED = 24
-a 147
+tx_begin 25 6 1400 ns
-tx_record_attribute 25 "data_size" UNSIGNED = 24
+a 232
-tx_begin 26 6 1540 ns
+tx_relation "addr_phase" 25 24
-a 147
+tx_begin 26 7 1400 ns
-tx_relation "addr_phase" 26 25
+tx_relation "data_phase" 26 21
-tx_end 24 7 1660 ns
+tx_end 25 6 1460 ns
-a 11
+tx_end 26 7 1560 ns
-tx_end 21 4 1660 ns
+a 79
-a 11
+tx_end 21 4 1560 ns
-tx_end 26 6 1740 ns
+a 79
-tx_begin 27 7 1740 ns
+tx_begin 27 4 1560 ns
-tx_relation "data_phase" 27 25
+a 128
-tx_begin 28 4 1740 ns
+tx_record_attribute 27 "data_size" UNSIGNED = 24
-a 99
+tx_begin 28 6 1560 ns
-tx_record_attribute 28 "data_size" UNSIGNED = 24
+a 128
-tx_begin 29 6 1740 ns
+tx_relation "addr_phase" 28 27
-a 99
+tx_begin 29 7 1560 ns
-tx_relation "addr_phase" 29 28
+tx_relation "data_phase" 29 24
-tx_end 29 6 1800 ns
+tx_end 28 6 1660 ns
-tx_end 27 7 1980 ns
+tx_end 29 7 1720 ns
-a 147
+a 232
-tx_end 25 4 1980 ns
+tx_end 24 4 1720 ns
-a 147
+a 232
-tx_begin 30 4 1980 ns
+tx_begin 30 4 1720 ns
-a 55
+a 72
 tx_record_attribute 30 "data_size" UNSIGNED = 24
-tx_begin 31 6 1980 ns
+tx_begin 31 6 1720 ns
-a 55
+a 72
 tx_relation "addr_phase" 31 30
-tx_begin 32 7 1980 ns
+tx_begin 32 7 1720 ns
-tx_relation "data_phase" 32 28
+tx_relation "data_phase" 32 27
-tx_end 32 7 2060 ns
+tx_end 31 6 1800 ns
-a 99
+tx_end 32 7 1880 ns
-tx_end 28 4 2060 ns
+a 128
-a 99
+tx_end 27 4 1880 ns
-tx_end 31 6 2100 ns
+a 128
-tx_begin 33 7 2100 ns
+tx_begin 33 4 1880 ns
-tx_relation "data_phase" 33 30
+a 185
-tx_begin 34 4 2100 ns
+tx_record_attribute 33 "data_size" UNSIGNED = 24
-a 126
+tx_begin 34 6 1880 ns
-tx_record_attribute 34 "data_size" UNSIGNED = 24
+a 185
-tx_begin 35 6 2100 ns
+tx_relation "addr_phase" 34 33
-a 126
+tx_begin 35 7 1880 ns
-tx_relation "addr_phase" 35 34
+tx_relation "data_phase" 35 30
-tx_end 33 7 2340 ns
+tx_end 35 7 2080 ns
-a 55
+a 72
-tx_end 30 4 2340 ns
+tx_end 30 4 2080 ns
-a 55
+a 72
-tx_end 35 6 2340 ns
+tx_end 34 6 2080 ns
-tx_begin 36 7 2340 ns
+tx_begin 36 7 2080 ns
-tx_relation "data_phase" 36 34
+tx_relation "data_phase" 36 33
-tx_begin 37 5 2340 ns
+tx_begin 37 5 2080 ns
-a 204
+a 191
+a 1
 tx_record_attribute 37 "data_size" UNSIGNED = 24
-tx_begin 38 6 2340 ns
+tx_begin 38 6 2080 ns
-a 204
+a 191
 tx_relation "addr_phase" 38 37
-tx_end 38 6 2400 ns
+tx_end 38 6 2180 ns
-tx_end 36 7 2540 ns
+tx_end 36 7 2320 ns
-a 126
+a 185
-tx_end 34 4 2540 ns
+tx_end 33 4 2320 ns
-a 126
+a 185
-tx_begin 39 5 2540 ns
+tx_begin 39 5 2320 ns
-a 242
+a 8
+a 67
 tx_record_attribute 39 "data_size" UNSIGNED = 24
-tx_begin 40 6 2540 ns
+tx_begin 40 6 2320 ns
-a 242
+a 8
 tx_relation "addr_phase" 40 39
-tx_begin 41 8 2540 ns
+tx_begin 41 8 2320 ns
-a 211
+a 1
 tx_relation "data_phase" 41 37
-tx_end 41 8 2640 ns
+tx_end 41 8 2360 ns
-tx_end 37 5 2640 ns
+tx_end 37 5 2360 ns
-a 211
+tx_end 40 6 2420 ns
-tx_end 40 6 2780 ns
+tx_begin 42 8 2420 ns
-tx_begin 42 8 2780 ns
+a 67
-a 58
 tx_relation "data_phase" 42 39
-tx_begin 43 5 2780 ns
+tx_begin 43 5 2420 ns
-a 135
+a 55
+a 20
 tx_record_attribute 43 "data_size" UNSIGNED = 24
-tx_begin 44 6 2780 ns
+tx_begin 44 6 2420 ns
-a 135
+a 55
 tx_relation "addr_phase" 44 43
-tx_end 44 6 2960 ns
+tx_end 42 8 2540 ns
-tx_end 42 8 3 us
+tx_end 39 5 2540 ns
-tx_end 39 5 3 us
+tx_end 44 6 2620 ns
-a 58
+tx_begin 45 8 2620 ns
-tx_begin 45 5 3 us
+a 20
-a 26
+tx_relation "data_phase" 45 43
-tx_record_attribute 45 "data_size" UNSIGNED = 24
+tx_begin 46 5 2620 ns
-tx_begin 46 6 3 us
+a 56
-a 26
+a 179
-tx_relation "addr_phase" 46 45
+tx_record_attribute 46 "data_size" UNSIGNED = 24
-tx_begin 47 8 3 us
+tx_begin 47 6 2620 ns
-a 31
+a 56
-tx_relation "data_phase" 47 43
+tx_relation "addr_phase" 47 46
-tx_end 47 8 3140 ns
+tx_end 45 8 2780 ns
-tx_end 43 5 3140 ns
+tx_end 43 5 2780 ns
-a 31
+tx_end 47 6 2860 ns
-tx_end 46 6 3200 ns
+tx_begin 48 8 2860 ns
-tx_begin 48 8 3200 ns
+a 179
-a 37
+tx_relation "data_phase" 48 46
-tx_relation "data_phase" 48 45
+tx_begin 49 5 2860 ns
-tx_begin 49 5 3200 ns
+a 250
-a 176
+a 75
 tx_record_attribute 49 "data_size" UNSIGNED = 24
-tx_begin 50 6 3200 ns
+tx_begin 50 6 2860 ns
-a 176
+a 250
 tx_relation "addr_phase" 50 49
-tx_end 50 6 3300 ns
+tx_end 48 8 2960 ns
-tx_end 48 8 3380 ns
+tx_end 46 5 2960 ns
-tx_end 45 5 3380 ns
+tx_end 50 6 2960 ns
-a 37
+tx_begin 51 8 2960 ns
-tx_begin 51 5 3380 ns
+a 75
-a 58
+tx_relation "data_phase" 51 49
-tx_record_attribute 51 "data_size" UNSIGNED = 24
+tx_begin 52 5 2960 ns
-tx_begin 52 6 3380 ns
+a 121
-a 58
+a 168
-tx_relation "addr_phase" 52 51
+tx_record_attribute 52 "data_size" UNSIGNED = 24
-tx_begin 53 8 3380 ns
+tx_begin 53 6 2960 ns
-a 220
+a 121
-tx_relation "data_phase" 53 49
+tx_relation "addr_phase" 53 52
-tx_end 52 6 3440 ns
+tx_end 51 8 3180 ns
-tx_end 53 8 3560 ns
+tx_end 49 5 3180 ns
-tx_end 49 5 3560 ns
+tx_end 53 6 3200 ns
-a 220
+tx_begin 54 8 3200 ns
-tx_begin 54 8 3560 ns
+a 168
-a 109
+tx_relation "data_phase" 54 52
-tx_relation "data_phase" 54 51
+tx_end 54 8 3400 ns
-tx_end 54 8 3660 ns
+tx_end 52 5 3400 ns
-tx_end 51 5 3660 ns
-a 109

tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java

@@ -49,15 +49,19 @@ public class DatabaseServicesTest {
 		assertTrue(f.exists());
 		waveformDb.load(f);
 		assertNotNull(waveformDb);
-		List<IWaveform> waves= waveformDb.getAllWaves();
+		List<IWaveform> waveforms= waveformDb.getAllWaves();
-		assertEquals(14,  waves.size());
+		assertEquals(14,  waveforms.size());
 		assertEquals(2,  waveformDb.getChildNodes().size());
-		IWaveform bus_data_wave = waves.get(0);
+		waveforms.stream().filter(s -> s.getName().equals("bus_addr[7:0]")).forEach(s -> {
-		EventEntry bus_data_entry = bus_data_wave.getEvents().floorEntry(1400000000L);
+			EventEntry bus_data_entry = s.getEvents().floorEntry(1400000000L);
-		assertEquals("00001011", bus_data_entry.events[0].toString());
+			assertEquals("01001111", bus_data_entry.events[0].toString());
-		IWaveform rw_wave = waves.get(2);
+		});
-		EventEntry rw_entry = rw_wave.getEvents().floorEntry(2360000000L);
+
-		assertEquals("1", rw_entry.events[0].toString());
+		waveforms.stream().filter(s -> s.getName().equals("rw")).forEach(s -> {
+			EventEntry rw_entry = s.getEvents().floorEntry(2360000000L);
+			assertEquals("1", rw_entry.events[0].toString());
+		});
+
 	}
 
 	@Test
@@ -128,7 +132,6 @@ public class DatabaseServicesTest {
 				assertEquals(1, w.getRowCount());
 			}
 		}
-		//waveforms.stream().filter(s -> s.getId()==1).collect(Collectors.toList());
 		waveforms.stream().filter(s -> s.getId()==1).forEach(s -> {
 			assertEquals(27, s.getEvents().size());
 		});
@@ -163,7 +166,6 @@ public class DatabaseServicesTest {
 				assertEquals(1, w.getRowCount());
 			}
 		}
-		//waveforms.stream().filter(s -> s.getId()==1).collect(Collectors.toList());
 		waveforms.stream().filter(s -> s.getId()==1).forEach(s -> {
 			assertEquals(27, s.getEvents().size());
 		});
@@ -186,14 +188,17 @@ public class DatabaseServicesTest {
 		assertTrue(f.exists());
 		waveformDb.load(f);
 		assertNotNull(waveformDb);
-		List<IWaveform> waves= waveformDb.getAllWaves();
+		List<IWaveform> waveforms= waveformDb.getAllWaves();
-		assertEquals(14,  waves.size());
+		assertEquals(14,  waveforms.size());
 		assertEquals(2,  waveformDb.getChildNodes().size());
-		IWaveform bus_data_wave = waves.get(12);
+		waveforms.stream().filter(s -> s.getName().equals("bus_addr[7:0]")).forEach(s -> {
-		EventEntry bus_data_entry = bus_data_wave.getEvents().floorEntry(1400000000L);
+			EventEntry bus_data_entry = s.getEvents().floorEntry(1400000000L);
-		assertEquals("00001011", bus_data_entry.events[0].toString());
+			assertEquals("01001111", bus_data_entry.events[0].toString());
-		IWaveform rw_wave = waves.get(2);
+		});
-		EventEntry rw_entry = rw_wave.getEvents().floorEntry(2360000000L);
+
-		assertEquals("1", rw_entry.events[0].toString());
+		waveforms.stream().filter(s -> s.getName().equals("rw")).forEach(s -> {
+			EventEntry rw_entry = s.getEvents().floorEntry(2360000000L);
+			assertEquals("1", rw_entry.events[0].toString());
+		});
 	}
 }