Add & canonize some tests

Vadim Averin · Vadim Averin · commit 4ee28583d219 · 2023-12-27T15:02:44.000Z
diff --git a/ydb/library/yql/udfs/common/ip_base/test/canondata/test.test_Basic_/results.txt b/ydb/library/yql/udfs/common/ip_base/test/canondata/test.test_Basic_/results.txt
@@ -87,6 +87,26 @@
                                         "String"
                                     ]
                                 ]
+                            ];
+                            [
+                                "single_subnet4";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "String"
+                                    ]
+                                ]
+                            ];
+                            [
+                                "single_subnet6";
+                                [
+                                    "OptionalType";
+                                    [
+                                        "DataType";
+                                        "String"
+                                    ]
+                                ]
                             ]
                         ]
                     ]
@@ -113,6 +133,12 @@
                         ];
                         [
                             "127.0.0.0"
+                        ];
+                        [
+                            "127.0.0.1"
+                        ];
+                        [
+                            "127.0.0.1"
                         ]
                     ];
                     [
@@ -136,6 +162,12 @@
                         ];
                         [
                             "::"
+                        ];
+                        [
+                            "::"
+                        ];
+                        [
+                            "::1"
                         ]
                     ];
                     [
@@ -161,6 +193,12 @@
                         ];
                         [
                             "213.180.0.0"
+                        ];
+                        [
+                            "213.180.193.3"
+                        ];
+                        [
+                            "213.180.193.3"
                         ]
                     ];
                     [
@@ -186,6 +224,12 @@
                         ];
                         [
                             "2a02::"
+                        ];
+                        [
+                            "2a02:6b8::"
+                        ];
+                        [
+                            "2a02:6b8::3"
                         ]
                     ];
                     [
@@ -211,6 +255,12 @@
                         ];
                         [
                             "2400::"
+                        ];
+                        [
+                            "2400:cb00::"
+                        ];
+                        [
+                            "2400:cb00:2048:1::681c:1b65"
                         ]
                     ];
                     [
@@ -236,6 +286,12 @@
                         ];
                         [
                             "fe80::"
+                        ];
+                        [
+                            "fe80::"
+                        ];
+                        [
+                            "fe80::215:b2ff:fea9:67ce"
                         ]
                     ];
                     [
@@ -261,6 +317,12 @@
                         ];
                         [
                             "::"
+                        ];
+                        [
+                            "::"
+                        ];
+                        [
+                            "::ffff:77.75.155.3"
                         ]
                     ];
                     [
@@ -272,7 +334,38 @@
                         #;
                         #;
                         #;
+                        #;
+                        #;
                         #
+                    ];
+                    [
+                        [
+                            "\0\0\0\0"
+                        ];
+                        [
+                            "0.0.0.0"
+                        ];
+                        %true;
+                        %false;
+                        %false;
+                        [
+                            "::ffff:0.0.0.0"
+                        ];
+                        [
+                            "0.0.0.0"
+                        ];
+                        [
+                            "0.0.0.0"
+                        ];
+                        [
+                            "0.0.0.0"
+                        ];
+                        [
+                            "0.0.0.0"
+                        ];
+                        [
+                            "0.0.0.0"
+                        ]
                     ]
                 ]
             }
diff --git a/ydb/library/yql/udfs/common/ip_base/test/cases/Basic.in b/ydb/library/yql/udfs/common/ip_base/test/cases/Basic.in
@@ -6,3 +6,4 @@
 {"key"="fe80::215:b2ff:fea9:67ce";"subkey"="";"value"=""};
 {"key"="::ffff:77.75.155.3";"subkey"="";"value"=""};
 {"key"="sdfsdfsdf";"subkey"="";"value"=""};
+{"key"="0.0.0.0";"subkey"="";value=""};
diff --git a/ydb/library/yql/udfs/common/ip_base/test/cases/Basic.sql b/ydb/library/yql/udfs/common/ip_base/test/cases/Basic.sql
@@ -8,7 +8,9 @@ SELECT
     Ip::ToString(Ip::ConvertToIPv6(internal_representation)) AS all_ipv6,
     Ip::ToString(Ip::GetSubnet(internal_representation)) AS default_subnet,
     Ip::ToString(Ip::GetSubnet(internal_representation, 125)) AS small_subnet,
