[DB] Update obs database test to use correct system UID (#314)

* Update obs database test to use correct system uid

* Swap outputName and description

Author: earocorn

sensorhub-core/src/testFixtures/java/org/sensorhub/impl/datastore/AbstractTestDataStreamStore.java

@@ -127,16 +127,24 @@ protected DataStreamKey addSimpleDataStream(FeatureId sysID, String outputName,
         return addDataStream(sysID, dataStruct, validTime);
     }
 
-    
     protected DataStreamKey addSimpleDataStream(BigId sysID, String outputName, TimeExtent validTime) throws DataStoreException
     {
-        return addSimpleDataStream(new FeatureId(sysID, PROC_UID_PREFIX+sysID), outputName, "datastream description", validTime);
+        return addSimpleDataStream(PROC_UID_PREFIX+sysID, sysID, outputName, validTime);
     }
-    
-    
+
+    protected DataStreamKey addSimpleDataStream(String uniqueID, BigId sysID, String outputName, TimeExtent validTime) throws DataStoreException
+    {
+        return addSimpleDataStream(new FeatureId(sysID, uniqueID), outputName, "datastream description", validTime);
+    }
+
     protected DataStreamKey addSimpleDataStream(BigId sysID, String outputName, String description, TimeExtent validTime) throws DataStoreException
     {
-        return addSimpleDataStream(new FeatureId(sysID, PROC_UID_PREFIX+sysID), outputName, description, validTime);
+        return addSimpleDataStream(PROC_UID_PREFIX+sysID, sysID, outputName, description, validTime);
+    }
+
+    protected DataStreamKey addSimpleDataStream(String uniqueID, BigId sysID, String outputName, String description, TimeExtent validTime) throws DataStoreException
+    {
+        return addSimpleDataStream(new FeatureId(sysID, uniqueID), outputName, description, validTime);
     }
 
 

sensorhub-core/src/testFixtures/java/org/sensorhub/impl/datastore/AbstractTestObsDatabase.java

@@ -112,14 +112,14 @@ public void testSelectDatastreamWithSystemFilterJoin() throws Exception
         int procUids[] = {13, 5, 25};
         var procIds = addSystems(procUids);
 
-        dataStreamTests.addSimpleDataStream(procIds[0], "out1", TimeExtent.beginAt(Instant.EPOCH));
-        var dsId1 = dataStreamTests.addSimpleDataStream(procIds[0], "out2", TimeExtent.beginAt(Instant.EPOCH));
+        dataStreamTests.addSimpleDataStream(PROC_UID_PREFIX+procUids[0], procIds[0], "out1", TimeExtent.beginAt(Instant.EPOCH));
+        var dsId1 = dataStreamTests.addSimpleDataStream(PROC_UID_PREFIX+procUids[0], procIds[0], "out2", TimeExtent.beginAt(Instant.EPOCH));
 
-        dataStreamTests.addSimpleDataStream(procIds[1], "out1", TimeExtent.beginAt(Instant.EPOCH));
-        dataStreamTests.addSimpleDataStream(procIds[1], "out2", TimeExtent.beginAt(Instant.EPOCH));
+        dataStreamTests.addSimpleDataStream(PROC_UID_PREFIX+procUids[1], procIds[1], "out1", TimeExtent.beginAt(Instant.EPOCH));
+        dataStreamTests.addSimpleDataStream(PROC_UID_PREFIX+procUids[1], procIds[1], "out2", TimeExtent.beginAt(Instant.EPOCH));
 
-        dataStreamTests.addSimpleDataStream(procIds[2], "out1", TimeExtent.beginAt(Instant.EPOCH));
-        var dsId2 = dataStreamTests.addSimpleDataStream(procIds[2], "out2", TimeExtent.beginAt(Instant.EPOCH));
+        dataStreamTests.addSimpleDataStream(PROC_UID_PREFIX+procUids[2], procIds[2], "out1", TimeExtent.beginAt(Instant.EPOCH));
+        var dsId2 = dataStreamTests.addSimpleDataStream(PROC_UID_PREFIX+procUids[2], procIds[2], "out2", TimeExtent.beginAt(Instant.EPOCH));
 
         var filter = new DataStreamFilter.Builder()
             .withSystems()