[Andromdaplugins-cvs] CVS update: plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit XMLAsserterAttribute.cs

[Manish A. <mag...@us...>]

  User: magrawal
  Date: 07/01/18 01:15:22

  Modified:    etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit.Tests
                        TestScenarioHelperTests.cs
               etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit
                        XMLAsserterAttribute.cs
  Log:
  fixed a problem where null output from a test case caused object reference set to null exception.
  
  Revision  Changes    Path
  1.2       +34 -9     plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit.Tests/TestScenarioHelperTests.cs
  
  Index: TestScenarioHelperTests.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit.Tests/TestScenarioHelperTests.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- TestScenarioHelperTests.cs	10 Jan 2007 22:56:49 -0000	1.1
  +++ TestScenarioHelperTests.cs	18 Jan 2007 09:15:22 -0000	1.2
  @@ -55,6 +55,7 @@
               return testObj;
           }
           #endregion
  +        
           #region TestInvokeMultipleParameters
           [Test]
           public void TestInvokeMultipleInputParameters()
  @@ -70,6 +71,7 @@
           }
   
           #endregion
  +        
           #region TestInvokeNoInputParameter
           [Test]
           public void TestInvokeNoInputParameter()
  @@ -85,6 +87,7 @@
           }
   
           #endregion
  +        
           #region TestInvokePrimitiveInputParameter
           [Test]
           public void TestInvokePrimitiveInputParameter()
  @@ -101,6 +104,7 @@
           }
   
           #endregion
  +        
           #region TestInvokeNoReturnParameter
           [Test]
           public void TestInvokeNoReturnParameter()
  @@ -113,6 +117,7 @@
           }
   
           #endregion
  +        
           #region TestInvokeMultipleReturnParameters
           [Test]
           public void TestInvokeMultipleReturnParameters()
  @@ -127,6 +132,22 @@
           }
   
           #endregion
  +
  +        #region testInvoke returns null
  +
  +                [Test]
  +        public void TestInvokeNullReturnParameter()
  +        {
  +            TestScenarioHelper.Invoke("NullReturn", "NullReturnParameter", this);
  +        }
  +        private TestObject NullReturn()
  +        {
  +            return null;
  +        }
  +
  +        
  +        #endregion
  +
           #region TestInvokeCollectionParameters
           [Test]
           public void TestInvokeCollectionParameters()
  @@ -163,6 +184,7 @@
           }
   
           #endregion
  +        
           #region TestBusinessException
           [Test]
           [ExpectedException(typeof(TestException))]
  @@ -175,6 +197,7 @@
               throw new TestException();
           }
           #endregion
  +        
           #region TestCodeDataProvider
           [Test]
           public void TestCodeDataProvider()
  @@ -191,6 +214,7 @@
               return new TestObject();
           }
           #endregion
  +        
           #region TestNamedCodeDataProvider
           [Test]
           public void TestNamedCodeDataProvider()
  @@ -221,6 +245,7 @@
   
           }
           #endregion
  +        
           #region TestMixedDataProviders
           [Test]
           public void TestMixedDataProvider()
  
  
  
  1.2       +9 -1      plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit/XMLAsserterAttribute.cs
  
  Index: XMLAsserterAttribute.cs
  ===================================================================
  RCS file: /cvsroot/andromdaplugins/plugins/etc/andromda-dotnet/AndroMDA.ScenarioUnit/AndroMDA.ScenarioUnit/XMLAsserterAttribute.cs,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -w -r1.1 -r1.2
  --- XMLAsserterAttribute.cs	10 Jan 2007 22:56:52 -0000	1.1
  +++ XMLAsserterAttribute.cs	18 Jan 2007 09:15:22 -0000	1.2
  @@ -101,7 +101,15 @@
   {
       string outputFileName = GetFileName(pInfo, methodName, scenarioName);
       string actualOutputPath = Path.Combine(ActualOutputDir, outputFileName);
  -    XmlSerializer xs = new XmlSerializer(outputObj.GetType());
  +    XmlSerializer xs = null;
  +    if (null == outputObj)
  +    {
  +        xs = new XmlSerializer(typeof(System.Object));
  +    }
  +    else
  +    {
  +        xs = new XmlSerializer(outputObj.GetType());
  +    }
   
       using (StreamWriter actualOutput = new StreamWriter(actualOutputPath))
       {