From 6530362b89d9027bf853c72a67a59f3ea96d1c85 Mon Sep 17 00:00:00 2001
From: Eyck Jentzsch <eyck@minres.com>
Date: Thu, 14 Jan 2021 23:14:05 +0100
Subject: [PATCH] refactor tests

---
 .../OSGI-INF/component.xml                    |  2 +-
 .../database/test/DatabaseServicesTest.java   | 24 +++++-------------
 .../database/test/TestWaveformDbFactory.java  | 25 +++++++++++++++++++
 3 files changed, 32 insertions(+), 19 deletions(-)
 create mode 100644 tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TestWaveformDbFactory.java

diff --git a/tests/com.minres.scviewer.database.test/OSGI-INF/component.xml b/tests/com.minres.scviewer.database.test/OSGI-INF/component.xml
index 7ebc679..2254edc 100644
--- a/tests/com.minres.scviewer.database.test/OSGI-INF/component.xml
+++ b/tests/com.minres.scviewer.database.test/OSGI-INF/component.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0" name="com.minres.scviewer.database.test">
-   <implementation class="com.minres.scviewer.database.test.DatabaseServicesTest"/>
+   <implementation class="com.minres.scviewer.database.test.TestWaveformDbFactory"/>
    <reference bind="setFactory" cardinality="1..1" interface="com.minres.scviewer.database.IWaveformDbFactory" name="IWaveformDbFactory" policy="static" unbind="unsetFactory"/>
 </scr:component>
diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
index d76068a..d7488ff 100644
--- a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
+++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java
@@ -25,28 +25,15 @@ import org.junit.Test;
 import com.minres.scviewer.database.IEvent;
 import com.minres.scviewer.database.IWaveform;
 import com.minres.scviewer.database.IWaveformDb;
-import com.minres.scviewer.database.IWaveformDbFactory;
 
 public class DatabaseServicesTest {
 
 
-	private static IWaveformDbFactory waveformDbFactory;
-
 	private IWaveformDb waveformDb;
-	
-	public synchronized void setFactory(IWaveformDbFactory service) {
-		waveformDbFactory = service;
-	}
-
-	public synchronized void unsetFactory(IWaveformDbFactory service) {
-		if (waveformDbFactory == service) {
-			waveformDbFactory = null;
-		}
-	}
-	
+		
 	@Before
 	public void setUp() throws Exception {
-		waveformDb=waveformDbFactory.getDatabase();
+		waveformDb=TestWaveformDbFactory.getDatabase();
 	}
 
 	@After
@@ -91,11 +78,11 @@ public class DatabaseServicesTest {
 		assertEquals(1,  waveformDb.getChildNodes().size());
 		for(IWaveform w:waveforms) {
 			if(w.getId().equals(1l)) {
-				assertEquals(2, w.getWidth());
+				assertEquals(2, w.getRowCount());
 			} else if(w.getId().equals(2l)) {
-				assertEquals(1, w.getWidth());
+				assertEquals(1, w.getRowCount());
 			} else if(w.getId().equals(3l)) {
-				assertEquals(1, w.getWidth());
+				assertEquals(1, w.getRowCount());
 			}
 		}
 	}
@@ -108,6 +95,7 @@ public class DatabaseServicesTest {
 		assertNotNull(waveformDb);
 		assertEquals(3,  waveformDb.getAllWaves().size());
 		assertEquals(1,  waveformDb.getChildNodes().size());
+		while(!waveformDb.isLoaded()) Thread.sleep(10);
 	}
 
 	@Test
diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TestWaveformDbFactory.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TestWaveformDbFactory.java
new file mode 100644
index 0000000..29b0fe5
--- /dev/null
+++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TestWaveformDbFactory.java
@@ -0,0 +1,25 @@
+package com.minres.scviewer.database.test;
+
+import com.minres.scviewer.database.IWaveformDb;
+import com.minres.scviewer.database.IWaveformDbFactory;
+
+public class TestWaveformDbFactory {
+	private static IWaveformDbFactory waveformDbFactory;
+
+	
+	public synchronized void setFactory(IWaveformDbFactory service) {
+		waveformDbFactory = service;
+	}
+
+	public synchronized void unsetFactory(IWaveformDbFactory service) {
+		if (waveformDbFactory == service) {
+			waveformDbFactory = null;
+		}
+	}
+	
+	public static IWaveformDb getDatabase() throws Exception {
+		return waveformDbFactory.getDatabase();
+	}
+
+
+}