pralg17 · tanelm · May 29, 2017
diff --git a/README.md b/README.md
@@ -1,3 +1,2 @@
-# t06veebirakendus2
-
-Springi veebirakendus koos andmebaasist otsingu või automaattestidega. 
+# testid2017
+Testide harjutamine
diff --git a/pom.xml b/pom.xml
@@ -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>jaagup</groupId>
+  <artifactId>testimine</artifactId>
+  <packaging>jar</packaging>
+  <version>1</version>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.3.6.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>
+	 </dependency>
+    </dependencies>  
+      <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/jaagup/Rakendus.java b/src/main/java/jaagup/Rakendus.java
@@ -0,0 +1,51 @@
+package jaagup;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.web.bind.annotation.RequestMapping; 
+import org.springframework.web.bind.annotation.RestController;
+public class Rakendus {
+    String tervitusfunktsioon() {
+        return "Ahoi!";
+    }
+
+	 String keskmine(String sisend) {
+		if(sisend==null){return "Sisend puudub";}
+		if(sisend.equals("")){return "tyhi sisend";}
+	   return sisend;
+   }
+   @RequestMapping("/tervita")
+
+   String tervist(String eesnimi){
+	   if(eesnimi==null){return "eesnimi puudub";}
+		return "Tere,"+eesnimi;
+   }
+
+    String tervist2(String eesnimi, String perenimi){
+		if(eesnimi==null){return "Eesnimi puudub";}
+		if(perenimi==null){return "Perenimi puudub";}
+		String PNimi = eesnimi.substring(0);
+		return "Tere, kodanik "+eesnimi+" "+perenimi.substring(0,1);
+	}
+
+	String tervist3(String synnipaev, String synnikuu, String synniaasta){
+		if(synnipaev==null){return "synnipaev puudub";}
+		if(synnikuu==null){return "synnikuu puudub";}
+		if(synniaasta==null){return "synniaasta puudub";}
+		return "Teie synnipaev on "+synnipaev+"."+synnikuu+"."+synniaasta;
+	}
+
+   public static void main(String[] args) {
+      Rakendus r=new Rakendus();
+      System.out.println(r.tervitusfunktsioon());
+   }
+
+
+
+
+
+}
+
+//scl enable rh-maven33 bash
+//mvn package
+//java -jar target/boot3-1.0-SNAPSHOT.jar
diff --git a/src/test/java/jaagup/EsimeneTest.java b/src/test/java/jaagup/EsimeneTest.java
@@ -0,0 +1,51 @@
+package jaagup;
+
+import org.junit.*;
+import static org.junit.Assert.*;
+
+public class EsimeneTest{
+	@Test
+	public void katse1(){
+		assertEquals(3, 2+1);
+	}
+
+    @Test
+   public void tervituseTest(){
+		Rakendus r=new Rakendus();
+		assertEquals("Ahoi!", r.tervitusfunktsioon());
+	}
+
+	@Test
+	public void keskmiseTest(){
+		Rakendus r=new Rakendus();
+		assertEquals("5", r.keskmine("5"));
+		assertEquals("6", r.keskmine("6"));
+	}
+
+	@Test
+	public void kesmiseTest2(){
+		Rakendus r =new Rakendus();
+		assertEquals("tyhi sisend", r.keskmine(""));
+		assertEquals("Sisend puudub", r.keskmine(null));
+	}
+	@Test
+	public void tervituseTest1(){
+		Rakendus r=new Rakendus();
+		assertEquals("Tere,Priit", r.tervist("Priit"));
+	}
+	@Test
+	public void tervitusTest2(){
+		Rakendus r = new Rakendus();
+		assertEquals("Tere, kodanik Peeter P",r.tervist2("Peeter", "Paan"));
+	}
+
+	@Test
+	public void synnipaevatest(){
+		Rakendus r = new Rakendus();
+		assertEquals("Teie synnipaev on 06.09.1997", r.tervist3("06", "09", "1997"));
+	}
+
+
+
+
+}
diff --git a/target/classes/jaagup/Rakendus.class b/target/classes/jaagup/Rakendus.class
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
@@ -0,0 +1,5 @@
+#Generated by Maven
+#Thu Mar 16 09:07:18 EET 2017
+version=1
+groupId=jaagup
+artifactId=testimine
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -0,0 +1 @@
+jaagup/Rakendus.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst
@@ -0,0 +1 @@
+/home/tanelmaas/2. semester/Javakaust/KODUTÖÖD/t06veebirakendus2/src/main/java/jaagup/Rakendus.java
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/createdFiles.lst
@@ -0,0 +1 @@
+jaagup/EsimeneTest.class
diff --git a/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst b/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst
@@ -0,0 +1 @@
+/home/tanelmaas/2. semester/Javakaust/KODUTÖÖD/t06veebirakendus2/src/test/java/jaagup/EsimeneTest.java
diff --git a/target/surefire-reports/TEST-jaagup.EsimeneTest.xml b/target/surefire-reports/TEST-jaagup.EsimeneTest.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="jaagup.EsimeneTest" time="0.006" tests="7" 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/tanelmaas/2. semester/Javakaust/KODUTÖÖD/t06veebirakendus2"/>
+    <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/tanelmaas/2. semester/Javakaust/KODUTÖÖD/t06veebirakendus2"/>
+    <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/tanelmaas"/>
+    <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="tanelmaas"/>
+    <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="synnipaevatest" classname="jaagup.EsimeneTest" time="0.004"/>
+  <testcase name="katse1" classname="jaagup.EsimeneTest" time="0"/>
+  <testcase name="tervituseTest1" classname="jaagup.EsimeneTest" time="0"/>
+  <testcase name="tervitusTest2" classname="jaagup.EsimeneTest" time="0.002"/>
+  <testcase name="tervituseTest" classname="jaagup.EsimeneTest" time="0"/>
+  <testcase name="kesmiseTest2" classname="jaagup.EsimeneTest" time="0"/>
+  <testcase name="keskmiseTest" classname="jaagup.EsimeneTest" time="0"/>
+</testsuite>
diff --git a/target/surefire-reports/jaagup.EsimeneTest.txt b/target/surefire-reports/jaagup.EsimeneTest.txt
@@ -0,0 +1,4 @@
+-------------------------------------------------------------------------------
+Test set: jaagup.EsimeneTest
+-------------------------------------------------------------------------------
+Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.012 sec - in jaagup.EsimeneTest
diff --git a/target/test-classes/jaagup/EsimeneTest.class b/target/test-classes/jaagup/EsimeneTest.class
diff --git a/target/testimine-1.jar b/target/testimine-1.jar
diff --git a/target/testimine-1.jar.original b/target/testimine-1.jar.original
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		/home/tanelmaas/2. semester/Javakaust/KODUTÖÖD/t06veebirakendus2/src/main/java/jaagup/Rakendus.java