Skip to content

Commit

Permalink
Merge pull request #14 from conterra/DN-27
Browse files Browse the repository at this point in the history
Dn 27
  • Loading branch information
sholtkamp authored Jul 1, 2024
2 parents 5fcf62a + e0b694e commit d1f723e
Show file tree
Hide file tree
Showing 33 changed files with 49 additions and 54 deletions.
2 changes: 1 addition & 1 deletion build.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2023 con terra GmbH ([email protected])
# Copyright (C) 2024 con terra GmbH ([email protected])
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions gulpfile.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -150,7 +150,7 @@ gulp.task("run-tests",
function transportTestUrls() {
// transport test url to run-browser-tests
// eslint-disable-next-line max-len
const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_tests/tests/all&reporter=tap";
const testsAt = mapappsBrowserSync.state.url + "/resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_intro/tests/all&reporter=tap";
runBrowserTests.push(testsAt);
return Promise.resolve();
},
Expand Down
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -324,7 +324,7 @@
<properties>
<owner>con terra GmbH</owner>
<email>[email protected]</email>
<project.inceptionYear>2023</project.inceptionYear>
<project.inceptionYear>2024</project.inceptionYear>
</properties>
<includes>
<include>src/main/js/**/*.js</include>
Expand Down
4 changes: 2 additions & 2 deletions src/main/config/assembly.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -34,4 +34,4 @@
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
</assembly>
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/Action.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/ActionFactory.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/ElementAction.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/NavIndexStorage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/Tool.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/ToolAction.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/Tour.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/TourEvents.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/build.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/module.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/nls/bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/nls/de/bundle.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/tests/ActionFactoryTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/tests/ElementActionTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
16 changes: 16 additions & 0 deletions src/main/js/bundles/dn_intro/tests/TestTool.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,19 @@
///
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
/// You may obtain a copy of the License at
///
/// http://www.apache.org/licenses/LICENSE-2.0
///
/// Unless required by applicable law or agreed to in writing, software
/// distributed under the License is distributed on an "AS IS" BASIS,
/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
/// See the License for the specific language governing permissions and
/// limitations under the License.
///

import {Tool} from "../Tool";

export default class TestTool implements Tool {
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/tests/ToolActionTest.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/main/js/bundles/dn_intro/tests/all.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
///
/// Copyright (C) 2023 con terra GmbH ([email protected])
/// Copyright (C) 2024 con terra GmbH ([email protected])
///
/// Licensed under the Apache License, Version 2.0 (the "License");
/// you may not use this file except in compliance with the License.
Expand Down
4 changes: 0 additions & 4 deletions src/main/js/bundles/dn_tests/manifest.json

This file was deleted.

17 changes: 0 additions & 17 deletions src/main/js/bundles/dn_tests/tests/all.ts

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/js/bundles/driver/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/test/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright (C) 2023 con terra GmbH ([email protected])
# Copyright (C) 2024 con terra GmbH ([email protected])
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/index.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/init.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/js/tests/init-packs.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
4 changes: 2 additions & 2 deletions src/test/webapp/js/tests/runTests.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!--
Copyright (C) 2023 con terra GmbH ([email protected])
Copyright (C) 2024 con terra GmbH ([email protected])
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -19,7 +19,7 @@
<html>
<head>
<title>Tests</title>
<meta http-equiv="REFRESH" content="0; url=../../../resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_tests/tests/all"/>
<meta http-equiv="REFRESH" content="0; url=../../../resources/jsregistry/root/@conterra/mapapps-mocha-runner/latest/mocha.html?boot=/js/tests/test-init.js&timeout=5000&test=dn_intro/tests/all"/>
</head>
<body>
Redirecting to test runner.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/js/tests/test-init.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down
2 changes: 1 addition & 1 deletion src/test/webapp/login.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright (C) 2023 con terra GmbH ([email protected])
* Copyright (C) 2024 con terra GmbH ([email protected])
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down

0 comments on commit d1f723e

Please sign in to comment.