interface testing -- transpiler does allow static methods in interfaces

hansonr · hansonr · commit 3747862694d9 · 2019-07-13T13:33:30.000+01:00
diff --git a/sources/net.sf.j2s.java.core/src/test/JSInterface.java b/sources/net.sf.j2s.java.core/src/test/JSInterface.java
@@ -0,0 +1,30 @@
+package test;
+
+import swingjs.api.js.HTML5Canvas;
+
+/** 
+ * called by JSmol JavaScript methods using
+ * 
+ *  this._appletPanel.xxxx$paramTypes()
+ *  
+ */
+public interface JSInterface {
+
+	public static int doTest(int i) {
+		return i + 1;
+	}
+	
+  int cacheFileByName(String fileName, boolean isAdd);  // $S$Z
+  void cachePut(String key, Object data);               // $S$O
+  void destroy();                                      
+  String getFullName();                             
+  void openFileAsyncSpecial(String fileName, int flags); // $S$I
+  boolean processMouseEvent(int id, int x, int y, int modifiers, long time, Object jqevent, int scroll); // $I$I$I$I$J$O$I
+  void processTwoPointGesture(float[][][] touches); // AFFF
+  void setDisplay(HTML5Canvas canvas);  
+  void setScreenDimension(int width, int height);
+  boolean setStatusDragDropped(int mode, int x, int y, String fileName);
+	void startHoverWatcher(boolean enable);
+
+}
+
diff --git a/sources/net.sf.j2s.java.core/src/test/TApp2.java b/sources/net.sf.j2s.java.core/src/test/TApp2.java
@@ -206,7 +206,7 @@ public TestGraphic(TApp2 tApp2) {
 		}
 
 		void testGraphic() {
-			Button b = new Button("g");
+			Button b = new Button("MyM");
 			b.setBounds(300, 300, 40, 20);
 			// images are created only when a button is displayable
 			Image i1 = b.createImage(100, 100);
@@ -220,6 +220,7 @@ void testGraphic() {
 			Font f = g.getFont();
 			System.out.println(f);
 
+			
 			// font/background/foreground are set when the graphic is created
 			Font f0 = new Font(Font.DIALOG, Font.PLAIN, 30);
 			b.setFont(f0);
@@ -235,6 +236,13 @@ void testGraphic() {
 			assert (g.getFont().equals(f0));
 			assert (g.getColor() == Color.green);
 			assert (((Graphics2D) g).getBackground() == Color.red);
+			
+			
+			b = new Button("XXX");
+			b.setBounds(500, 100, 100, 100);
+			tApp2.add(b);
+			
+
 			System.out.println("Tapp2 OK");
 		}
 	}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Interface.java b/sources/net.sf.j2s.java.core/src/test/Test_Interface.java
@@ -12,7 +12,10 @@ String test(String s) {
 		}
 	}
 	
-	
+	public static int doTest(int i) {
+		return i + 1;
+	}
+		
 	public interface Test_Interface_inner {
 		// This mus be wrapped, or C$ changes definitions
 	}
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Interface2.java b/sources/net.sf.j2s.java.core/src/test/Test_Interface2.java
@@ -8,6 +8,7 @@ public static void main(String[] args) {
 	 ClassLoader.getSystemClassLoader().setClassAssertionStatus("test.Test_Interface", true);
 	 System.out.println("in the interface " + x + " " + y + " " + s.length);
 	 assert("5 y".equals(x + " " + y));
+	 assert(Test_Interface3.doTest(3) == 4);
 	 System.out.println("Test_Interface OK");
 	 
   }
diff --git a/sources/net.sf.j2s.java.core/src/test/Test_Interface3.java b/sources/net.sf.j2s.java.core/src/test/Test_Interface3.java
@@ -0,0 +1,10 @@
+package test;
+
+public interface Test_Interface3 { 	
+	
+	public static int doTest(int i) {
+		return i + 1;
+	}
+		
+	
+}

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,10 @@ String test(String s) {`
`12`	`12`	`}`
`13`	`13`	`}`
`14`	`14`
`15`		`-`
	`15`	`+ public static int doTest(int i) {`
	`16`	`+ return i + 1;`
	`17`	`+ }`
	`18`	`+`
`16`	`19`	`public interface Test_Interface_inner {`
`17`	`20`	`// This mus be wrapped, or C$ changes definitions`
`18`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ public static void main(String[] args) {`
`8`	`8`	`ClassLoader.getSystemClassLoader().setClassAssertionStatus("test.Test_Interface", true);`
`9`	`9`	`System.out.println("in the interface " + x + " " + y + " " + s.length);`
`10`	`10`	`assert("5 y".equals(x + " " + y));`
	`11`	`+ assert(Test_Interface3.doTest(3) == 4);`
`11`	`12`	`System.out.println("Test_Interface OK");`
`12`	`13`
`13`	`14`	`}`