Content-Length: 2252196 | pFad | http://github.com/NativeScript/napi-android/commit/33682bd574ddde7cc99c1a3eafe1b08364faaacc

5B part 31 · NativeScript/napi-android@33682bd · GitHub
Skip to content

Commit 33682bd

Browse files
ammarahm-edammarahm-ed
committed
part 31
1 parent 0f3a176 commit 33682bd

File tree

264 files changed

+16609
-496
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

264 files changed

+16609
-496
lines changed

Diff for: ‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@
1313
.externalNativeBuild
1414
.cxx
1515
local.properties
16+
dist

Diff for: ‎test-app/app/src/main/assets/app/Infrastructure/Jasmine/jasmine-2.0.1/boot.js

+12-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,17 @@ var TerminalReporter = require('../jasmine-reporters/terminal_reporter').Termina
4040
},
4141

4242
it: function(desc, func) {
43-
return env.it(desc, func);
43+
if (func.length > 0) {
44+
return env.it(desc, func);
45+
} else {
46+
return env.it(desc, function(done) {
47+
func();
48+
__ns__setTimeout(() => {
49+
done();
50+
}, 1)
51+
52+
})
53+
}
4454
},
4555

4656
xit: function(desc, func) {
@@ -123,7 +133,7 @@ var TerminalReporter = require('../jasmine-reporters/terminal_reporter').Termina
123133
verbosity: 5
124134
}));
125135

126-
env.addReporter(new JUnitXmlReporter());
136+
// env.addReporter(new JUnitXmlReporter());
127137

