improve coverage

najaeda · Mar 28, 2024 · 6d07d52 · 6d07d52
1 parent 41a0ce1
commit 6d07d52
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 1 deletion.
diff --git a/src/snl/snl/kernel/SNLUniverse.cpp b/src/snl/snl/kernel/SNLUniverse.cpp
@@ -28,7 +28,9 @@ SNLUniverse* SNLUniverse::create() {
 
 void SNLUniverse::preCreate() {
   super::preCreate();
-  //FIXME: verify that no other Universe exists
+  if (universe_) {
+    throw SNLException("SNLUniverse already exists");
+  }
 }
 
 void SNLUniverse::postCreate() {

diff --git a/test/snl/python/snl_wrapping/test_snldesign.py b/test/snl/python/snl_wrapping/test_snldesign.py
@@ -173,6 +173,7 @@ def testCreationError(self):
     d = snl.SNLDesign.create(self.lib, "DESIGN")
     with self.assertRaises(RuntimeError) as context: snl.SNLDesign.create("ERROR", "ERROR", "ERROR")
     with self.assertRaises(RuntimeError) as context: snl.SNLDesign.create(d, "DESIGN")
+    with self.assertRaises(RuntimeError) as context: snl.SNLDesign.create(d, "DESIGN")
     with self.assertRaises(RuntimeError) as context: snl.SNLDesign.createPrimitive("ERROR", "ERROR", "ERROR")
     with self.assertRaises(RuntimeError) as context: snl.SNLDesign.createPrimitive(d, "PRIMITIVE")
     with self.assertRaises(RuntimeError) as context: snl.SNLScalarTerm.create(d)

diff --git a/test/snl/python/snl_wrapping/test_snldesign_clone.py b/test/snl/python/snl_wrapping/test_snldesign_clone.py
@@ -44,6 +44,9 @@ def testUniquifyInterface1(self):
 
   def testErrors(self):
     with self.assertRaises(RuntimeError) as context: self.design.clone("ERROR", "ERROR")
+    newDesign = self.design.clone("cloned")
+    self.assertIsNotNone(newDesign)
+    with self.assertRaises(RuntimeError) as context: self.design.clone("cloned")
 
 if __name__ == '__main__':
   unittest.main()
diff --git a/test/snl/python/snl_wrapping/test_snldesign_modeling.py b/test/snl/python/snl_wrapping/test_snldesign_modeling.py
@@ -155,6 +155,10 @@ def testSeqWithBusses1(self):
     self.assertEqual(4, sum(1 for t in snl.SNLDesign.getClockRelatedInputs(c)))
     self.assertEqual(4, sum(1 for t in snl.SNLDesign.getClockRelatedOutputs(c)))
 
+  def testCreationErrors(self):
+    prim = snl.SNLDesign.createPrimitive(self.primitives, "design")
+    with self.assertRaises(RuntimeError) as context: snl.SNLDesign.createPrimitive(self.designs, "design")
+
   def testCombiErrors(self):
     design = snl.SNLDesign.createPrimitive(self.primitives, "design")
     i0 = snl.SNLScalarTerm.create(design, snl.SNLTerm.Direction.Input, "I0")

diff --git a/test/snl/python/snl_wrapping/test_snlnet.py b/test/snl/python/snl_wrapping/test_snlnet.py
@@ -54,6 +54,7 @@ def test0(self):
     self.assertIsInstance(i1Net, snl.SNLDesignObject)
     self.assertIsNotNone(i1Net)
     self.assertEqual("I1", i1Net.getName())
+    with self.assertRaises(RuntimeError) as context: snl.SNLBusNet.create(self.design, 4, 0, "I1")
     self.assertEqual(4, i1.getMSB())
     self.assertEqual(0, i1.getLSB())
     self.assertEqual(5, i1.getSize())

diff --git a/test/snl/python/snl_wrapping/test_snluniverse.py b/test/snl/python/snl_wrapping/test_snluniverse.py
@@ -15,6 +15,7 @@ def test(self):
     snl.SNLUniverse.create()
     self.assertIsNotNone(snl.SNLUniverse.get())
     self.assertIsNone(snl.SNLUniverse.get().getTopDesign())
+    with self.assertRaises(RuntimeError) as context: snl.SNLUniverse.create()
 
 if __name__ == '__main__':
   unittest.main()
diff --git a/test/snl/snl/kernel/SNLUniverseTest.cpp b/test/snl/snl/kernel/SNLUniverseTest.cpp
@@ -5,6 +5,7 @@
 #include "gtest/gtest.h"
 
 #include "SNLUniverse.h"
+#include "SNLException.h"
 using namespace naja::SNL;
 
 class SNLUniverseTest: public ::testing::Test {
@@ -32,4 +33,11 @@ TEST_F(SNLUniverseTest, testGetSNLObjects1) {
   EXPECT_EQ(nullptr, universe->getBusTermBit(SNLID(SNLID::Type::TermBit, 1, 1, 1, 0, 1, 1)));
   EXPECT_EQ(nullptr, universe->getNet(SNLID::DesignObjectReference(2, 3, 1, 1)));
   EXPECT_EQ(nullptr, universe->getInstance(SNLID::DesignObjectReference(1, 1, 1, 1)));
+}
+
+TEST_F(SNLUniverseTest, testUniverseClashError) {
+  ASSERT_EQ(nullptr, SNLUniverse::get());
+  SNLUniverse::create();
+  ASSERT_NE(nullptr, SNLUniverse::get());
+  EXPECT_THROW(SNLUniverse::create(), SNLException);
 }