Skip to content
Open
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
34 changes: 34 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>ksenbelo</groupId>
<artifactId>ksenbelo</artifactId>
<packaging>jar</packaging>
<version>1</version>

<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.2.RELEASE</version>
</parent>

<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<version>1.5.2.RELEASE</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
</plugin>
</plugins>
</build>
</project>
6 changes: 6 additions & 0 deletions src/main/java/ksenbelo/kolmnurk.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package ksenbelo;
import java.util.*;

public abstract class kolmnurk{
public double kolmnurkpindala(){return 0;}
}
16 changes: 16 additions & 0 deletions src/main/java/ksenbelo/pindala.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package ksenbelo;
public class pindala extends kolmnurk{
double a;
double b;
double c;
public pindala(double a, double b, double c){
this.a = a;
this.b = b;
this.c = c;
}

@Override
public double kolmnurkpindala(){
return a + b + c;
}
}
22 changes: 22 additions & 0 deletions src/main/java/ksenbelo/rakendus.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package ksenbelo;

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.web.bind.annotation.*;

@SpringBootApplication
@RestController
public class rakendus{

@RequestMapping("/pindala")
public String kolmnurk(double a, double b, double c) {
kolmnurk k1 = new pindala(a,b,c);
return "Kolmnurka pindala on " + k1.kolmnurkpindala();
}

public static void main(String[] args) {
SpringApplication.run(rakendus.class, args);
}
}

//Kolmnurka pindala on 9.0
26 changes: 26 additions & 0 deletions src/test/java/ksenbelo/kolmnurkTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package ksenbelo;

import org.junit.*;
import static org.junit.Assert.*;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.junit4.SpringRunner;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
import org.springframework.boot.test.web.client.TestRestTemplate;

@RunWith(SpringRunner.class)
@SpringBootTest(webEnvironment=WebEnvironment.RANDOM_PORT)