-    Ip::ToString(Ip::GetSubnet(internal_representation, 16)) AS large_subnet
+    Ip::ToString(Ip::GetSubnet(internal_representation, 16)) AS large_subnet,
+    Ip::ToString(Ip::GetSubnet(internal_representation, 32)) AS single_subnet4,
+    Ip::ToString(Ip::GetSubnet(internal_representation, 128)) AS single_subnet6
 FROM (
     SELECT Ip::FromString(key) AS internal_representation FROM Input
 );

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,26 @@`
`87`	`87`	`"String"`
`88`	`88`	`]`
`89`	`89`	`]`
	`90`	`+ ];`
	`91`	`+ [`
	`92`	`+ "single_subnet4";`
	`93`	`+ [`
	`94`	`+ "OptionalType";`
	`95`	`+ [`
	`96`	`+ "DataType";`
	`97`	`+ "String"`
	`98`	`+ ]`
	`99`	`+ ]`
	`100`	`+ ];`
	`101`	`+ [`
	`102`	`+ "single_subnet6";`
	`103`	`+ [`
	`104`	`+ "OptionalType";`
	`105`	`+ [`
	`106`	`+ "DataType";`
	`107`	`+ "String"`
	`108`	`+ ]`
	`109`	`+ ]`
`90`	`110`	`]`
`91`	`111`	`]`
`92`	`112`	`]`
`@@ -113,6 +133,12 @@`
`113`	`133`	`];`
`114`	`134`	`[`
`115`	`135`	`"127.0.0.0"`
	`136`	`+ ];`
	`137`	`+ [`
	`138`	`+ "127.0.0.1"`
	`139`	`+ ];`
	`140`	`+ [`
	`141`	`+ "127.0.0.1"`
`116`	`142`	`]`
`117`	`143`	`];`
`118`	`144`	`[`
`@@ -136,6 +162,12 @@`
`136`	`162`	`];`
`137`	`163`	`[`
`138`	`164`	`"::"`
	`165`	`+ ];`
	`166`	`+ [`
	`167`	`+ "::"`
	`168`	`+ ];`
	`169`	`+ [`
	`170`	`+ "::1"`
`139`	`171`	`]`
`140`	`172`	`];`
`141`	`173`	`[`
`@@ -161,6 +193,12 @@`
`161`	`193`	`];`
`162`	`194`	`[`
`163`	`195`	`"213.180.0.0"`
	`196`	`+ ];`
	`197`	`+ [`
	`198`	`+ "213.180.193.3"`
	`199`	`+ ];`
	`200`	`+ [`
	`201`	`+ "213.180.193.3"`
`164`	`202`	`]`
`165`	`203`	`];`
`166`	`204`	`[`
`@@ -186,6 +224,12 @@`
`186`	`224`	`];`
`187`	`225`	`[`
`188`	`226`	`"2a02::"`
	`227`	`+ ];`
	`228`	`+ [`
	`229`	`+ "2a02:6b8::"`
	`230`	`+ ];`
	`231`	`+ [`
	`232`	`+ "2a02:6b8::3"`
`189`	`233`	`]`
`190`	`234`	`];`
`191`	`235`	`[`
`@@ -211,6 +255,12 @@`
`211`	`255`	`];`
`212`	`256`	`[`
`213`	`257`	`"2400::"`
	`258`	`+ ];`
	`259`	`+ [`
	`260`	`+ "2400:cb00::"`
	`261`	`+ ];`
	`262`	`+ [`
	`263`	`+ "2400:cb00:2048:1::681c:1b65"`
`214`	`264`	`]`
`215`	`265`	`];`
`216`	`266`	`[`
`@@ -236,6 +286,12 @@`
`236`	`286`	`];`
`237`	`287`	`[`
`238`	`288`	`"fe80::"`
	`289`	`+ ];`
	`290`	`+ [`
	`291`	`+ "fe80::"`
	`292`	`+ ];`
	`293`	`+ [`
	`294`	`+ "fe80::215:b2ff:fea9:67ce"`
`239`	`295`	`]`
`240`	`296`	`];`
`241`	`297`	`[`
`@@ -261,6 +317,12 @@`
`261`	`317`	`];`
`262`	`318`	`[`
`263`	`319`	`"::"`
	`320`	`+ ];`
	`321`	`+ [`
	`322`	`+ "::"`
	`323`	`+ ];`
	`324`	`+ [`
	`325`	`+ "::ffff:77.75.155.3"`
`264`	`326`	`]`
`265`	`327`	`];`
`266`	`328`	`[`
`@@ -272,7 +334,38 @@`
`272`	`334`	`#;`
`273`	`335`	`#;`
`274`	`336`	`#;`
	`337`	`+ #;`
	`338`	`+ #;`
`275`	`339`	`#`
	`340`	`+ ];`
	`341`	`+ [`
	`342`	`+ [`
	`343`	`+ "\0\0\0\0"`
	`344`	`+ ];`
	`345`	`+ [`
	`346`	`+ "0.0.0.0"`
	`347`	`+ ];`
	`348`	`+ %true;`
	`349`	`+ %false;`
	`350`	`+ %false;`
	`351`	`+ [`
	`352`	`+ "::ffff:0.0.0.0"`
	`353`	`+ ];`
	`354`	`+ [`
	`355`	`+ "0.0.0.0"`
	`356`	`+ ];`
	`357`	`+ [`
	`358`	`+ "0.0.0.0"`
	`359`	`+ ];`
	`360`	`+ [`
	`361`	`+ "0.0.0.0"`
	`362`	`+ ];`
	`363`	`+ [`
	`364`	`+ "0.0.0.0"`
	`365`	`+ ];`
	`366`	`+ [`
	`367`	`+ "0.0.0.0"`
	`368`	`+ ]`
`276`	`369`	`]`
`277`	`370`	`]`
`278`	`371`	`}`