Skip to content

Commit c1ca5b3

Browse files
David EllingsworthDavid Ellingsworth
David Ellingsworth
authored and
David Ellingsworth
committed
GH-3530: Switch to file scoped namespacing per Deepsource.
1 parent aa078f4 commit c1ca5b3

File tree

1 file changed

+148
-149
lines changed
  • src/NHibernate.Test/NHSpecificTest/GH3530

1 file changed

+148
-149
lines changed

‎src/NHibernate.Test/NHSpecificTest/GH3530/Fixture.cs

Lines changed: 148 additions & 149 deletions
Original file line numberDiff line numberDiff line change
@@ -6,195 +6,194 @@
66
using NHibernate.SqlTypes;
77
using NUnit.Framework;
88

9-
namespace NHibernate.Test.NHSpecificTest.GH3530
10-
{
11-
[TestFixture]
12-
public class Fixture : BugTestCase
13-
{
14-
private CultureInfo initialCulture;
15-
16-
[OneTimeSetUp]
17-
public void FixtureSetup()
18-
{
19-
initialCulture = CurrentCulture;
20-
}
9+
namespace NHibernate.Test.NHSpecificTest.GH3530;
2110

22-
[OneTimeTearDown]
23-
public void FixtureTearDown()
24-
{
25-
CurrentCulture = initialCulture;
26-
}
11+
[TestFixture]
12+
public class Fixture : BugTestCase
13+
{
14+
private CultureInfo initialCulture;
2715

28-
protected override void OnTearDown()
29-
{
30-
using var session = OpenSession();
31-
using var transaction = session.BeginTransaction();
16+
[OneTimeSetUp]
17+
public void FixtureSetup()
18+
{
19+
initialCulture = CurrentCulture;
20+
}
3221

33-
session.CreateQuery("delete from System.Object").ExecuteUpdate();
22+
[OneTimeTearDown]
23+
public void FixtureTearDown()
24+
{
25+
CurrentCulture = initialCulture;
26+
}
3427

35-
transaction.Commit();
36-
}
28+
protected override void OnTearDown()
29+
{
30+
using var session = OpenSession();
31+
using var transaction = session.BeginTransaction();
3732

38-
protected override void CreateSchema()
39-
{
40-
CreateTable("Integer");
41-
CreateTable("DateTime");
42-
CreateTable("Double");
43-
CreateTable("Decimal");
33+
session.CreateQuery("delete from System.Object").ExecuteUpdate();
4434

45-
base.CreateSchema();
46-
}
35+
transaction.Commit();
36+
}
4737

48-
/// <summary>
49-
/// This function creates the schema for our custom entities.
50-
/// If the SchemaExporter provided a mechanism to override the database
51-
/// type, this method would not be required.
52-
/// </summary>
53-
/// <param name="name"></param>
54-
private void CreateTable(string name)
55-
{
56-
var sb = new StringBuilder();
57-
var guidType = Dialect.GetTypeName(SqlTypeFactory.Guid);
58-
var stringType = Dialect.GetTypeName(SqlTypeFactory.GetAnsiString(255));
38+
protected override void CreateSchema()
39+
{
40+
CreateTable("Integer");
41+
CreateTable("DateTime");
42+
CreateTable("Double");
43+
CreateTable("Decimal");
5944

60-
var catalog = GetQuotedDefaultCatalog();
61-
var schema = GetQuotedDefaultSchema();
62-
var table = GetQualifiedName(catalog, schema, $"{name}Entity");
45+
base.CreateSchema();
46+
}
6347

64-
sb.Append($"{Dialect.CreateTableString} {table} (");
48+
/// <summary>
49+
/// This function creates the schema for our custom entities.
50+
/// If the SchemaExporter provided a mechanism to override the database
51+
/// type, this method would not be required.
52+
/// </summary>
53+
/// <param name="name"></param>
54+
private void CreateTable(string name)
55+
{
56+
var sb = new StringBuilder();
57+
var guidType = Dialect.GetTypeName(SqlTypeFactory.Guid);
58+
var stringType = Dialect.GetTypeName(SqlTypeFactory.GetAnsiString(255));
6559

66-
// Generate columns
67-
sb.Append($"Id {guidType}, ");
68-
sb.Append($"DataValue {stringType}");
60+
var catalog = GetQuotedDefaultCatalog();
61+
var schema = GetQuotedDefaultSchema();
62+
var table = GetQualifiedName(catalog, schema, $"{name}Entity");
6963

70-
// Add the primary key contraint for the identity column
71-
sb.Append($", {Dialect.PrimaryKeyString} ( Id )");
72-
sb.Append(')');
64+
sb.Append($"{Dialect.CreateTableString} {table} (");
7365

74-
using var cn = Sfi.ConnectionProvider.GetConnection();
75-
try
76-
{
77-
using var cmd = cn.CreateCommand();
66+
// Generate columns
67+
sb.Append($"Id {guidType}, ");
68+
sb.Append($"DataValue {stringType}");
7869

79-
cmd.CommandText = sb.ToString();
80-
cmd.ExecuteNonQuery();
81-
}
82-
catch (Exception ex)
83-
{
84-
Assert.Warn($"Creating the schema failed, assuming it already exists. {ex}");
85-
}
86-
finally
87-
{
88-
Sfi.ConnectionProvider.CloseConnection(cn);
89-
}
90-
}
70+
// Add the primary key contraint for the identity column
71+
sb.Append($", {Dialect.PrimaryKeyString} ( Id )");
72+
sb.Append(')');
9173

92-
private string GetQuotedDefaultCatalog()
74+
using var cn = Sfi.ConnectionProvider.GetConnection();
75+
try
9376
{
94-
var t = cfg.GetType();
95-
var getQuotedDefaultCatalog = t.GetMethod("GetQuotedDefaultCatalog", BindingFlags.Instance | BindingFlags.NonPublic);
77+
using var cmd = cn.CreateCommand();
9678

97-
return (string) getQuotedDefaultCatalog.Invoke(cfg, [Dialect]);
79+
cmd.CommandText = sb.ToString();
80+
cmd.ExecuteNonQuery();
9881
}
99-
100-
private string GetQuotedDefaultSchema()
82+
catch (Exception ex)
10183
{
102-
var t = cfg.GetType();
103-
var getQuotedDefaultSchema = t.GetMethod("GetQuotedDefaultSchema", BindingFlags.Instance | BindingFlags.NonPublic);
104-
105-
return (string) getQuotedDefaultSchema.Invoke(cfg, [Dialect]);
84+
Assert.Warn($"Creating the schema failed, assuming it already exists. {ex}");
10685
}
107-
108-
private string GetQualifiedName(string catalog, string schema, string name)
86+
finally
10987
{
110-
return Dialect.Qualify(catalog, schema, name);
88+
Sfi.ConnectionProvider.CloseConnection(cn);
11189
}
90+
}
11291

113-
private void PerformTest<T, U>(CultureInfo from, CultureInfo to, T expectedValue, Action<T, T> assert)
114-
where T : struct
115-
where U : DataEntity<T>, new()
116-
{
117-
object id;
92+
private string GetQuotedDefaultCatalog()
93+
{
94+
var t = cfg.GetType();
95+
var getQuotedDefaultCatalog = t.GetMethod("GetQuotedDefaultCatalog", BindingFlags.Instance | BindingFlags.NonPublic);
11896

119-
CurrentCulture = from;
120-
using (var session = OpenSession())
121-
using (var tx = session.BeginTransaction())
122-
{
123-
var entity = new U()
124-
{
125-
DataValue = expectedValue
126-
};
127-
128-
id = session.Save(entity);
129-
tx.Commit();
130-
}
131-
132-
CurrentCulture = to;
133-
using (var session = OpenSession())
134-
using (var tx = session.BeginTransaction())
135-
{
136-
var entity = session.Get<U>(id);
97+
return (string) getQuotedDefaultCatalog.Invoke(cfg, [Dialect]);
98+
}
13799

138-
assert(expectedValue, entity.DataValue);
139-
}
140-
}
100+
private string GetQuotedDefaultSchema()
101+
{
102+
var t = cfg.GetType();
103+
var getQuotedDefaultSchema = t.GetMethod("GetQuotedDefaultSchema", BindingFlags.Instance | BindingFlags.NonPublic);
141104

142-
[Test, TestCaseSource(nameof(GetTestCases))]
143-
public void TestNHDateTime(CultureInfo from, CultureInfo to)
144-
{
145-
DateTime leapDay = new DateTime(2024, 2, 29, new GregorianCalendar(GregorianCalendarTypes.USEnglish));
105+
return (string) getQuotedDefaultSchema.Invoke(cfg, [Dialect]);
106+
}
146107

147-
PerformTest<DateTime, NHDateTimeEntity>(from, to, leapDay, (expected, actual) => Assert.AreEqual(expected, actual));
148-
}
108+
private string GetQualifiedName(string catalog, string schema, string name)
109+
{
110+
return Dialect.Qualify(catalog, schema, name);
111+
}
149112

150-
[Test, TestCaseSource(nameof(GetTestCases))]
151-
public void TestDateTime(CultureInfo from, CultureInfo to)
113+
private void PerformTest<T, U>(CultureInfo from, CultureInfo to, T expectedValue, Action<T, T> assert)
114+
where T : struct
115+
where U : DataEntity<T>, new()
116+
{
117+
object id;
118+
119+
CurrentCulture = from;
120+
using (var session = OpenSession())
121+
using (var tx = session.BeginTransaction())
152122
{
153-
DateTime leapDay = new DateTime(2024, 2, 29, new GregorianCalendar(GregorianCalendarTypes.USEnglish));
123+
var entity = new U()
124+
{
125+
DataValue = expectedValue
126+
};
154127

155-
PerformTest<DateTime, DateTimeEntity>(from, to, leapDay, (expected, actual) => Assert.AreEqual(expected, actual));
128+
id = session.Save(entity);
129+
tx.Commit();
156130
}
157131

158-
[Test, TestCaseSource(nameof(GetTestCases))]
159-
public void TestDecimal(CultureInfo from, CultureInfo to)
132+
CurrentCulture = to;
133+
using (var session = OpenSession())
134+
using (var tx = session.BeginTransaction())
160135
{
161-
decimal decimalValue = 12.3m;
136+
var entity = session.Get<U>(id);
162137

163-
PerformTest<decimal, DecimalEntity>(from, to, decimalValue, (expected, actual) => Assert.AreEqual(expected, actual));
138+
assert(expectedValue, entity.DataValue);
164139
}
140+
}
165141

166-
[Test, TestCaseSource(nameof(GetTestCases))]
167-
public void TestDouble(CultureInfo from, CultureInfo to)
168-
{
169-
double doubleValue = 12.3d;
142+
[Test, TestCaseSource(nameof(GetTestCases))]
143+
public void TestNHDateTime(CultureInfo from, CultureInfo to)
144+
{
145+
DateTime leapDay = new DateTime(2024, 2, 29, new GregorianCalendar(GregorianCalendarTypes.USEnglish));
170146

171-
PerformTest<double, DoubleEntity>(from, to, doubleValue,
172-
(expected, actual) => Assert.True(Math.Abs(expected - actual) < double.Epsilon, $"Expected: {expected}\nBut was: {actual}\n")
173-
);
174-
}
147+
PerformTest<DateTime, NHDateTimeEntity>(from, to, leapDay, (expected, actual) => Assert.AreEqual(expected, actual));
148+
}
175149

176-
[Test, TestCaseSource(nameof(GetTestCases))]
150+
[Test, TestCaseSource(nameof(GetTestCases))]
151+
public void TestDateTime(CultureInfo from, CultureInfo to)
152+
{
153+
DateTime leapDay = new DateTime(2024, 2, 29, new GregorianCalendar(GregorianCalendarTypes.USEnglish));
177154

178-
public void TestInteger(CultureInfo from, CultureInfo to)
179-
{
180-
int integerValue = 123;
155+
PerformTest<DateTime, DateTimeEntity>(from, to, leapDay, (expected, actual) => Assert.AreEqual(expected, actual));
156+
}
181157

182-
PerformTest<int, IntegerEntity>(from, to, integerValue, (expected, actual) => Assert.AreEqual(expected, actual));
183-
}
158+
[Test, TestCaseSource(nameof(GetTestCases))]
159+
public void TestDecimal(CultureInfo from, CultureInfo to)
160+
{
161+
decimal decimalValue = 12.3m;
184162

185-
private CultureInfo CurrentCulture
186-
{
187-
get => CultureInfo.CurrentCulture;
188-
set => CultureInfo.CurrentCulture = value;
189-
}
163+
PerformTest<decimal, DecimalEntity>(from, to, decimalValue, (expected, actual) => Assert.AreEqual(expected, actual));
164+
}
190165

191-
public static object[][] GetTestCases()
192-
{
193-
return [
194-
[new CultureInfo("en-US"), new CultureInfo("de-DE")],
195-
[new CultureInfo("en-US"), new CultureInfo("ar-SA", false)],
196-
[new CultureInfo("en-US"), new CultureInfo("th-TH", false)],
197-
];
198-
}
166+
[Test, TestCaseSource(nameof(GetTestCases))]
167+
public void TestDouble(CultureInfo from, CultureInfo to)
168+
{
169+
double doubleValue = 12.3d;
170+
171+
PerformTest<double, DoubleEntity>(from, to, doubleValue,
172+
(expected, actual) => Assert.True(Math.Abs(expected - actual) < double.Epsilon, $"Expected: {expected}\nBut was: {actual}\n")
173+
);
174+
}
175+
176+
[Test, TestCaseSource(nameof(GetTestCases))]
177+
178+
public void TestInteger(CultureInfo from, CultureInfo to)
179+
{
180+
int integerValue = 123;
181+
182+
PerformTest<int, IntegerEntity>(from, to, integerValue, (expected, actual) => Assert.AreEqual(expected, actual));
183+
}
184+
185+
private CultureInfo CurrentCulture
186+
{
187+
get => CultureInfo.CurrentCulture;
188+
set => CultureInfo.CurrentCulture = value;
189+
}
190+
191+
public static object[][] GetTestCases()
192+
{
193+
return [
194+
[new CultureInfo("en-US"), new CultureInfo("de-DE")],
195+
[new CultureInfo("en-US"), new CultureInfo("ar-SA", false)],
196+
[new CultureInfo("en-US"), new CultureInfo("th-TH", false)],
197+
];
199198
}
200199
}

0 commit comments

Comments
 (0)