Skip to content

Commit 3649048

Browse files
ryannewingtonryannewington
committed
Fixes an issue where an import error occurs when importing a advanced user with no delegates
1 parent fa98a9e commit 3649048

File tree

5 files changed

+58
-6
lines changed

5 files changed

+58
-6
lines changed

‎src/Lithnet.GoogleApps.MA.UnitTests/CustomUserTests.cs‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -811,6 +811,58 @@ public void AddDelegates()
811811
}
812812
}
813813

814+
[TestMethod]
815+
public void GetUserWithNoDelegates()
816+
{
817+
string dn = this.CreateAdvUser(out User e);
818+
819+
try
820+
{
821+
var user = UnitTestControl.TestParameters.UsersService.Get(dn);
822+
823+
var result = ImportProcessor.GetCSEntryChange(user, UnitTestControl.MmsSchema.Types[UnitTestControl.TestUser], UnitTestControl.TestParameters);
824+
825+
Assert.AreEqual(MAImportError.Success, result.ErrorCodeImport);
826+
}
827+
finally
828+
{
829+
if (dn != null)
830+
{
831+
UnitTestControl.TestParameters.UsersService.Delete(dn);
832+
}
833+
}
834+
}
835+
836+
[TestMethod]
837+
public void GetUserWithDelegate()
838+
{
839+
string dn = this.CreateAdvUser(out User e);
840+
string delegate1 = this.CreateUser(out User x);
841+
842+
try
843+
{
844+
UnitTestControl.TestParameters.GmailService.AddDelegate(dn, delegate1);
845+
846+
var user = UnitTestControl.TestParameters.UsersService.Get(dn);
847+
848+
var result = ImportProcessor.GetCSEntryChange(user, UnitTestControl.MmsSchema.Types[UnitTestControl.TestUser], UnitTestControl.TestParameters);
849+
850+
Assert.AreEqual(MAImportError.Success, result.ErrorCodeImport);
851+
}
852+
finally
853+
{
854+
if (dn != null)
855+
{
856+
UnitTestControl.TestParameters.UsersService.Delete(dn);
857+
}
858+
859+
if (delegate1 != null)
860+
{
861+
UnitTestControl.TestParameters.UsersService.Delete(delegate1);
862+
}
863+
}
864+
}
865+
814866
[TestMethod]
815867
public void AddDelegate()
816868
{

‎src/Lithnet.GoogleApps.MA.UnitTests/Lithnet.GoogleApps.MA.UnitTests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
<HintPath>..\packages\Google.GData.Extensions.2.2.0.0\lib\Google.GData.Extensions.dll</HintPath>
9191
<Private>True</Private>
9292
</Reference>
93-
<Reference Include="Lithnet.GoogleApps, Version=1.0.7328.27038, Culture=neutral, processorArchitecture=MSIL">
94-
<HintPath>..\packages\Lithnet.GoogleApps.1.0.7328.27038\lib\net452\Lithnet.GoogleApps.dll</HintPath>
93+
<Reference Include="Lithnet.GoogleApps, Version=1.0.7451.20292, Culture=neutral, processorArchitecture=MSIL">
94+
<HintPath>..\packages\Lithnet.GoogleApps.1.0.7451.20292\lib\net452\Lithnet.GoogleApps.dll</HintPath>
9595
</Reference>
9696
<Reference Include="Lithnet.Logging, Version=1.0.5774.20685, Culture=neutral, processorArchitecture=MSIL">
9797
<HintPath>..\packages\Lithnet.Logging.1.0.5774.20685\lib\net40\Lithnet.Logging.dll</HintPath>

‎src/Lithnet.GoogleApps.MA.UnitTests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<package id="Google.GData.Client" version="2.2.0.0" targetFramework="net452" />
1515
<package id="Google.GData.Contacts" version="2.2.0.0" targetFramework="net452" />
1616
<package id="Google.GData.Extensions" version="2.2.0.0" targetFramework="net452" />
17-
<package id="Lithnet.GoogleApps" version="1.0.7328.27038" targetFramework="net452" />
17+
<package id="Lithnet.GoogleApps" version="1.0.7451.20292" targetFramework="net452" />
1818
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net452" />
1919
<package id="Lithnet.MetadirectoryServices" version="1.0.6478.33562" targetFramework="net452" />
2020
<package id="log4net" version="2.0.8" targetFramework="net452" />

‎src/Lithnet.GoogleApps.MA/Lithnet.GoogleApps.MA.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,8 +194,8 @@
194194
<HintPath>..\packages\Google.GData.Extensions.2.2.0.0\lib\Google.GData.Extensions.dll</HintPath>
195195
<Private>True</Private>
196196
</Reference>
197-
<Reference Include="Lithnet.GoogleApps, Version=1.0.7328.27038, Culture=neutral, processorArchitecture=MSIL">
198-
<HintPath>..\packages\Lithnet.GoogleApps.1.0.7328.27038\lib\net452\Lithnet.GoogleApps.dll</HintPath>
197+
<Reference Include="Lithnet.GoogleApps, Version=1.0.7451.20292, Culture=neutral, processorArchitecture=MSIL">
198+
<HintPath>..\packages\Lithnet.GoogleApps.1.0.7451.20292\lib\net452\Lithnet.GoogleApps.dll</HintPath>
199199
</Reference>
200200
<Reference Include="Lithnet.Logging, Version=1.0.5774.20685, Culture=neutral, processorArchitecture=MSIL">
201201
<HintPath>..\packages\Lithnet.Logging.1.0.5774.20685\lib\net40\Lithnet.Logging.dll</HintPath>

‎src/Lithnet.GoogleApps.MA/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<package id="Google.GData.Client" version="2.2.0.0" targetFramework="net452" />
1616
<package id="Google.GData.Contacts" version="2.2.0.0" targetFramework="net452" />
1717
<package id="Google.GData.Extensions" version="2.2.0.0" targetFramework="net452" />
18-
<package id="Lithnet.GoogleApps" version="1.0.7328.27038" targetFramework="net452" />
18+
<package id="Lithnet.GoogleApps" version="1.0.7451.20292" targetFramework="net452" />
1919
<package id="Lithnet.Logging" version="1.0.5774.20685" targetFramework="net452" />
2020
<package id="Lithnet.MetadirectoryServices" version="1.0.6478.33562" targetFramework="net452" />
2121
<package id="log4net" version="2.0.8" targetFramework="net452" />

0 commit comments

Comments
 (0)