Added Assertions #238

naanaowusu · 2023-02-27T09:32:07Z

There are several assertions i added

Anisimova2020 · 2023-03-06T10:54:06Z

Docker/Postgres/scripts/container/run.sh

@@ -4,7 +4,7 @@ environmentFile=../environment_test.sh
 docker run -d \
 --name=postgres \
 -e POSTGRES_shared_buffers=${DB_POSTGRES_shared_buffers} \
- -p 5432:5432 \
+ -p 5433:5432 \


It should not be commited.

Anisimova2020 · 2023-03-06T10:54:22Z

Docker/Postgres/scripts/swarm/cloud.yml

@@ -4,7 +4,7 @@ services:
 postgres:
 image: flexberry/alt.p8-postgresql
 ports:
- - 5432:5432
+ - 5433:5432


It should not be commited.

Anisimova2020 · 2023-03-06T10:54:31Z

NewPlatform.Flexberry.ORM.IntegratedTests/App.config

@@ -6,7 +6,7 @@
 </configSections>
 <connectionStrings>
 <!-- Please set up your own database connection strings before you run integrated tests. -->
- <add name="ConnectionStringPostgres" connectionString="" />
+ <add name="ConnectionStringPostgres" connectionString="SERVER=localhost;User ID=postgres;Password=p@ssw0rd;Port=5433;" />


It should not be commited.

Anisimova2020 · 2023-03-06T10:55:50Z

NewPlatform.Flexberry.ORM.IntegratedTests/Common/ForeachWithMethodTest.cs

@@ -2,7 +2,7 @@
 {
 using System;
 using System.Collections.Generic;
-
+ using System.Diagnostics;


What is this using added here for?

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

Anisimova2020 · 2023-03-06T15:19:42Z

...rm.Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business/SQLDataServiceGenerateSQLTests.cs

@@ -114,6 +114,11 @@ public void GenerateSQLSelectSingleJoinTest()
 ds.ExecuteNonQuery(query1);
 ds.ExecuteNonQuery(query2);
 ds.ExecuteNonQuery(query3);
+
+ Assert.DoesNotContain(query0, "LEFT JOIN");


Для чистоты эксперимента нужно делать query0.ToUpper() и аналогично ниже.

Anisimova2020 · 2023-03-06T15:26:12Z

NewPlatform.Flexberry.ORM.Tests/ICSSoft.STORMNET.Business/BusinessServerOrderTest.cs

+ Assert.Equal("A", ((OrderedCls)entrysl.Value).Name);
+ }
+
+ // Assert.Equal("A", ((OrderedCls)((DictionaryEntry)myValueList[0]).Value).Name);


We don't commit commented code.

Anisimova2020 · 2023-03-06T15:29:37Z

NewPlatform.Flexberry.ORM.Tests/ICSSoft.STORMNET.Business/BusinessServerOrderTest.cs

@@ -73,6 +73,32 @@ public void TestMethod1()
 {
 Console.WriteLine(((OrderedCls)((DictionaryEntry)cls).Value).Name);
 }
+
+ IList myOrderList = sl.GetKeyList();


As i remember we planned to add asserts on LST, BSS, S1 to this method.

Anisimova2020 · 2023-03-06T15:29:54Z

docker-compose.yml

@@ -4,7 +4,7 @@ services:
 postgres:
 image: flexberry/alt.p8-postgresql-postgis
 ports:
- - 5432:5432
+ - 5433:5432


We should not commit this.

Anisimova2020 · 2023-03-06T15:30:28Z

docker-compose.yml.bak

@@ -0,0 +1,12 @@
+version: '3.2'


This file should not be commited to server.

Anisimova2020 · 2023-04-04T04:34:05Z

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

 var ds = (SQLDataService)dataService;
 ds.UpdateObjects(ref objs);

- var v = new View(new ViewAttribute("AllProps", new string[] { "*" }), typeof(Кошка));
+ View v = new View(new ViewAttribute("AllProps", new string[] { "*" }), typeof(Кошка));
 var ob = ds.LoadObjects(v);


var стоит заменить на реальный тип.
Проверить, что "ob" не NULL и проверить количество элементов (через Assert).

Anisimova2020 · 2023-04-04T04:55:46Z

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

+ View plantView = Plant2.Views.Plant2E;
+
+ IQueryable<Plant2> plant2s = ds.Query<Plant2>(plantView)
+ .Where(x => x.__PrimaryKey == cls1.__PrimaryKey);


В конце этой конструкции нужно добавить ToList(); Тогда plant2s будет типа List.

После этого нужно сделать не только
Assert.NotNull(plant2s);, но и Assert.Equal(..., plant2s.Length)

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

Anisimova2020 · 2023-04-04T04:58:52Z

NewPlatform.Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business/DataServiceSpeedTest.cs