public class kolmnurkTest{
@Autowired
private TestRestTemplate restTemplate;

@Test
public void pindala2(){
String tulemus = this.restTemplate.getForObject("/pindala?a=2&b=3&c=4",String.class);

assertEquals("Kolmnurka pindala on",tulemus.substring(0,20));
assertEquals(9.0, Double.parseDouble(tulemus.substring(20)),0.1);
}
}
Binary file added target/classes/ksenbelo/kolmnurk.class
Binary file not shown.
Binary file added target/classes/ksenbelo/pindala.class
Binary file not shown.
Binary file added target/classes/ksenbelo/rakendus.class
Binary file not shown.
Binary file added target/ksenbelo-1.jar
Binary file not shown.
Binary file added target/ksenbelo-1.jar.original
Binary file not shown.
5 changes: 5 additions & 0 deletions target/maven-archiver/pom.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Generated by Apache Maven
#Mon May 29 14:51:54 EEST 2017
version=1
groupId=ksenbelo
artifactId=ksenbelo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ksenbelo/rakendus.class
ksenbelo/pindala.class
ksenbelo/kolmnurk.class
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/home/ksenbelo/public_html/t09tervikveeb/src/main/java/ksenbelo/kolmnurk.java
/home/ksenbelo/public_html/t09tervikveeb/src/main/java/ksenbelo/pindala.java
/home/ksenbelo/public_html/t09tervikveeb/src/main/java/ksenbelo/rakendus.java
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ksenbelo/kolmnurkTest.class
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/home/ksenbelo/public_html/t09tervikveeb/src/test/java/ksenbelo/kolmnurkTest.java
61 changes: 61 additions & 0 deletions target/surefire-reports/TEST-ksenbelo.kolmnurkTest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuite name="ksenbelo.kolmnurkTest" time="0.185" tests="1" errors="0" skipped="0" failures="0">
<properties>
<property name="java.runtime.name" value="OpenJDK Runtime Environment"/>
<property name="sun.boot.library.path" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/amd64"/>
<property name="java.vm.version" value="25.121-b13"/>
<property name="java.vm.vendor" value="Oracle Corporation"/>
<property name="maven.multiModuleProjectDirectory" value="/home/ksenbelo/public_html/t09tervikveeb"/>
<property name="java.vendor.url" value="http://java.oracle.com/"/>
<property name="path.separator" value=":"/>
<property name="guice.disable.misplaced.annotation.check" value="true"/>
<property name="java.vm.name" value="OpenJDK 64-Bit Server VM"/>
<property name="file.encoding.pkg" value="sun.io"/>
<property name="user.country" value="US"/>
<property name="sun.java.launcher" value="SUN_STANDARD"/>
<property name="sun.os.patch.level" value="unknown"/>
<property name="java.vm.specification.name" value="Java Virtual Machine Specification"/>
<property name="user.dir" value="/home/ksenbelo/public_html/t09tervikveeb"/>
<property name="java.runtime.version" value="1.8.0_121-b13"/>
<property name="java.awt.graphicsenv" value="sun.awt.X11GraphicsEnvironment"/>
<property name="java.endorsed.dirs" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/endorsed"/>
<property name="os.arch" value="amd64"/>
<property name="java.io.tmpdir" value="/tmp"/>
<property name="line.separator" value="&#10;"/>
<property name="java.vm.specification.vendor" value="Oracle Corporation"/>
<property name="os.name" value="Linux"/>
<property name="classworlds.conf" value="/opt/rh/rh-maven33/root/usr/share/maven/bin/m2.conf"/>
<property name="sun.jnu.encoding" value="UTF-8"/>
<property name="java.library.path" value="/usr/java/packages/lib/amd64:/usr/lib64:/lib64:/lib:/usr/lib"/>
<property name="java.specification.name" value="Java Platform API Specification"/>
<property name="java.class.version" value="52.0"/>
<property name="sun.management.compiler" value="HotSpot 64-Bit Tiered Compilers"/>
<property name="os.version" value="2.6.32-642.11.1.el6.x86_64"/>
<property name="user.home" value="/home/ksenbelo"/>
<property name="user.timezone" value="Europe/Tallinn"/>
<property name="java.awt.printerjob" value="sun.print.PSPrinterJob"/>
<property name="file.encoding" value="UTF-8"/>
<property name="java.specification.version" value="1.8"/>
<property name="user.name" value="ksenbelo"/>
<property name="java.class.path" value="/opt/rh/rh-maven33/root/usr/share/maven/boot/plexus-classworlds.jar"/>
<property name="java.vm.specification.version" value="1.8"/>
<property name="sun.arch.data.model" value="64"/>
<property name="java.home" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre"/>
<property name="sun.java.command" value="org.codehaus.plexus.classworlds.launcher.Launcher package"/>
<property name="java.specification.vendor" value="Oracle Corporation"/>
<property name="user.language" value="en"/>
<property name="awt.toolkit" value="sun.awt.X11.XToolkit"/>
<property name="java.vm.info" value="mixed mode"/>
<property name="java.version" value="1.8.0_121"/>
<property name="java.ext.dirs" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/ext:/usr/java/packages/lib/ext"/>
<property name="sun.boot.class.path" value="/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/resources.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/rt.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/sunrsasign.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/jsse.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/jce.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/charsets.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/lib/jfr.jar:/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.121-0.b13.el6_8.x86_64/jre/classes"/>
<property name="java.vendor" value="Oracle Corporation"/>
<property name="maven.home" value="/opt/rh/rh-maven33/root/usr/share/maven"/>
<property name="file.separator" value="/"/>
<property name="java.vendor.url.bug" value="http://bugreport.sun.com/bugreport/"/>
<property name="sun.cpu.endian" value="little"/>
<property name="sun.io.unicode.encoding" value="UnicodeLittle"/>
<property name="sun.cpu.isalist" value=""/>
</properties>
<testcase name="pindala2" classname="ksenbelo.kolmnurkTest" time="0.185"/>
</testsuite>
4 changes: 4 additions & 0 deletions target/surefire-reports/ksenbelo.kolmnurkTest.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
-------------------------------------------------------------------------------
Test set: ksenbelo.kolmnurkTest
-------------------------------------------------------------------------------
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.058 sec - in ksenbelo.kolmnurkTest
Binary file added target/test-classes/ksenbelo/kolmnurkTest.class
Binary file not shown.