Skip to content

[CQ] debugability: fix mis-ordered asserts #8019

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public void shouldGetPositionInFileUnderRemoteSourceRoot() throws Exception {
final XSourcePosition pos = mapper.getSourcePosition("1", makeScriptRef("2", "some/stuff/to/ignore/lib/hello.dart"), 123, null);
assertNotNull(pos);
assertEquals(pos.getFile(), hello);
assertEquals(pos.getLine(), 9); // zero-based
assertEquals(9, pos.getLine()); // zero-based
}

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

@NotNull
Expand Down
68 changes: 34 additions & 34 deletions flutter-idea/testSrc/unit/io/flutter/sdk/FlutterSdkVersionTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -36,76 +36,76 @@ public void handlesBadVersion() {
@Test
public void comparesBetaVersions() {
assertEquals(
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.1")),
-1
-1,
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.1"))
);
assertEquals(
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0")),
0
0,
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0"))
);
assertEquals(
new FlutterSdkVersion("1.0.1").compareTo(new FlutterSdkVersion("1.0.0")),
1
1,
new FlutterSdkVersion("1.0.1").compareTo(new FlutterSdkVersion("1.0.0"))
);
// Stable version is ahead of all beta versions with the same major/minor/patch numbers.
assertEquals(
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
1
1,
new FlutterSdkVersion("1.0.0").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0")),
-1
-1,
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
1
1,
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
1
1,
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.2.pre")),
-1
-1,
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.2.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-2.1.pre")),
-1
-1,
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-2.1.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre")),
0
0,
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123")),
0
0,
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.124")),
-1
-1,
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.124"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre.124").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123")),
1
1,
new FlutterSdkVersion("1.0.0-1.1.pre.124").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123"))
);
// Master versions will be aware of the latest preceding dev version and have a version number higher than the preceding dev version.
// 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
// commit after the previous version.
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre")),
-1
-1,
new FlutterSdkVersion("1.0.0-1.1.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123")),
1
1,
new FlutterSdkVersion("1.0.0-1.1.pre").compareTo(new FlutterSdkVersion("1.0.0-1.1.pre.123"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-2.0.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre")),
1
1,
new FlutterSdkVersion("1.0.0-2.0.pre.123").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre"))
);
assertEquals(
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre.123")),
1
1,
new FlutterSdkVersion("1.0.0-2.0.pre").compareTo(new FlutterSdkVersion("1.0.0-1.0.pre.123"))
);
}
}
24 changes: 12 additions & 12 deletions flutter-idea/testSrc/unit/io/flutter/utils/UrlUtilsTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
import static org.junit.Assert.assertEquals;

public class UrlUtilsTest {
@Test
public void testGenerateHtmlFragmentWithHrefTags() {
assertEquals(
UrlUtils.generateHtmlFragmentWithHrefTags("Open http://link.com"),
"Open <a href=\"http://link.com\">http://link.com</a>"
);
assertEquals(UrlUtils.generateHtmlFragmentWithHrefTags("Unchanged text without URLs"), "Unchanged text without URLs");
assertEquals(
UrlUtils.generateHtmlFragmentWithHrefTags("Multiple http://link1.com links http://link2.com test"),
"Multiple <a href=\"http://link1.com\">http://link1.com</a> links <a href=\"http://link2.com\">http://link2.com</a> test"
);
}
@Test
public void testGenerateHtmlFragmentWithHrefTags() {
assertEquals(
"Open <a href=\"http://link.com\">http://link.com</a>",
UrlUtils.generateHtmlFragmentWithHrefTags("Open http://link.com")
);
assertEquals("Unchanged text without URLs", UrlUtils.generateHtmlFragmentWithHrefTags("Unchanged text without URLs"));
assertEquals(
"Multiple <a href=\"http://link1.com\">http://link1.com</a> links <a href=\"http://link2.com\">http://link2.com</a> test",
UrlUtils.generateHtmlFragmentWithHrefTags("Multiple http://link1.com links http://link2.com test")
);
}
}