Merge branch 'bug/Unable_to_reference_connection_strings_in_setup_and…

…_cleanup_tasks_(#110)'
Seddryck · Aug 21, 2015 · 9d40ad5 · 9d40ad5
2 parents fae8582 + b2db5c7
commit 9d40ad5
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 26 deletions.
diff --git a/NBi.Testing/Acceptance/RuntimeOverrider.cs b/NBi.Testing/Acceptance/RuntimeOverrider.cs
@@ -57,33 +57,33 @@ public void SetupMethods()
 
         //By Acceptance Test Suite (file) create a Test Case
         [Test]
-        //[TestCase("AssemblyEqualToResultSet.nbits")]
-        //[TestCase("QueryEqualToWithParameter.nbits")]
-        //[TestCase("QueryEqualToCsv.nbits")]
-        //[TestCase("QueryEqualToQuery.nbits")]
-        //[TestCase("QueryEqualToResultSet.nbits")]
-        //[TestCase("QueryEqualToResultSetWithNull.nbits")]
-        //[TestCase("QueryWithReference.nbits")]
-        //[TestCase("Ordered.nbits")]
-        //[TestCase("Count.nbits")]
-        //[TestCase("Contain.nbits")]
-        //[TestCase("ContainStructure.nbits")]
-        //[TestCase("fasterThan.nbits")]
-        //[TestCase("SyntacticallyCorrect.nbits")]
-        //[TestCase("Exists.nbits")]
-        //[TestCase("LinkedTo.nbits")]
-        //[TestCase("SubsetOfStructure.nbits")]
-        //[TestCase("EquivalentToStructure.nbits")]
-        //[TestCase("SubsetOfMembers.nbits")]
-        //[TestCase("EquivalentToMembers.nbits")]
-        //[TestCase("MatchPatternMembers.nbits")]
-        //[TestCase("ResultSetMatchPattern.nbits")]
-        //[TestCase("QueryWithParameters.nbits")]
-        //[TestCase("EvaluateRows.nbits")]
-        //[TestCase("ReportEqualTo.nbits")]
+        [TestCase("AssemblyEqualToResultSet.nbits")]
+        [TestCase("QueryEqualToWithParameter.nbits")]
+        [TestCase("QueryEqualToCsv.nbits")]
+        [TestCase("QueryEqualToQuery.nbits")]
+        [TestCase("QueryEqualToResultSet.nbits")]
+        [TestCase("QueryEqualToResultSetWithNull.nbits")]
+        [TestCase("QueryWithReference.nbits")]
+        [TestCase("Ordered.nbits")]
+        [TestCase("Count.nbits")]
+        [TestCase("Contain.nbits")]
+        [TestCase("ContainStructure.nbits")]
+        [TestCase("fasterThan.nbits")]
+        [TestCase("SyntacticallyCorrect.nbits")]
+        [TestCase("Exists.nbits")]
+        [TestCase("LinkedTo.nbits")]
+        [TestCase("SubsetOfStructure.nbits")]
+        [TestCase("EquivalentToStructure.nbits")]
+        [TestCase("SubsetOfMembers.nbits")]
+        [TestCase("EquivalentToMembers.nbits")]
+        [TestCase("MatchPatternMembers.nbits")]
+        [TestCase("ResultSetMatchPattern.nbits")]
+        [TestCase("QueryWithParameters.nbits")]
+        [TestCase("EvaluateRows.nbits")]
+        [TestCase("ReportEqualTo.nbits")]
         [TestCase("Etl.nbits")]
-        //[TestCase("Decoration.nbits")]
-        //[TestCase("QueryRowCount.nbits")]
+        [TestCase("Decoration.nbits")]
+        [TestCase("QueryRowCount.nbits")]
         [Category("Acceptance")]
         public void RunPositiveTestSuite(string filename)
         {

diff --git a/NBi.Xml/Decoration/Command/DataManipulationAbstractXml.cs b/NBi.Xml/Decoration/Command/DataManipulationAbstractXml.cs
@@ -16,6 +16,8 @@ public string ConnectionString
         {
             get
             {
+                if (!string.IsNullOrEmpty(SpecificConnectionString) && SpecificConnectionString.StartsWith("@"))
+                    return Settings.GetReference(SpecificConnectionString.Remove(0, 1)).ConnectionString;
                 if (!String.IsNullOrWhiteSpace(SpecificConnectionString))
                     return SpecificConnectionString;
                 if (Settings != null && Settings.GetDefault(SettingsXml.DefaultScope.Decoration) != null)

diff --git a/NBi.Xml/Decoration/Command/SqlRunXml.cs b/NBi.Xml/Decoration/Command/SqlRunXml.cs
@@ -41,6 +41,8 @@ public string ConnectionString
         {
             get
             {
+                if (!string.IsNullOrEmpty(SpecificConnectionString) && SpecificConnectionString.StartsWith("@"))
+                    return Settings.GetReference(SpecificConnectionString.Remove(0, 1)).ConnectionString;
                 if (!String.IsNullOrWhiteSpace(SpecificConnectionString))
                     return SpecificConnectionString;
                 if (Settings != null && Settings.GetDefault(SettingsXml.DefaultScope.Decoration) != null)