Skip to content
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

Junit 5 #231

Merged
merged 4 commits into from
Jan 8, 2021
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
12 changes: 0 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-freemarker</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-undertow</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
Expand Down Expand Up @@ -169,14 +165,6 @@
<version>2.9.2</version>
</dependency>

<!-- Test Dependencies -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>

<!-- Spring test -->
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
7 changes: 7 additions & 0 deletions src/main/resources/static/js/bootstrap.bundle.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/main/resources/static/js/bootstrap.bundle.min.js.map

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions src/main/resources/static/js/bootstrap.min.js

This file was deleted.

2 changes: 2 additions & 0 deletions src/main/resources/static/js/jquery-3.5.1.slim.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/main/resources/static/js/jquery-3.5.1.slim.min.map

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions src/main/resources/static/js/jquery.min.js

This file was deleted.

5 changes: 0 additions & 5 deletions src/main/resources/static/js/popper.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion src/main/resources/templates/acl-overview.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/broker-detail.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/cluster-overview.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/consumer-detail.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/includes/footer.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/includes/header.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
7 changes: 3 additions & 4 deletions src/main/resources/templates/lib/template.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand All @@ -23,9 +23,8 @@
<link type="text/css" rel="stylesheet" href="<@spring.url '/css/font-awesome.min.css'/>"/>
<link type="text/css" rel="stylesheet" href="<@spring.url '/css/global.css'/>"/>

<script src="<@spring.url '/js/jquery.min.js'/>"></script>
<script src="<@spring.url '/js/popper.min.js'/>"></script>
<script src="<@spring.url '/js/bootstrap.min.js'/>"></script>
<script src="<@spring.url '/js/jquery-3.5.1.slim.min.js'/>"></script>
<script src="<@spring.url '/js/bootstrap.bundle.min.js'/>"></script>
<script src="<@spring.url '/js/global.js'/>"></script>
<script async defer src="<@spring.url '/js/github-buttons.js'/>"></script>

Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/templates/message-inspector.ftlh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<#ftl output_format="HTML">
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/not-initialized.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/topic-create.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/topic-detail.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2016 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

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/resources/templates/topic-messages.ftlh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<#--
Copyright 2019 Kafdrop contributors.
Copyright 2021 Kafdrop contributors.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/kafdrop/AbstractIntegrationTest.java
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package kafdrop;

import org.junit.runner.RunWith;
import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.MapPropertySource;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.testcontainers.containers.KafkaContainer;
import org.testcontainers.lifecycle.Startables;

import java.util.List;
import java.util.Map;

@RunWith(SpringRunner.class)
@ExtendWith(SpringExtension.class)
@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@ContextConfiguration(initializers = AbstractIntegrationTest.Initializer.class)
abstract class AbstractIntegrationTest {
Expand Down