Skip to content

Commit c68c364

Browse files
authored
[CQ] debugability: fix mis-ordered asserts (#8019)
Similar to #8015. Fix order of `actual` and `expected` assert args to keep debugging sane. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read the [Flutter Style Guide] _recently_, and have followed its advice. - [x] I signed the [CLA]. - [ ] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/master/docs/contributing/Style-guide-for-Flutter-repo.md [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/master/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/master/docs/contributing/Chat.md
1 parent 9e05441 commit c68c364

File tree

3 files changed

+48
-48
lines changed

3 files changed

+48
-48
lines changed

flutter-idea/testSrc/unit/io/flutter/run/FlutterPositionMapperTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public void shouldGetPositionInFileUnderRemoteSourceRoot() throws Exception {
7373
final XSourcePosition pos = mapper.getSourcePosition("1", makeScriptRef("2", "some/stuff/to/ignore/lib/hello.dart"), 123, null);
7474
assertNotNull(pos);
7575
assertEquals(pos.getFile(), hello);
76-
assertEquals(pos.getLine(), 9); // zero-based
76+
assertEquals(9, pos.getLine()); // zero-based
7777
}
7878

7979
@Test
@@ -90,7 +90,7 @@ public void shouldGetPositionInFileUnderRemoteBaseUri() throws Exception {
9090
final XSourcePosition pos = mapper.getSourcePosition("1", makeScriptRef("2", "remote:root/lib/hello.dart"), 123, null);
9191
assertNotNull(pos);
9292
assertEquals(pos.getFile(), hello);
93-
assertEquals(pos.getLine(), 9); // zero-based
93+
assertEquals(9, pos.getLine()); // zero-based
9494
}
9595

9696
@NotNull

flutter-idea/testSrc/unit/io/flutter/sdk/FlutterSdkVersionTest.java

+34-34
Original file line numberDiff line numberDiff line change
@@ -36,76 +36,76 @@ public void handlesBadVersion() {
3636
@Test
3737
public void comparesBetaVersions() {
3838
assertEquals(
39-
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.1")),
40-
-1
39+
-1,
40+
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.1"))
4141
);
4242
assertEquals(
43-
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0")),
44-
0
43+
0,
44+
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0"))
4545
);
4646
assertEquals(
47-
new FlutterSdkVersion("1.0.1").compareTo(new FlutterSdkVersion("1.0.0")),
48-
1
47+
1,
48+
new FlutterSdkVersion("1.0.1").compareTo(new FlutterSdkVersion("1.0.0"))
4949
);
5050
// Stable version is ahead of all beta versions with the same major/minor/patch numbers.
5151
assertEquals(
52-
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
53-
1
52+
1,
53+
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
5454
);
5555
assertEquals(
56-
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0")),
57-
-1
56+
-1,
57+
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0"))
5858
);
5959
assertEquals(
60-
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
61-
1
60+
1,
61+
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
6262
);
6363
assertEquals(
64-
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
65-
1
64+
1,
65+
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
6666
);
6767
assertEquals(
68-
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.2.pre")),
69-
-1
68+
-1,
69+
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.2.pre"))
7070
);
7171
assertEquals(
72-
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-2.1.pre")),
73-
-1
72+
-1,
73+
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-2.1.pre"))
7474
);
7575
assertEquals(
76-
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre")),
77-
0
76+
0,
77+
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre"))
7878
);
7979
assertEquals(
80-
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123")),
81-
0
80+
0,
81+
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123"))
8282
);
8383
assertEquals(
84-
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.124")),
85-
-1
84+
-1,
85+
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.124"))
8686
);
8787
assertEquals(
88-
new FlutterSdkVersion("1.0.0-1.1.pre.124").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123")),
89-
1
88+
1,
89+
new FlutterSdkVersion("1.0.0-1.1.pre.124").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123"))
9090
);
9191
// Master versions will be aware of the latest preceding dev version and have a version number higher than the preceding dev version.
9292
// e.g. the next commit to master after cutting dev version 2.0.0-2.0.pre would be 2.0.0-3.0.pre.1, with the number 1 signifying 1
9393
// commit after the previous version.
9494
assertEquals(
95-
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre")),
96-
-1
95+
-1,
96+
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre"))
9797
);
9898
assertEquals(
99-
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123")),
100-
1
99+
1,
100+
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123"))
101101
);
102102
assertEquals(
103-
new FlutterSdkVersion("1.0.0-2.0.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
104-
1
103+
1,
104+
new FlutterSdkVersion("1.0.0-2.0.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
105105
);
106106
assertEquals(
107-
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre.123")),
108-
1
107+
1,
108+
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre.123"))
109109
);
110110
}
111111
}

flutter-idea/testSrc/unit/io/flutter/utils/UrlUtilsTest.java

+12-12
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55
import static org.junit.Assert.assertEquals;
66

77
public class UrlUtilsTest {
8-
@Test
9-
public void testGenerateHtmlFragmentWithHrefTags() {
10-
assertEquals(
11-
UrlUtils.generateHtmlFragmentWithHrefTags("Open http://link.com"),
12-
"Open <a href=\"http://link.com\">http://link.com</a>"
13-
);
14-
assertEquals(UrlUtils.generateHtmlFragmentWithHrefTags("Unchanged text without URLs"), "Unchanged text without URLs");
15-
assertEquals(
16-
UrlUtils.generateHtmlFragmentWithHrefTags("Multiple http://link1.com links http://link2.com test"),
17-
"Multiple <a href=\"http://link1.com\">http://link1.com</a> links <a href=\"http://link2.com\">http://link2.com</a> test"
18-
);
19-
}
8+
@Test
9+
public void testGenerateHtmlFragmentWithHrefTags() {
10+
assertEquals(
11+
"Open <a href=\"http://link.com\">http://link.com</a>",
12+
UrlUtils.generateHtmlFragmentWithHrefTags("Open http://link.com")
13+
);
14+
assertEquals("Unchanged text without URLs", UrlUtils.generateHtmlFragmentWithHrefTags("Unchanged text without URLs"));
15+
assertEquals(
16+
"Multiple <a href=\"http://link1.com\">http://link1.com</a> links <a href=\"http://link2.com\">http://link2.com</a> test",
17+
UrlUtils.generateHtmlFragmentWithHrefTags("Multiple http://link1.com links http://link2.com test")
18+
);
19+
}
2020
}

0 commit comments

Comments
 (0)