@@ -2,7 +2,6 @@
 {
 using System;
 using System.Diagnostics;
-


Здесь эта строка нужная.
Using, которые начинаются с System, отделяются от остальных пустой строчкой.

Anisimova2020 · 2023-04-04T05:08:12Z

...rm.Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business/SQLDataServiceGenerateSQLTests.cs

@@ -114,6 +114,11 @@ public void GenerateSQLSelectSingleJoinTest()
 ds.ExecuteNonQuery(query1);
 ds.ExecuteNonQuery(query2);
 ds.ExecuteNonQuery(query3);
+
+ Assert.DoesNotContain(query0.ToUpper(), "LEFT JOIN");


DoesNotContain(expectedSubString, actualString) (https://metanit.com/sharp/aspnet5/22.3.php)

Это значит, что первый параметр - это подстрока, а второй - строка, где мы ищем эту подстроку. Соответственно, нужно

Assert.DoesNotContain("LEFT JOIN", query0.ToUpper())

Anisimova2020 · 2023-04-10T05:25:33Z

NewPlatform.Flexberry.ORM.IntegratedTests/Common/TypeFullNameTest.cs

@@ -19,6 +19,7 @@ public void GetUsableTypeNameTest()
 str = Nullable.GetUnderlyingType(tBool).FullName;
 Console.WriteLine(str);
 Console.WriteLine(Nullable.GetUnderlyingType(typeof(int)) == null ? "null" : Nullable.GetUnderlyingType(typeof(int)).FullName);
+ Assert.Null(Nullable.GetUnderlyingType(typeof(int)));


Лучше "Nullable.GetUnderlyingType(typeof(int))" в отдельную переменную, а потом использовать в строчках:

Console.WriteLine(Nullable.GetUnderlyingType(typeof(int)) == null ? "null" : Nullable.GetUnderlyingType(typeof(int)).FullName);
Assert.Null(Nullable.GetUnderlyingType(typeof(int)));

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

Anisimova2020 · 2023-04-10T05:28:04Z

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

- var ob = ds.LoadObjects(v);
+ View v = new View(new ViewAttribute("AllProps", new string[] { "*" }), typeof(Кошка));
+ DataObject[] ob = ds.LoadObjects(v);
+ Assert.NotNull(ob);

 var l = ds.Query<Медведь>(Медведь.Views.МедведьE).Where(


Сразу замени var на реальный тип.

Anisimova2020 · 2023-04-10T05:32:16Z

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

+
+ View plantView = Plant2.Views.Plant2E;
+
+ IQueryable<Plant2> plant2s = ds.Query<Plant2>(plantView)


I can not understand.

"IQueryable plant2s = ds.Query(plantView).Where(x => x.__PrimaryKey == cls1.__PrimaryKey);"

and

"Plant2 cl = new Plant2();
cl.SetExistObjectPrimaryKey(cls1.__PrimaryKey);
ds.LoadObject(plantView, cl);
Assert.NotNull(cl);"

make the same. What for is there two same checks? Only one should be.

Anisimova2020 · 2023-04-10T05:32:28Z

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs

+
+ View cabbageView = Cabbage2.Views.Cabbage2E;
+
+ IQueryable<Cabbage2> cabbage2s = ds.Query<Cabbage2>(cabbageView)


sonarcloud · 2023-04-10T08:28:36Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

No Coverage information
No Duplication information

Added assertions

a4eebe7

Anisimova2020 self-requested a review March 7, 2023 06:08

Anisimova2020 reviewed Mar 7, 2023

View reviewed changes

Nana Appiah added 2 commits March 24, 2023 11:57

Changes made based on comments

d3b296a

Removed unnecessary files

f7e7fff

Anisimova2020 reviewed Apr 4, 2023

View reviewed changes

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs Outdated Show resolved Hide resolved

Anisimova2020 reviewed Apr 4, 2023

View reviewed changes

Nana Appiah added 2 commits April 6, 2023 17:09

Made changes based on comments

602a399

Corrected the test

3eaf98e

Anisimova2020 reviewed Apr 10, 2023

View reviewed changes

...Flexberry.ORM.IntegratedTests/ICSSoft.STORMNET.Business.LINQProvider/LinqODataServiceTest.cs Show resolved Hide resolved

Anisimova2020 reviewed Apr 10, 2023

View reviewed changes

changes made based on comment

a81877c

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Assertions #238

Added Assertions #238

naanaowusu commented Feb 27, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Mar 6, 2023

Anisimova2020 Apr 4, 2023

Anisimova2020 Apr 4, 2023

Anisimova2020 Apr 4, 2023

Anisimova2020 Apr 4, 2023

Anisimova2020 Apr 10, 2023

Anisimova2020 Apr 10, 2023

Anisimova2020 Apr 10, 2023

Anisimova2020 Apr 10, 2023

sonarcloud bot commented Apr 10, 2023


		View plantView = Plant2.Views.Plant2E;

		IQueryable<Plant2> plant2s = ds.Query<Plant2>(plantView)


		View cabbageView = Cabbage2.Views.Cabbage2E;

		IQueryable<Cabbage2> cabbage2s = ds.Query<Cabbage2>(cabbageView)

Added Assertions #238

Are you sure you want to change the base?

Added Assertions #238

Conversation

naanaowusu commented Feb 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sonarcloud bot commented Apr 10, 2023