Skip to content

Commit 35555f3

Browse files
rdulminardulmina
committed
Revert "Fix set of failing test due to type mismatch"
This reverts commit f1ebb95
1 parent fb628eb commit 35555f3

File tree

7 files changed

+20
-37
lines changed

7 files changed

+20
-37
lines changed

‎tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/ClosedRecordTypeInclusionTest.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import io.ballerina.runtime.api.types.TypeTags;
2323
import io.ballerina.runtime.api.utils.StringUtils;
24-
import io.ballerina.runtime.api.utils.TypeUtils;
2524
import io.ballerina.runtime.api.values.BMap;
2625
import io.ballerina.runtime.api.values.BObject;
2726
import org.ballerinalang.test.BAssertUtil;
@@ -122,7 +121,7 @@ public void testRefTypes() {
122121
assertEquals(getType(foo2.get(StringUtils.fromString("rp"))).getTag(), TypeTags.OBJECT_TYPE_TAG);
123122
assertEquals(((BObject) foo2.get(StringUtils.fromString("rp"))).get(StringUtils.fromString("name")).toString(),
124123
"John Doe");
125-
assertEquals(TypeUtils.getReferredType(getType(foo2.get(StringUtils.fromString("ra")))).getTag(),
124+
assertEquals(getType(foo2.get(StringUtils.fromString("ra"))).getTag(),
126125
TypeTags.RECORD_TYPE_TAG);
127126
assertEquals(foo2.get(StringUtils.fromString("ra")).toString(), "{\"city\":\"Colombo\",\"country\":\"Sri " +
128127
"Lanka\"}");
@@ -134,8 +133,7 @@ public void testRefTypes() {
134133
assertEquals(getType(foo2.get(StringUtils.fromString("rp"))).getTag(), TypeTags.OBJECT_TYPE_TAG);
135134
assertEquals(((BObject) foo2.get(StringUtils.fromString("crp"))).get(StringUtils.fromString("name")).toString(),
136135
"Jane Doe");
137-
assertEquals(TypeUtils.getReferredType(getType(foo2.get(StringUtils.fromString("cra")))).getTag(),
138-
TypeTags.RECORD_TYPE_TAG);
136+
assertEquals(getType(foo2.get(StringUtils.fromString("cra"))).getTag(), TypeTags.RECORD_TYPE_TAG);
139137
assertEquals(foo2.get(StringUtils.fromString("cra")).toString(), "{\"city\":\"Colombo\",\"country\":\"Sri " +
140138
"Lanka\"}");
141139
}

‎tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bala/record/OpenRecordTypeInclusionTest.java

+2-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121

2222
import io.ballerina.runtime.api.types.TypeTags;
2323
import io.ballerina.runtime.api.utils.StringUtils;
24-
import io.ballerina.runtime.api.utils.TypeUtils;
2524
import io.ballerina.runtime.api.values.BMap;
2625
import io.ballerina.runtime.api.values.BObject;
2726
import org.ballerinalang.test.BAssertUtil;
@@ -113,8 +112,7 @@ public void testRefTypes() {
113112
assertEquals(getType(foo2.get(StringUtils.fromString("rp"))).getTag(), TypeTags.OBJECT_TYPE_TAG);
114113
assertEquals(((BObject) foo2.get(StringUtils.fromString("rp"))).get(StringUtils.fromString("name")).toString(),
115114
"John Doe");
116-
assertEquals(TypeUtils.getReferredType(getType(foo2.get(StringUtils.fromString("ra")))).getTag(),
117-
TypeTags.RECORD_TYPE_TAG);
115+
assertEquals(getType(foo2.get(StringUtils.fromString("ra"))).getTag(), TypeTags.RECORD_TYPE_TAG);
118116
assertEquals(foo2.get(StringUtils.fromString("ra")).toString(),
119117
"{\"city\":\"Colombo\",\"country\":\"Sri Lanka\"}");
120118
assertEquals(getType(foo2.get(StringUtils.fromString("crx"))).getTag(), TypeTags.XML_ELEMENT_TAG);
@@ -125,8 +123,7 @@ public void testRefTypes() {
125123
assertEquals(getType(foo2.get(StringUtils.fromString("rp"))).getTag(), TypeTags.OBJECT_TYPE_TAG);
126124
assertEquals(((BObject) foo2.get(StringUtils.fromString("crp"))).get(StringUtils.fromString("name")).toString(),
127125
"Jane Doe");
128-
assertEquals(TypeUtils.getReferredType(getType(foo2.get(StringUtils.fromString("cra")))).getTag(),
129-
TypeTags.RECORD_TYPE_TAG);
126+
assertEquals(getType(foo2.get(StringUtils.fromString("cra"))).getTag(), TypeTags.RECORD_TYPE_TAG);
130127
assertEquals(foo2.get(StringUtils.fromString("cra")).toString(),
131128
"{\"city\":\"Colombo\",\"country\":\"Sri Lanka\"}");
132129
}

‎tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/ClosedRecordOptionalFieldsTest.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
*/
1818
package org.ballerinalang.test.record;
1919

20-
import io.ballerina.runtime.api.types.Type;
21-
import io.ballerina.runtime.api.types.TypeTags;
20+
import io.ballerina.runtime.api.TypeTags;
2221
import io.ballerina.runtime.api.utils.StringUtils;
23-
import io.ballerina.runtime.api.utils.TypeUtils;
2422
import io.ballerina.runtime.api.values.BArray;
2523
import io.ballerina.runtime.api.values.BMap;
2624
import org.ballerinalang.test.BAssertUtil;
@@ -135,14 +133,12 @@ public void testOptionalNonDefField4() {
135133
BArray returns = (BArray) BRunUtil.invoke(compileResult, "testOptionalNonDefField4");
136134
Assert.assertEquals(returns.get(0).toString(), "{\"street\":\"Palm Grove\",\"city\":\"Colombo 3\"," +
137135
"\"country\":\"LK\"}");
138-
Type type = TypeUtils.getReferredType(getType(returns.get(0)));
139-
Assert.assertEquals(type.getTag(), TypeTags.RECORD_TYPE_TAG);
140-
Assert.assertEquals(type.getName(), "Address3");
136+
Assert.assertEquals(getType(returns.get(0)).getTag(), TypeTags.RECORD_TYPE_TAG);
137+
Assert.assertEquals(getType(returns.get(0)).getName(), "Address3");
141138
Assert.assertEquals(returns.get(1).toString(), "{\"street\":\"Palm Grove\",\"city\":\"Colombo 3\"," +
142139
"\"country\":\"LK\"}");
143-
type = TypeUtils.getReferredType(getType(returns.get(1)));
144-
Assert.assertEquals(type.getTag(), TypeTags.RECORD_TYPE_TAG);
145-
Assert.assertEquals(type.getName(), "Address3");
140+
Assert.assertEquals(getType(returns.get(1)).getTag(), TypeTags.RECORD_TYPE_TAG);
141+
Assert.assertEquals(getType(returns.get(1)).getName(), "Address3");
146142
}
147143

148144
@Test(description = "Test defaultable user defined type as an optional field")

‎tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/record/OpenRecordOptionalFieldsTest.java

+5-9
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,8 @@
1717
*/
1818
package org.ballerinalang.test.record;
1919

20-
import io.ballerina.runtime.api.types.Type;
21-
import io.ballerina.runtime.api.types.TypeTags;
20+
import io.ballerina.runtime.api.TypeTags;
2221
import io.ballerina.runtime.api.utils.StringUtils;
23-
import io.ballerina.runtime.api.utils.TypeUtils;
2422
import io.ballerina.runtime.api.values.BArray;
2523
import io.ballerina.runtime.api.values.BMap;
2624
import org.ballerinalang.test.BAssertUtil;
@@ -138,14 +136,12 @@ public void testOptionalNonDefField4() {
138136
BArray returns = (BArray) BRunUtil.invoke(compileResult, "testOptionalNonDefField4");
139137
Assert.assertEquals(returns.get(0).toString(),
140138
"{\"street\":\"Palm Grove\",\"city\":\"Colombo 3\",\"country\":\"LK\"}");
141-
Type type = TypeUtils.getReferredType(getType(returns.get(0)));
142-
Assert.assertEquals(type.getTag(), TypeTags.RECORD_TYPE_TAG);
143-
Assert.assertEquals(type.getName(), "Address3");
139+
Assert.assertEquals(getType(returns.get(0)).getTag(), TypeTags.RECORD_TYPE_TAG);
140+
Assert.assertEquals(getType(returns.get(0)).getName(), "Address3");
144141
Assert.assertEquals(returns.get(1).toString(),
145142
"{\"street\":\"Palm Grove\",\"city\":\"Colombo 3\",\"country\":\"LK\"}");
146-
type = TypeUtils.getReferredType(getType(returns.get(1)));
147-
Assert.assertEquals(type.getTag(), TypeTags.RECORD_TYPE_TAG);
148-
Assert.assertEquals(type.getName(), "Address3");
143+
Assert.assertEquals(getType(returns.get(1)).getTag(), TypeTags.RECORD_TYPE_TAG);
144+
Assert.assertEquals(getType(returns.get(1)).getName(), "Address3");
149145
}
150146

151147
@Test(description = "Test defaultable user defined type as an optional field")

‎tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTernaryConvTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
package org.ballerinalang.test.types.anydata;
2020

2121
import io.ballerina.runtime.api.types.TypeTags;
22-
import io.ballerina.runtime.api.utils.TypeUtils;
2322
import io.ballerina.runtime.api.values.BArray;
2423
import io.ballerina.runtime.internal.types.BArrayType;
2524
import org.ballerinalang.test.BCompileUtil;
@@ -74,7 +73,7 @@ public void testAnydataToXml() {
7473
@Test(description = "Test anydata to record conversion")
7574
public void testAnydataToRecord() {
7675
BArray returns = (BArray) BRunUtil.invoke(result, "testAnydataToRecord");
77-
assertEquals(TypeUtils.getReferredType(getType(returns.get(0))).getTag(), TypeTags.RECORD_TYPE_TAG);
76+
assertEquals(getType(returns.get(0)).getTag(), TypeTags.RECORD_TYPE_TAG);
7877
assertEquals(returns.get(0).toString(), "{\"a\":15}");
7978
}
8079

@@ -98,8 +97,8 @@ public void testAnydataToUnion2() {
9897
BArray returns = (BArray) BRunUtil.invoke(result, "testAnydataToUnion2");
9998
assertEquals(getType(returns.get(0)).getTag(), TypeTags.MAP_TAG);
10099
assertEquals(getType(returns.get(1)).getTag(), TypeTags.XML_ELEMENT_TAG);
101-
assertEquals(TypeUtils.getReferredType(getType(returns.get(2))).getTag(), TypeTags.RECORD_TYPE_TAG);
102-
assertEquals(TypeUtils.getReferredType(getType(returns.get(3))).getTag(), TypeTags.RECORD_TYPE_TAG);
100+
assertEquals(getType(returns.get(2)).getTag(), TypeTags.RECORD_TYPE_TAG);
101+
assertEquals(getType(returns.get(3)).getTag(), TypeTags.RECORD_TYPE_TAG);
103102
assertEquals(returns.get(0).toString(), "{\"name\":\"apple\",\"color\":\"red\",\"price\":40}");
104103
assertEquals(returns.get(1).toString(), "<book>The Lost World</book>");
105104
assertEquals(returns.get(2).toString(), "{\"a\":15}");

‎tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/anydata/AnydataTest.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
import io.ballerina.runtime.api.types.TypeTags;
2222
import io.ballerina.runtime.api.utils.StringUtils;
23-
import io.ballerina.runtime.api.utils.TypeUtils;
2423
import io.ballerina.runtime.api.values.BArray;
2524
import io.ballerina.runtime.api.values.BMap;
2625
import io.ballerina.runtime.api.values.BXml;
@@ -183,7 +182,7 @@ public void testAnydataToXml() {
183182
@Test(description = "Test anydata to record conversion")
184183
public void testAnydataToRecord() {
185184
BArray returns = (BArray) BRunUtil.invoke(result, "testAnydataToRecord");
186-
assertEquals(TypeUtils.getReferredType(getType(returns.get(0))).getTag(), TypeTags.RECORD_TYPE_TAG);
185+
assertEquals(getType(returns.get(0)).getTag(), TypeTags.RECORD_TYPE_TAG);
187186
assertEquals(returns.get(0).toString(), "{\"a\":15}");
188187
}
189188

‎tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/types/typedesc/TypedescTests.java

+2-4
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
*/
1717
package org.ballerinalang.test.types.typedesc;
1818

19-
import io.ballerina.runtime.api.types.TypeTags;
20-
import io.ballerina.runtime.api.utils.TypeUtils;
19+
import io.ballerina.runtime.api.TypeTags;
2120
import io.ballerina.runtime.api.values.BArray;
2221
import io.ballerina.runtime.api.values.BTypedesc;
2322
import org.ballerinalang.test.BCompileUtil;
@@ -125,8 +124,7 @@ public void testRecordTypes() {
125124
Assert.assertEquals(returns.size(), 2);
126125
Assert.assertEquals(returns.get(0).toString(), "typedesc RecordA");
127126
Assert.assertTrue(returns.get(1) instanceof BTypedesc);
128-
Assert.assertEquals(TypeTags.RECORD_TYPE_TAG,
129-
TypeUtils.getReferredType(((BTypedesc) returns.get(1)).getDescribingType()).getTag());
127+
Assert.assertEquals(TypeTags.RECORD_TYPE_TAG, ((BTypedesc) returns.get(1)).getDescribingType().getTag());
130128
}
131129

132130
@Test(description = "Test any to typedesc cast")

0 commit comments

Comments
 (0)