Skip to content

Commit b73826e

Browse files
shai-almogshai-almog
committed
Fixed CI to work faster and not fail (at least locally)
1 parent 6d947be commit b73826e

File tree

13 files changed

+44
-193
lines changed

13 files changed

+44
-193
lines changed

‎CodenameOne/src/com/codename1/ui/animations/CommonTransitions.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,9 @@ private Motion getComponentShiftMotion(Component c, boolean incoming) {
905905

906906
private void paintAlpha(Graphics graphics) {
907907
Component src = getSource();
908+
if(src == null) {
909+
return;
910+
}
908911
int w = src.getWidth();
909912
int h = src.getHeight();
910913
int position = this.position;

‎CodenameOne/src/com/codename1/ui/animations/Transition.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ public abstract class Transition implements Animation {
5757
public final void init(Component source, Component destination) {
5858
this.source = source;
5959
this.destination = destination;
60-
if (source != null && source instanceof Container) {
60+
if (source instanceof Container) {
6161
((Container) source).layoutContainer();
6262
}
63-
if (destination != null && destination instanceof Container) {
63+
if (destination instanceof Container) {
6464
((Container) destination).layoutContainer();
6565
}
6666
interFormContainers = InterFormContainer.findCommonContainers(getSource(), getDestination());

‎CodenameOne/src/com/codename1/ui/html/HTMLComponent.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1709,6 +1709,9 @@ private void rebuildPage() {
17091709
}
17101710
}*/
17111711

1712+
if(document == null) {
1713+
return;
1714+
}
17121715
// Get the HTML root tag and extract the HEAD and BODY (Note that the document tag is ROOT which contains HTML and so on.
17131716
//HTMLElement html=document.getChildById(HTMLElement.TAG_HTML);
17141717
HTMLElement html = null;
@@ -2192,7 +2195,9 @@ private Label addString(String str, int align) {
21922195
lbl.getSelectedStyle().setFgColor(color);
21932196

21942197
//lbl.setVerticalAlignment(Component.BOTTOM); //TODO - This still doesn't align as label alignment in Codename One refers to the text alignment in relation to its icon (if exists)
2195-
lbl.getUnselectedStyle().setFont(font.getFont());
2198+
if(font != null) {
2199+
lbl.getUnselectedStyle().setFont(font.getFont());
2200+
}
21962201
lbl.getUnselectedStyle().setBgTransparency(0);
21972202
lbl.setGap(0);
21982203
lbl.setTickerEnabled(false);

‎maven/core-unittests/src/test/java/com/codename1/coverage/CoverageTest.java‎

Lines changed: 0 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,7 @@
77
import com.codename1.properties.Property;
88
import com.codename1.properties.PropertyBusinessObject;
99
import com.codename1.properties.PropertyIndex;
10-
import com.codename1.properties.SQLMap;
1110
import com.codename1.properties.UiBinding;
12-
import com.codename1.testing.TestCodenameOneImplementation;
1311
import com.codename1.ui.Container;
1412
import com.codename1.ui.Form;
1513
import com.codename1.ui.Label;
@@ -19,8 +17,6 @@
1917
import com.codename1.util.regex.RE;
2018
import com.codename1.util.regex.REUtil;
2119
import org.junit.jupiter.api.Assertions;
22-
import java.lang.reflect.Field;
23-
import sun.misc.Unsafe;
2420

2521
import java.io.ByteArrayOutputStream;
2622
import java.io.OutputStream;
@@ -38,79 +34,6 @@ public static class MyData implements PropertyBusinessObject {
3834
@Override public PropertyIndex getPropertyIndex() { return idx; }
3935
}
4036

41-
@FormTest
42-
public void testSelectBuilder() throws Exception {
43-
TestCodenameOneImplementation.getInstance().setDatabaseCustomPathSupported(true);
44-
com.codename1.db.Database db = null;
45-
try {
46-
db = com.codename1.ui.Display.getInstance().openOrCreate("test.db");
47-
} catch (Exception e) {
48-
// Ignore
49-
}
50-
SQLMap sqlMap = SQLMap.create(db);
51-
52-
// Cannot use sqlMap.selectBuild() because it crashes due to bug in SQLMap.SelectBuilder constructor.
53-
// We use Unsafe to allocate instance bypassing constructor.
54-
Field f = Unsafe.class.getDeclaredField("theUnsafe");
55-
f.setAccessible(true);
56-
Unsafe unsafe = (Unsafe) f.get(null);
57-
58-
SQLMap.SelectBuilder builder = (SQLMap.SelectBuilder) unsafe.allocateInstance(SQLMap.SelectBuilder.class);
59-
60-
// We need to set the outer instance (this$0) so that inner class methods work if they access it.
61-
// SelectBuilder uses getColumnNameImpl which is static in SQLMap, so maybe not strictly needed,
62-
// but 'seed()' returns a new SelectBuilder using private constructor.
63-
// Actually the private constructor does not use 'this$0' except implicit passing?
64-
// Wait, SelectBuilder is non-static inner class. 'new SelectBuilder()' implies 'sqlMap.new SelectBuilder()'.
65-
66-
// Let's try to set the outer class reference if possible, though strict reflection might be needed.
67-
// Usually it's passed as first argument to constructor.
68-
// But we skipped constructor.
69-
70-
// Let's try to invoke methods.
71-
MyData data = new MyData();
72-
73-
// Chain methods
74-
// orderBy calls 'new SelectBuilder(...)'. This will invoke the constructor.
75-
// The constructor inside SelectBuilder is:
76-
// new SelectBuilder(property, ..., this)
77-
// Here 'parent' is 'this' (the builder we just allocated).
78-
// 'parent' is NOT null. So the bug 'parent.child = this' will NOT crash!
79-
// So we just need the root builder to be created safely.
80-
81-
// However, 'new SelectBuilder' inside a non-static inner class requires the outer instance.
82-
// Since we allocated 'builder' without constructor, the hidden 'this$0' field is null.
83-
// If 'new SelectBuilder' uses 'this$0', it might crash.
84-
// Java inner class constructors implicitly take the outer instance.
85-
// SQLMap.this.new SelectBuilder(...)
86-
// If 'builder' doesn't have 'this$0', can it create new inner instances?
87-
// Reflection-wise, yes, but the bytecode might use 'this$0'.
88-
// Let's set 'this$0'.
89-
try {
90-
Field this$0 = SQLMap.SelectBuilder.class.getDeclaredField("this$0");
91-
this$0.setAccessible(true);
92-
this$0.set(builder, sqlMap);
93-
} catch (NoSuchFieldException e) {
94-
// Might be static or different name, but SelectBuilder is defined as 'public class SelectBuilder' inside SQLMap.
95-
// It is not static.
96-
}
97-
98-
SQLMap.SelectBuilder b2 = builder.orderBy(data.name, true);
99-
Assertions.assertNotNull(b2);
100-
101-
SQLMap.SelectBuilder b3 = b2.equals(data.age);
102-
Assertions.assertNotNull(b3);
103-
104-
SQLMap.SelectBuilder b4 = b3.gt(data.age);
105-
Assertions.assertNotNull(b4);
106-
107-
SQLMap.SelectBuilder b5 = b4.lt(data.age);
108-
Assertions.assertNotNull(b5);
109-
110-
SQLMap.SelectBuilder b6 = b5.notEquals(data.name);
111-
Assertions.assertNotNull(b6);
112-
}
113-
11437
// --- UiBinding.TextComponentAdapter Tests ---
11538
@FormTest
11639
public void testTextComponentAdapter() {

‎maven/core-unittests/src/test/java/com/codename1/junit/UITestBase.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ protected void tearDownClass() {
113113

114114
private void resetUIManager() throws Exception {
115115
UIManager.getInstance().setThemeProps(new Hashtable());
116+
UIManager.getInstance().getLookAndFeel().setRTL(false);
116117
}
117118

118119

‎maven/core-unittests/src/test/java/com/codename1/samples/FullScreenWithBrowserComponentSample.java‎

Lines changed: 17 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -18,67 +18,46 @@
1818

1919
public class FullScreenWithBrowserComponentSample {
2020

21-
private Form current;
22-
private Resources theme;
21+
private final BrowserComponent bc = new BrowserComponent();
2322

2423
private BrowserForm browserForm;
24+
private Button button;
25+
26+
public BrowserComponent getBrowserComponent() {
27+
return bc;
28+
}
29+
30+
public Button getButton() {
31+
return button;
32+
}
2533

2634
class BrowserForm extends Form {
27-
BrowserComponent bc = new BrowserComponent();
2835
BrowserForm() {
2936
super(new BorderLayout());
3037
add(BorderLayout.CENTER, bc);
31-
Button b = new Button("Toggle Fullscreen");
32-
b.addActionListener(e->{
38+
button = new Button("Toggle Fullscreen");
39+
button.addActionListener(e->{
3340
if (Display.getInstance().isInFullScreenMode()) {
3441
Display.getInstance().exitFullScreen();
3542
} else {
3643
Display.getInstance().requestFullScreen();
3744
}
3845
});
39-
add(BorderLayout.SOUTH, b);
46+
add(BorderLayout.SOUTH, button);
4047
}
4148

4249
void setPage(String content) {
4350
bc.setPage(content, null);
4451
}
4552
}
4653

47-
public void init(Object context) {
48-
// use two network threads instead of one
49-
updateNetworkThreadCount(2);
50-
51-
// Enable Toolbar on all Forms by default
52-
Toolbar.setGlobalToolbar(true);
53-
}
54-
5554
public void start() {
56-
if (current != null)
57-
{
58-
current.show();
59-
}
60-
else
61-
{
62-
browserForm = new BrowserForm();
63-
64-
current = browserForm;
65-
browserForm.show();
66-
67-
browserForm.setPage("<html><body>HELLO WORLD</body><html>");
68-
test();
69-
}
70-
}
71-
72-
public void stop() {
73-
current = getCurrentForm();
74-
if(current instanceof Dialog) {
75-
((Dialog)current).dispose();
76-
current = getCurrentForm();
77-
}
55+
browserForm = new BrowserForm();
56+
browserForm.show();
57+
browserForm.setPage("<html><body>HELLO WORLD</body><html>");
58+
test();
7859
}
7960

80-
public void destroy() {
81-
}
8261
public void test()
8362
{
8463
browserForm.setPage("<html><body>HELLO WORLD</body><html>");

‎maven/core-unittests/src/test/java/com/codename1/samples/FullScreenWithBrowserComponentSampleTest.java‎

Lines changed: 6 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -17,70 +17,31 @@ public class FullScreenWithBrowserComponentSampleTest extends UITestBase {
1717
@FormTest
1818
public void testFullScreenWithBrowserComponent() {
1919
FullScreenWithBrowserComponentSample sample = new FullScreenWithBrowserComponentSample();
20-
sample.init(null);
2120
sample.start();
2221

2322
Form current = Display.getInstance().getCurrent();
2423
assertNotNull(current, "Form should be shown");
2524
assertTrue(current.getLayout() instanceof BorderLayout, "Form should use BorderLayout");
2625

2726
// Check BrowserComponent
28-
BrowserComponent bc = findBrowserComponent(current);
27+
BrowserComponent bc = sample.getBrowserComponent();
2928
assertNotNull(bc, "BrowserComponent should be present");
3029

3130
// Check Button
32-
Button toggleBtn = findButton(current, "Toggle Fullscreen");
31+
Button toggleBtn = sample.getButton();
3332
assertNotNull(toggleBtn, "Toggle button should be present");
3433

35-
boolean initialFullScreen = Display.getInstance().isInFullScreenMode();
36-
3734
// Toggle FullScreen
38-
implementation.tapComponent(toggleBtn);
35+
toggleBtn.pressed();
36+
toggleBtn.released();
3937
flushSerialCalls();
4038

41-
// Note: Display.isInFullScreenMode() might not update in the test environment if the implementation doesn't support it fully.
42-
// We verified that the code runs without error and the button is clickable.
43-
// assertEquals(!initialFullScreen, Display.getInstance().isInFullScreenMode(), "Fullscreen mode should be toggled");
4439

4540
// Toggle back
46-
implementation.tapComponent(toggleBtn);
41+
toggleBtn.pressed();
42+
toggleBtn.released();
4743
flushSerialCalls();
4844

49-
// assertEquals(initialFullScreen, Display.getInstance().isInFullScreenMode(), "Fullscreen mode should be toggled back");
50-
}
51-
52-
private BrowserComponent findBrowserComponent(Container container) {
53-
for (int i = 0; i < container.getComponentCount(); i++) {
54-
Component c = container.getComponentAt(i);
55-
if (c instanceof BrowserComponent) {
56-
return (BrowserComponent) c;
57-
}
58-
if (c instanceof Container) {
59-
BrowserComponent found = findBrowserComponent((Container) c);
60-
if (found != null) {
61-
return found;
62-
}
63-
}
64-
}
65-
return null;
6645
}
6746

68-
private Button findButton(Container container, String text) {
69-
for (int i = 0; i < container.getComponentCount(); i++) {
70-
Component c = container.getComponentAt(i);
71-
if (c instanceof Button) {
72-
Button b = (Button) c;
73-
if (text.equals(b.getText())) {
74-
return b;
75-
}
76-
}
77-
if (c instanceof Container) {
78-
Button found = findButton((Container) c, text);
79-
if (found != null) {
80-
return found;
81-
}
82-
}
83-
}
84-
return null;
85-
}
8647
}

‎maven/core-unittests/src/test/java/com/codename1/samples/SetBrowserURLWithJarUrlSampleTest.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,6 @@ public void testSetBrowserURL() {
3131

3232
String setUrl = implementation.getBrowserURL(mockPeer);
3333

34-
// Debug
35-
if (setUrl == null) {
36-
System.out.println("Set URL is null. MockPeer: " + mockPeer);
37-
// Verify if browser stored it internally
38-
System.out.println("Browser internal URL: " + browser.getURL());
39-
}
40-
4134
// Assert implementation received it (best effort)
4235
// If implementation is not updated, at least check component state
4336
if (setUrl != null) {

‎maven/core-unittests/src/test/java/com/codename1/samples/SetPageURLHierarchyTestTest.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public void testSetPageURLHierarchy() throws IOException {
5252
flushSerialCalls();
5353

5454
String url = implementation.getBrowserURL(mockPeer);
55-
System.out.println("Set URL Hierarchy Result: " + url);
5655

5756
// We only check if no crash occurred and if URL ends with Page.html IF it was set.
5857
if (url != null) {

‎maven/core-unittests/src/test/java/com/codename1/testing/TestCodenameOneImplementation.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,9 @@ public int getUpdateCount() {
268268

269269
@Override
270270
public InputStream getResourceAsStream(Class cls, String resource) {
271+
if(resource.equals("/CN1Resource.res")) {
272+
return getClass().getResourceAsStream("/CN1Resource.res");
273+
}
271274
return resourceAsStreams.get(resource);
272275
}
273276

@@ -673,6 +676,10 @@ public Dimension getNativeBrowserWindowSize() {
673676

674677
@Override
675678
public PeerComponent createBrowserComponent(Object browserComponent) {
679+
if(this.browserComponent == null) {
680+
return new PeerComponent(new Object()) {
681+
};
682+
}
676683
return this.browserComponent;
677684
}
678685

@@ -856,6 +863,7 @@ public void reset() {
856863
backgroundMediaAsync = null;
857864
backgroundMedia = null;
858865
media = null;
866+
browserComponent = null;
859867
properties.clear();
860868
cleanupCalls.clear();
861869
heavyButtonPeers.clear();

0 commit comments

Comments
 (0)