Added GUI backbone (login and redirect to main stage)

This commit is contained in:
Sem van der Hoeven
2019-03-04 09:37:21 +01:00
parent 57bc183d40
commit 30e421d367
27 changed files with 463 additions and 36 deletions

4
src/Server/.idea/encodings.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" addBOMForNewFiles="with NO BOM" />
</project>

7
src/Server/.idea/misc.xml generated Normal file
View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_10" project-jdk-name="10" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>

View File

@@ -1,4 +1,4 @@
package hello;
package main.java.hello;
public class Greeting {

View File

@@ -1,10 +1,11 @@
package hello;
package main.java.hello;
import java.util.concurrent.atomic.AtomicLong;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import java.util.concurrent.atomic.AtomicLong;
@RestController
public class GreetingController {

View File

@@ -1,12 +1,12 @@
package hello;
package main.java.hello;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class Application {
public class ServerApplication {
public static void main(String[] args) {
SpringApplication.run(Application.class, args);
SpringApplication.run(ServerApplication.class, args);
}
}

View File

@@ -1,14 +1,15 @@
import hello.Greeting;
import hello.GreetingController;
import org.junit.jupiter.api.Test;
package test.java;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import main.java.hello.GreetingController;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
public class GreetingControllerTest {
@Test
void nullTest() {
GreetingController controller = new GreetingController();
assertThat(controller).isNotNull();
// Assert.assertThat(controller).isNotNull();
Assert.assertNotNull(controller);
}
}

View File

@@ -1,7 +1,8 @@
import hello.Greeting;
import org.junit.jupiter.api.Test;
package test.java;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import main.java.hello.Greeting;
import org.junit.Assert;
import org.junit.jupiter.api.Test;
public class GreetingTest {
@Test
@@ -9,7 +10,9 @@ public class GreetingTest {
Greeting greeting = new Greeting(1, "hello");
long id = greeting.getId();
String content = greeting.getContent();
assertThat(id).isEqualTo(1);
assertThat(content).isEqualTo(content);
// assertThat(id).isEqualTo(1);
Assert.assertEquals(id, 1);
// assertThat(content).isEqualTo(content);
Assert.assertEquals(content,content);
}
}

View File

@@ -1,5 +1,7 @@
package test.java;
import org.junit.Test;
public class ApplicationTest {
public class ServerApplicationTest {
@Test
public void main() {
}