Skip to content

Commit

Permalink
Revert "test projects in .net 4.0".
Browse files Browse the repository at this point in the history
Test runner had issues.
  • Loading branch information
mausch committed May 17, 2012
1 parent ab6b44b commit d644ff0
Show file tree
Hide file tree
Showing 8 changed files with 27 additions and 19 deletions.
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AutofacContrib.SolrNet.Tests</RootNamespace>
<AssemblyName>AutofacContrib.SolrNet.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
Expand Down
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Castle.Facilities.SolrNetIntegration.Tests</RootNamespace>
<AssemblyName>Castle.Facilities.SolrNetIntegration.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand Down
2 changes: 1 addition & 1 deletion NHibernate.SolrNet.Tests/NHibernate.SolrNet.Tests.csproj
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>NHibernate.SolrNet.Tests</RootNamespace>
<AssemblyName>NHibernate.SolrNet.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand Down
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Ninject.Integration.SolrNet.Tests</RootNamespace>
<AssemblyName>Ninject.Integration.SolrNet.Tests</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<FileUpgradeFlags>
</FileUpgradeFlags>
Expand Down
2 changes: 1 addition & 1 deletion SolrNet.DSL.Tests/SolrNet.DSL.Tests.csproj
Expand Up @@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand Down
31 changes: 19 additions & 12 deletions SolrNet.Tests/DateTimeFieldParserTests.cs
Expand Up @@ -29,7 +29,8 @@ public class DateTimeFieldParserTests {
public static IEnumerable<Test> ParseYears() {
return parsedDates.Select(pd => {
var name = "ParseYears " + pd.Key;
return new TestCase(name, () => Assert.AreEqual(pd.Value, DateTimeFieldParser.ParseDate(pd.Key)));
Test t = new TestCase(name, () => Assert.AreEqual(pd.Value, DateTimeFieldParser.ParseDate(pd.Key)));
return t;
});
}

Expand All @@ -44,23 +45,29 @@ public class DateTimeFieldParserTests {

[StaticTestFactory]
public static IEnumerable<Test> RoundTrip() {
return dateTimes.Select(dt => new TestCase("RoundTrip " + dt, () => {
var value = DateTimeFieldParser.ParseDate(DateTimeFieldSerializer.SerializeDate(dt));
Assert.AreEqual(dt, value);
}));
return dateTimes.Select(dt => {
Test t = new TestCase("RoundTrip " + dt, () => {
var value = DateTimeFieldParser.ParseDate(DateTimeFieldSerializer.SerializeDate(dt));
Assert.AreEqual(dt, value);
});
return t;
});
}

[StaticTestFactory]
public static IEnumerable<Test> NullableRoundTrips() {
var parser = new NullableFieldParser(new DateTimeFieldParser());
var serializer = new NullableFieldSerializer(new DateTimeFieldSerializer());
return dateTimes.Select(dt => new TestCase("NullableRoundTrips " + dt, () => {
var s = serializer.Serialize(dt).First().FieldValue;
var xml = new XDocument();
xml.Add(new XElement("date", s));
var value = (DateTime?)parser.Parse(xml.Root, typeof(DateTime?));
Assert.AreEqual(dt, value);
}));
return dateTimes.Select(dt => {
Test t = new TestCase("NullableRoundTrips " + dt, () => {
var s = serializer.Serialize(dt).First().FieldValue;
var xml = new XDocument();
xml.Add(new XElement("date", s));
var value = (DateTime?) parser.Parse(xml.Root, typeof (DateTime?));
Assert.AreEqual(dt, value);
});
return t;
});
}

private static readonly IEnumerable<DateTime> dateTimes =
Expand Down
3 changes: 2 additions & 1 deletion SolrNet.Tests/LocalParamsTests.cs
Expand Up @@ -51,7 +51,8 @@ public class LocalParamsTests {
return testParams.Select(dv => {
var expectedResult = dv.Value;
var localParams = dv.Key;
return new TestCase(expectedResult, () => Assert.AreEqual(expectedResult, new LocalParams(localParams).ToString()));
Test t = new TestCase(expectedResult, () => Assert.AreEqual(expectedResult, new LocalParams(localParams).ToString()));
return t;
});
}

Expand Down
2 changes: 1 addition & 1 deletion SolrNet.Tests/SolrNet.Tests.csproj
Expand Up @@ -15,7 +15,7 @@
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
<TargetFrameworkProfile />
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
Expand Down

0 comments on commit d644ff0

Please sign in to comment.