128138
env.specFilter = function(spec) {
129139
return true;

Diff for: ‎test-app/app/src/main/assets/app/Infrastructure/Jasmine/jasmine-2.0.1/jasmine.js

+1
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,7 @@ getJasmineRequireObj().Suite = function() {
18061806
this.onStart(this);
18071807

18081808
this.queueRunner({
1809+
18091810
fns: allFns,
18101811
onComplete: complete
18111812
});

Diff for: ‎test-app/app/src/main/assets/app/Infrastructure/Jasmine/jasmine-reporters/junit_reporter.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
}
4646
function log(str) {
4747
__log(str);
48-
android.util.Log.d("{N} Runtime Tests", str);
48+
// android.util.Log.d("{N} Runtime Tests", str);
4949
// var con = global.console || console;
5050
// if (con && con.log) {
5151
// con.log(str);

Diff for: ‎test-app/app/src/main/assets/app/MyActivity.js

+51-42
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*
2-
// demonstrates how to extend class in TypeScript with prebuilt Java proxy
32
3+
// demonstrates how to extend class in TypeScript with prebuilt Java proxy
44
declare module android {
55
export module app {
66
export class Activity {
@@ -21,48 +21,57 @@
2121
}
2222
}
2323
*/
24+
2425
var MyActivity = (function (_super) {
25-
__extends(MyActivity, _super);
26-
function MyActivity() {
27-
_super.apply(this, arguments);
28-
}
29-
MyActivity.prototype.onCreate = function (bundle) {
30-
_super.prototype.onCreate.call(this, bundle);
26+
__extends(MyActivity, _super);
27+
function MyActivity() {
28+
_super.apply(this, arguments);
29+
}
30+
MyActivity.prototype.onCreate = function (bundle) {
31+
_super.prototype.onCreate.call(this, bundle);
32+
// require('./tests/testsWithContext').run(this);
33+
//run jasmine
34+
35+
execute();
36+
37+
var layout = new android.widget.LinearLayout(this);
38+
layout.setOrientation(1);
39+
this.setContentView(layout);
40+
var textView = new android.widget.TextView(this);
41+
textView.setText("It's a button!");
42+
layout.addView(textView);
43+
44+
var button = new android.widget.Button(this);
45+
button.setText("Hit me");
46+
layout.addView(button);
47+
var counter = 0;
3148

32-
// require('./tests/testsWithContext').run(this);
33-
// execute(); //run jasmine
49+
var Color = android.graphics.Color;
50+
var colors = [
51+
Color.BLUE,
52+
Color.RED,
53+
Color.MAGENTA,
54+
Color.YELLOW,
55+
Color.parseColor("#FF7F50"),
56+
];
57+
var taps = 0;
3458

35-
// var layout = new android.widget.LinearLayout(this);
36-
// layout.setOrientation(1);
37-
// this.setContentView(layout);
38-
//
39-
// var textView = new android.widget.TextView(this);
40-
// textView.setText("It's a button!");
41-
// layout.addView(textView);
42-
//
43-
// var button = new android.widget.Button(this);
44-
// button.setText('Hit me');
45-
// layout.addView(button);
46-
// var counter = 0;
47-
//
48-
// var Color = android.graphics.Color;
49-
// var colors = [Color.BLUE, Color.RED, Color.MAGENTA, Color.YELLOW, Color.parseColor('#FF7F50')];
50-
// var taps = 0;
51-
//
52-
// var dum = com.tns.tests.DummyClass.null;
53-
//
54-
// button.setOnClickListener(
55-
// new android.view.View.OnClickListener('AppClickListener', {
56-
// onClick: function () {
57-
// button.setBackgroundColor(colors[taps % colors.length]);
58-
// taps++;
59-
// },
60-
// })
61-
// );
59+
var dum = com.tns.tests.DummyClass.null;
6260

63-
};
64-
MyActivity = __decorate([
65-
JavaProxy("com.tns.NativeScriptActivity")
66-
], MyActivity);
67-
return MyActivity;
68-
})(android.app.Activity);
61+
button.setOnClickListener(
62+
new android.view.View.OnClickListener("AppClickListener", {
63+
onClick: function () {
64+
const now = performance.now();
65+
button.setBackgroundColor(colors[taps % colors.length]);
66+
console.log(performance.now() - now);
67+
taps++;
68+
},
69+
})
70+
);
71+
};
72+
MyActivity = __decorate(
73+
[JavaProxy("com.tns.NativeScriptActivity")],
74+
MyActivity
75+
);
76+
return MyActivity;
77+
})(android.app.Activity);

Diff for: ‎test-app/app/src/main/assets/app/MyApp.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// demonstrates how to extend class in JavaScript with prebuilt Java proxy
2+
23
var MyApp = android.app.Application.extend("com.tns.NativeScriptApplication",
34
{
45
onCreate: function()
56
{
6-
console.log("onCreate!!!");
7-
// __log("Hello MyApp::onCreate()");
7+
console.log("Hello MyApp::onCreate()");
88
}
99
});
10-
console.log("I am loaded!!!!");
10+

Diff for: ‎test-app/app/src/main/assets/app/mainpage.js

+46-41
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
__disableVerboseLogging();
22
__log("starting tests");
3-
3+
//
44
// methods that common tests need to run
55
var testContent = "";
66
__collect = gc;
@@ -15,60 +15,65 @@ TNSGetOutput = function () {
1515
}
1616
__approot = __dirname.substr(0, __dirname.length - 4);
1717

18-
var shared = require("./shared");
19-
shared.runRequireTests();
20-
shared.runWeakRefTests();
21-
shared.runRuntimeTests();
22-
shared.runWorkerTests();
23-
require("./tests/testWebAssembly");
24-
require("./tests/testMultithreadedJavascript");
25-
require("./tests/testInterfaceDefaultMethods");
26-
require("./tests/testInterfaceStaticMethods");
27-
require("./tests/testMetadata");
28-
require("./tests/testAsserts");
18+
19+
// PASSING TESTS
20+
require("./tests/testMetadata")
2921
require("./tests/testWeakRef");
30-
require("./tests/tests");
3122
require("./tests/testMethodResolution");
3223
require("./tests/testMethodResolutionWithNulls");
33-
require("./tests/testArrays");
34-
require("./tests/testsForRuntimeBindingGenerator");
35-
require("./tests/testPrimitiveTypeConversion");
36-
require("./tests/numericConversionTests");
37-
require("./tests/inheritanceChainResolutionTest");
38-
require("./tests/exceptionHandlingTests");
39-
require("./tests/discardedExceptionsTest");
40-
require("./tests/dispatchCallbacksOnUiThreadTests");
41-
require("./tests/stringConversionTests");
42-
require("./tests/testsForTypescript");
43-
require("./tests/testGC");
44-
require("./tests/testsMemoryManagement");
24+
require("./tests/testInterfaceStaticMethods");
25+
require("./tests/testInterfaceDefaultMethods");
4526
require("./tests/testFieldGetSet");
46-
require("./tests/extendedClassesTests");
47-
//require("./tests/extendClassNameTests"); // as tests now run with SBG, this test fails the whole build process
48-
require("./tests/testJniReferenceLeak");
49-
require("./tests/testNativeModules");
50-
require("./tests/requireExceptionTests");
51-
require("./tests/java-array-test");
5227
require("./tests/field-access-test");
28+
require("./tests/java-array-test");
5329
require("./tests/byte-buffer-test");
54-
require("./tests/dex-interface-implementation");
5530
require("./tests/testInterfaceImplementation");
56-
require("./tests/testRuntimeImplementedAPIs");
57-
require("./tests/testsInstanceOfOperator");
58-
require("./tests/testReleaseNativeCounterpart");
59-
require("./tests/testJSONObjects");
60-
require("./tests/kotlin/companions/testCompanionObjectsSupport");
31+
require("./tests/console/logTests.js");
32+
require("./tests/dex-interface-implementation");
6133
require("./tests/kotlin/properties/testPropertiesSupport");
6234
require("./tests/kotlin/delegation/testDelegationSupport");
6335
require("./tests/kotlin/objects/testObjectsSupport");
6436
require("./tests/kotlin/functions/testTopLevelFunctionsSupport");
6537
require("./tests/kotlin/extensions/testExtensionFunctionsSupport");
6638
require("./tests/kotlin/enums/testEnumsSupport");
6739
require("./tests/kotlin/access/testInternalLanguageFeaturesSupport");
40+
require('./tests/testNativeTimers');
6841
require("./tests/testPackagePrivate");
6942
require("./tests/kotlin/properties/testPropertiesSupport.js");
70-
require('./tests/testNativeTimers');
43+
require("./tests/inheritanceChainResolutionTest");
44+
require("./tests/testRuntimeImplementedAPIs");
45+
require("./tests/testPrimitiveTypeConversion");
46+
require("./tests/numericConversionTests");
47+
require("./tests/testAsserts");
48+
require("./tests/stringConversionTests");
49+
require("./tests/testsInstanceOfOperator");
50+
require("./tests/extendedClassesTests");
7151
require("./tests/testPostFrameCallback");
72-
require("./tests/console/logTests.js");
73-
require('./tests/testURLImpl.js');
74-
require('./tests/testURLSearchParamsImpl.js');
52+
require("./tests/testsForRuntimeBindingGenerator");
53+
require("./tests/tests");
54+
require("./tests/discardedExceptionsTest");
55+
require("./tests/requireExceptionTests");
56+
require("./tests/exceptionHandlingTests");
57+
require("./tests/testsForTypescript");
58+
require("./tests/testGC");
59+
require("./tests/testReleaseNativeCounterpart");
60+
require("./tests/testArrays");
61+
//require("./tests/testJniReferenceLeak");
62+
63+
var shared = require("./shared");
64+
shared.runRequireTests();
65+
shared.runRuntimeTests();
66+
shared.runWorkerTests();
67+
require("./tests/dispatchCallbacksOnUiThreadTests");
68+
require("./tests/testsMemoryManagement");
69+
70+
//shared.runWeakRefTests();
71+
72+
//require("./tests/testWebAssembly");
73+
//github.com//require("./tests/extendClassNameTests"); // as tests now run with SBG, this test fails the whole build process
74+
//require("./tests/testNativeModules");
75+
//require('./tests/testURLImpl.js');
76+
//require('./tests/testURLSearchParamsImpl.js');
77+
78+
//require("./tests/testMultithreadedJavascript"); //FAILS
79+

Diff for: ‎test-app/app/src/main/assets/app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"freeMemoryRatio": 0.50,
99
"markingMode": "none",
1010
"maxLogcatObjectSize": 1024,
11-
"forceLog": true,
11+
"forceLog": false,
1212
"suppressCallJSMethodExceptions": false,
1313
"enableLineBreakpoints": false,
1414
"enableMultithreadedJavascript": true

Diff for: ‎test-app/app/src/main/assets/app/shared/.gitattributes

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
###############################################################################
2+
# Set default behavior to automatically normalize line endings.
3+
###############################################################################
4+
* text=auto

Diff for: ‎test-app/app/src/main/assets/app/shared/Import/ImportCommonJS/file.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = 42;

Diff for: ‎test-app/app/src/main/assets/app/shared/Import/ImportCommonJS/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import file from './file';
2+
TNSLog(file.toString());

Diff for: ‎test-app/app/src/main/assets/app/shared/Import/ImportJSON/data.json

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"testProperty": "testValue"
3+
}

