From 4a91262cbe6e9aabe2d3553219df530fabf09ae0 Mon Sep 17 00:00:00 2001
From: neworderofjamie <neworderofjamie@gmail.com>
Date: Tue, 10 Aug 2021 17:33:35 +0100
Subject: [PATCH] updated tests

---
 tests/unit/currentSource.cc |  2 +-
 tests/unit/customUpdate.cc  |  4 ++--
 tests/unit/gennUtils.cc     | 42 +++++++++++++++++++++++++++----------
 tests/unit/neuronGroup.cc   |  2 +-
 tests/unit/synapseGroup.cc  |  2 +-
 5 files changed, 36 insertions(+), 16 deletions(-)

diff --git a/tests/unit/currentSource.cc b/tests/unit/currentSource.cc
index c1d745609d..f18b2f5647 100644
--- a/tests/unit/currentSource.cc
+++ b/tests/unit/currentSource.cc
@@ -97,7 +97,7 @@ TEST(CurrentSource, InvalidName)
     auto *pop = model.addNeuronPopulation<NeuronModels::Izhikevich>("Pop", 10, paramVals, varVals);
     
     try {
-        model.addCurrentSource<CurrentSourceModels::DC>("6CS", "Pop", {1.0}, {});
+        model.addCurrentSource<CurrentSourceModels::DC>("CS-2", "Pop", {1.0}, {});
         FAIL();
     }
     catch(const std::runtime_error &) {
diff --git a/tests/unit/customUpdate.cc b/tests/unit/customUpdate.cc
index 7658f8c61a..78862e3891 100644
--- a/tests/unit/customUpdate.cc
+++ b/tests/unit/customUpdate.cc
@@ -596,7 +596,7 @@ TEST(CustomUpdates, InvalidName)
     Sum::VarReferences sumVarReferences1(createVarRef(ng1, "V"), createVarRef(ng1, "U"));
 
     try {
-        model.addCustomUpdate<Sum>("1Sum", "CustomUpdate",
+        model.addCustomUpdate<Sum>("Sum-1", "CustomUpdate",
                                    {}, sumVarValues, sumVarReferences1);
         FAIL();
     }
@@ -617,7 +617,7 @@ TEST(CustomUpdates, InvalidUpdateGroupName)
     Sum::VarReferences sumVarReferences1(createVarRef(ng1, "V"), createVarRef(ng1, "U"));
 
     try {
-        model.addCustomUpdate<Sum>("Sum", "1CustomUpdate",
+        model.addCustomUpdate<Sum>("Sum", "CustomUpdate-1",
                                    {}, sumVarValues, sumVarReferences1);
         FAIL();
     }
diff --git a/tests/unit/gennUtils.cc b/tests/unit/gennUtils.cc
index 26a2a608f1..6ba8ea9d2a 100644
--- a/tests/unit/gennUtils.cc
+++ b/tests/unit/gennUtils.cc
@@ -10,10 +10,20 @@
 //--------------------------------------------------------------------------
 namespace
 {
-void validateVarPopNameDeathTest(const std::string &name)
+void validatePopNameDeathTest(const std::string &name)
 {
     try {
-        Utils::validateVarPopName(name, "test");
+        Utils::validatePopName(name, "test");
+        FAIL();
+    }
+
+    catch(const std::runtime_error &) {
+    }
+}
+void validateVarNameDeathTest(const std::string &name)
+{
+    try {
+        Utils::validateVarName(name, "test");
         FAIL();
     }
 
@@ -27,16 +37,26 @@ void validateVarPopNameDeathTest(const std::string &name)
 //--------------------------------------------------------------------------
 TEST(GeNNUtils, ValidateVarPopName)
 {
-    Utils::validateVarPopName("test", "test");
-    Utils::validateVarPopName("Test", "test");
-    Utils::validateVarPopName("test123", "test");
-    Utils::validateVarPopName("test_123", "test");
-    Utils::validateVarPopName("_test_123", "test");
+    Utils::validateVarName("test", "test");
+    Utils::validateVarName("Test", "test");
+    Utils::validateVarName("test123", "test");
+    Utils::validateVarName("test_123", "test");
+    Utils::validateVarName("_test_123", "test");
+
+    Utils::validatePopName("test", "test");
+    Utils::validatePopName("Test", "test");
+    Utils::validatePopName("test123", "test");
+    Utils::validatePopName("test_123", "test");
+    Utils::validatePopName("_test_123", "test");
+    Utils::validatePopName("1test", "test");
 
-    validateVarPopNameDeathTest("");
-    validateVarPopNameDeathTest("1test");
-    validateVarPopNameDeathTest("test.test");
-    validateVarPopNameDeathTest("test-test");
+    validateVarNameDeathTest("");
+    validateVarNameDeathTest("1test");
+    validateVarNameDeathTest("test.test");
+    validateVarNameDeathTest("test-test");
+    validatePopNameDeathTest("");
+    validatePopNameDeathTest("test.test");
+    validatePopNameDeathTest("test-test");
 }
 //--------------------------------------------------------------------------
 TEST(GeNNUtils, ValidateParamNames)
diff --git a/tests/unit/neuronGroup.cc b/tests/unit/neuronGroup.cc
index 13b28bfe4a..c3d141ae6c 100644
--- a/tests/unit/neuronGroup.cc
+++ b/tests/unit/neuronGroup.cc
@@ -154,7 +154,7 @@ TEST(NeuronGroup, InvalidName)
 {
     ModelSpec model;
     try {
-        model.addNeuronPopulation<NeuronModels::SpikeSource>("0Neurons", 10, {}, {});
+        model.addNeuronPopulation<NeuronModels::SpikeSource>("Neurons-0", 10, {}, {});
      FAIL();
     }
     catch(const std::runtime_error &) {
diff --git a/tests/unit/synapseGroup.cc b/tests/unit/synapseGroup.cc
index d238f5ebfe..b37eb190e7 100644
--- a/tests/unit/synapseGroup.cc
+++ b/tests/unit/synapseGroup.cc
@@ -702,7 +702,7 @@ TEST(SynapseGroup, InvalidName)
     auto *post = model.addNeuronPopulation<NeuronModels::Izhikevich>("Post", 10, paramVals, varVals);
     try {
         model.addSynapsePopulation<WeightUpdateModels::StaticPulse, PostsynapticModels::DeltaCurr>(
-            "6Syn", SynapseMatrixType::DENSE_GLOBALG, NO_DELAY,
+            "Syn-6", SynapseMatrixType::DENSE_GLOBALG, NO_DELAY,
             "Pre", "Post",
             {}, {1.0},
             {}, {});