Diff for: ‎test-app/app/src/main/assets/app/shared/Import/ImportJSON/index.js

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import data from './data.json';
2+
TNSLog(data['testProperty']);

Diff for: ‎test-app/app/src/main/assets/app/shared/Import/index.js

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
describe("TNS import", function () {
2+
afterEach(TNSClearOutput);
3+
4+
it("JSON files", function () {
5+
require("./ImportJSON");
6+
expect(TNSGetOutput()).toBe("testValue");
7+
});
8+
9+
it("CommonJS", function () {
10+
require("./ImportCommonJS");
11+
expect(TNSGetOutput()).toBe("42");
12+
});
13+
});

Diff for: ‎test-app/app/src/main/assets/app/shared/README.md

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
## TNS Shared Tests
2+
3+
Currently targeting the Telerik NativeScript runtimes for:
4+
- iOS
5+
- android
6+
7+
The tests should cover sommon functionality such as the "require" implementations,
8+
basic inheritance scenarios, ECMA version etc.
9+
10+
[The unit tests are written in Jasmine.](http://jasmine.github.io/2.0/introduction.html)
11+
12+
To run the tests you should add this repo as submodule in the app/shared folder.
13+
There is a satelite repo that contains module which should be added as submodule in tns_modules/shared respectively.
14+
15+
## Fixtures
16+
`TNSLog(text)` method is expected to be defined in the global object collecting messages.
17+
`TNSGetOutput()` method returns all messages collected in TNSLog.
18+
`TNSClearOutput()` clears the collected messages in TNSLog.
19+
`__approot` global variable should point the path to the root folder of the app, the one where 'app' and 'tns_modules' are located. The path should start with leading slash.
20+

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/AbsolutePath/dependency.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TNSLog(' and AbsolutePath/dependency started');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/AbsolutePath/index.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
TNSLog('main started');
2+
require(__approot + "/app/shared/Require/AbsolutePath/dependency");
3+
TNSLog(' and main executed');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/CaseSensitive/MyModule.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TNSLog('file');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/CaseSensitive/index.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
require('./MyModule');
2+
require('./mymodule');
3+
require('./MyModule.js');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/CaseSensitive/mymodule/index.js

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
TNSLog('folder');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/ChangingRequireObject/dependency.js

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module.exports = function () {
2+
return 'message';
3+
};

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/ChangingRequireObject/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
TNSLog('main started');
2+
var resource = require('./dependency');
3+
var message = resource();
4+
TNSLog(' ' + message);
5+
TNSLog(' and main executed');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/CircularIndexRequire/dependency1.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
TNSLog(' and dependency1 started');
2+
exports.visible = 'visible';
3+
require('./dependency2');
4+
exports.invisible = 'invisible';
5+
TNSLog(' and dependency1 ended');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/CircularIndexRequire/dependency2.js

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
TNSLog(' and dependency2 started');
2+
3+
var main = require('./index');
4+
var dep1 = require('./dependency1');
5+
TNSLog(' ' + main.visible + ' ' + main.invisible);
6+
TNSLog(' ' + dep1.visible + ' ' + dep1.invisible);
7+
8+
TNSLog(' and dependency2 ended');

Diff for: ‎test-app/app/src/main/assets/app/shared/Require/CircularIndexRequire/index.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
TNSLog('main started');
2+
exports.visible = 'visible';
3+
require('./dependency1');
4+
exports.invisible = 'invisible';
5+
TNSLog(' and main ended');

0 commit comments

Comments
 (0)








ApplySandwichStrip

pFad - (p)hone/(F)rame/(a)nonymizer/(d)eclutterfier!      Saves Data!


--- a PPN by Garber Painting Akron. With Image Size Reduction included!

Fetched URL: http://github.com/NativeScript/napi-android/commit/33682bd574ddde7cc99c1a3eafe1b08364faaacc

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy