From 828e3629eacb67de4898d1f84484a610ff8beffe Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Wed, 5 Dec 2018 21:33:31 -0200
Subject: [PATCH 01/17] =?UTF-8?q?Altera=C3=A7=C3=A3o=20linha?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 38af68707..75609b066 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -9,7 +9,7 @@
       <img src="/lang-logo.png">
     </a>
     <h1>DevOps</h1>
-    <p>Este é um pequeno exemplo de de implementação</p>
+    <p>tteixeira47</p>
     
   </div>
 </div>

From 25723c02d21eb83ff1664c43486d9b5a3921c232 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Wed, 5 Dec 2018 21:38:02 -0200
Subject: [PATCH 02/17] App

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index e478a3da9..5386243a8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ deploy:
   provider: heroku
   api-key: 
     secure: $HEROKU_API_KEY
-  app: devteste
\ No newline at end of file
+  app: devopstteixeira47
\ No newline at end of file

From a5c6c73ee321b8e8474a0f5fe1ec6914b3d27aaa Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Wed, 5 Dec 2018 21:43:51 -0200
Subject: [PATCH 03/17] new app

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5386243a8..6c91a9331 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,4 +4,4 @@ deploy:
   provider: heroku
   api-key: 
     secure: $HEROKU_API_KEY
-  app: devopstteixeira47
\ No newline at end of file
+  app: javatteixeira47
\ No newline at end of file

From 4cafd5d156ddf7c15824b9bc0403941dd5c40554 Mon Sep 17 00:00:00 2001
From: JKovalhuk <joaovitorkovalhuk@outlook.com>
Date: Thu, 6 Dec 2018 01:08:33 -0200
Subject: [PATCH 04/17] criacao branch jv

---
 src/main/resources/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 75609b066..902b9705f 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -15,7 +15,7 @@ <h1>DevOps</h1>
 </div>
 <div class="container">
   <div class="alert alert-info text-center" role="alert">
-    Atenção! Siga as instruções abaixo para realizar o exercício.
+    Parabéns, Eduado Soares
   </div>
   <hr>
   <div class="row">

From 4a5f7e4ce83114b93343f949bc3d097e9f61ebe8 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 01:20:21 -0200
Subject: [PATCH 05/17] opa meu mel

---
 src/main/resources/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 75609b066..d515cec68 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -9,7 +9,7 @@
       <img src="/lang-logo.png">
     </a>
     <h1>DevOps</h1>
-    <p>tteixeira47</p>
+    <p>opa meu mel</p>
     
   </div>
 </div>

From 0027b6cda5452fdd7a0d0d691da899b9317f9f46 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 01:23:51 -0200
Subject: [PATCH 06/17] tudo de bom meu bom

---
 src/main/resources/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 75609b066..5f432f0c0 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -15,7 +15,7 @@ <h1>DevOps</h1>
 </div>
 <div class="container">
   <div class="alert alert-info text-center" role="alert">
-    Atenção! Siga as instruções abaixo para realizar o exercício.
+    Tudo de bom meu bom
   </div>
   <hr>
   <div class="row">

From 4b94af254e473e2ea3a9f4b1bfa7461aaf8d24dd Mon Sep 17 00:00:00 2001
From: JKovalhuk <joaovitorkovalhuk@outlook.com>
Date: Thu, 6 Dec 2018 01:35:02 -0200
Subject: [PATCH 07/17] teste

---
 src/main/resources/templates/index.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 902b9705f..8e6a4e2e6 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -11,11 +11,11 @@
     <h1>DevOps</h1>
     <p>tteixeira47</p>
     
-  </div>
+  </div> 
 </div>
 <div class="container">
   <div class="alert alert-info text-center" role="alert">
-    Parabéns, Eduado Soares
+    Parabéns, Eduado Soare
   </div>
   <hr>
   <div class="row">

From a32690e7f3fb6dd2a66d59b4d70d38cb44dccc8c Mon Sep 17 00:00:00 2001
From: JKovalhuk <joaovitorkovalhuk@outlook.com>
Date: Thu, 6 Dec 2018 01:44:36 -0200
Subject: [PATCH 08/17] fibo.1

---
 src/main/java/com/example/Fibonacci.1.java | 15 +++++++++++++++
 src/main/java/com/example/Fibonacci.java   |  2 +-
 src/main/resources/templates/fibo.1.html   | 15 +++++++++++++++
 3 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/example/Fibonacci.1.java
 create mode 100644 src/main/resources/templates/fibo.1.html

diff --git a/src/main/java/com/example/Fibonacci.1.java b/src/main/java/com/example/Fibonacci.1.java
new file mode 100644
index 000000000..da096459c
--- /dev/null
+++ b/src/main/java/com/example/Fibonacci.1.java
@@ -0,0 +1,15 @@
+package com.example;
+
+
+public class Fibonacci{
+    public Fibonacci(){
+
+    }
+    public static long fibo(int n) {
+        if (n < 2) {
+            return n*2;
+        } else {
+            return fibo(n - 1) + fibo(n - 2);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/example/Fibonacci.java b/src/main/java/com/example/Fibonacci.java
index 96dbb4b8f..da096459c 100644
--- a/src/main/java/com/example/Fibonacci.java
+++ b/src/main/java/com/example/Fibonacci.java
@@ -7,7 +7,7 @@ public Fibonacci(){
     }
     public static long fibo(int n) {
         if (n < 2) {
-            return n;
+            return n*2;
         } else {
             return fibo(n - 1) + fibo(n - 2);
         }
diff --git a/src/main/resources/templates/fibo.1.html b/src/main/resources/templates/fibo.1.html
new file mode 100644
index 000000000..c2ef2170e
--- /dev/null
+++ b/src/main/resources/templates/fibo.1.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org" th:replace="~{fragments/layout :: layout (~{::body},'db')}">
+
+<body>
+
+
+<div class="container">
+  <h1>Os 30 primeiros números de fibonacci são</h1>
+  <ul th:each="num : ${sequencia}">
+    <li th:text="${num}"/>
+  </ul>
+</div>
+
+</body>
+</html>

From 237f18acf49b49c4f4afc6bacbaabf86865eee80 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 01:55:10 -0200
Subject: [PATCH 09/17] voltano

---
 src/main/java/com/example/Fibonacci.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/example/Fibonacci.java b/src/main/java/com/example/Fibonacci.java
index 96dbb4b8f..934340ed7 100644
--- a/src/main/java/com/example/Fibonacci.java
+++ b/src/main/java/com/example/Fibonacci.java
@@ -6,10 +6,6 @@ public Fibonacci(){
 
     }
     public static long fibo(int n) {
-        if (n < 2) {
-            return n;
-        } else {
-            return fibo(n - 1) + fibo(n - 2);
-        }
+            return n + 1;
     }
 }
\ No newline at end of file

From 8e7cb69361a7ad1ff6cfce679de5055fec2bc04c Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 02:08:10 -0200
Subject: [PATCH 10/17] agr vai

---
 src/main/resources/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 7bfd5efe0..8f381ef7b 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -15,7 +15,7 @@ <h1>DevOps</h1>
 </div>
 <div class="container">
   <div class="alert alert-info text-center" role="alert">
-    Tudo de bom meu bom
+    Agr vai
   </div>
   <hr>
   <div class="row">

From 2738564cf7d5a73bbf73214c5274dad427d93109 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 02:26:07 -0200
Subject: [PATCH 11/17] Revert "fibo.1"

This reverts commit a32690e7f3fb6dd2a66d59b4d70d38cb44dccc8c.
---
 src/main/java/com/example/Fibonacci.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/example/Fibonacci.java b/src/main/java/com/example/Fibonacci.java
index da096459c..96dbb4b8f 100644
--- a/src/main/java/com/example/Fibonacci.java
+++ b/src/main/java/com/example/Fibonacci.java
@@ -7,7 +7,7 @@ public Fibonacci(){
     }
     public static long fibo(int n) {
         if (n < 2) {
-            return n*2;
+            return n;
         } else {
             return fibo(n - 1) + fibo(n - 2);
         }

From 6f26d13f2f07bfdca3863195c12e3a1dae47b76c Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 02:44:00 -0200
Subject: [PATCH 12/17] Alterando funcao

---
 src/main/java/com/example/Fibonacci.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/example/Fibonacci.java b/src/main/java/com/example/Fibonacci.java
index 96dbb4b8f..13d94957e 100644
--- a/src/main/java/com/example/Fibonacci.java
+++ b/src/main/java/com/example/Fibonacci.java
@@ -6,10 +6,10 @@ public Fibonacci(){
 
     }
     public static long fibo(int n) {
-        if (n < 2) {
-            return n;
+        if (n >= 0) {
+            return Math.pow(2,n);
         } else {
-            return fibo(n - 1) + fibo(n - 2);
+            return -1;
         }
     }
 }
\ No newline at end of file

From 83b8d7d4950fbe5f2d7f80e3b8ad3eb7d18aeee9 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 02:55:58 -0200
Subject: [PATCH 13/17] Alterando teste e interfaces

---
 src/main/resources/templates/fibo.html  |  2 +-
 src/main/resources/templates/index.html |  4 ++--
 src/test/java/TesteFibo.java            | 10 +++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/templates/fibo.html b/src/main/resources/templates/fibo.html
index c2ef2170e..2224acab6 100644
--- a/src/main/resources/templates/fibo.html
+++ b/src/main/resources/templates/fibo.html
@@ -5,7 +5,7 @@
 
 
 <div class="container">
-  <h1>Os 30 primeiros números de fibonacci são</h1>
+  <h1>Os 30 primeiros números binários são</h1>
   <ul th:each="num : ${sequencia}">
     <li th:text="${num}"/>
   </ul>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index 68da3cf72..8ff928e1d 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -9,13 +9,13 @@
       <img src="/lang-logo.png">
     </a>
     <h1>DevOps</h1>
-    <p>opa meu mel</p>
+    <p>tteixeira47</p>
     
   </div> 
 </div>
 <div class="container">
   <div class="alert alert-info text-center" role="alert">
-    Agr vai
+    Trabalho de Engenharia de Software
   </div>
   <hr>
   <div class="row">
diff --git a/src/test/java/TesteFibo.java b/src/test/java/TesteFibo.java
index df9d604df..25a1865cf 100644
--- a/src/test/java/TesteFibo.java
+++ b/src/test/java/TesteFibo.java
@@ -7,26 +7,26 @@ public class TesteFibo {
     @Test
     public void Teste1() {
         Fibonacci f = new Fibonacci();
-        assertEquals(1L, f.fibo(1));
+        assertEquals(2L, f.fibo(1));
     }
     @Test
     public void Teste2() {
         Fibonacci f = new Fibonacci();
-        assertEquals(2L, f.fibo(3));
+        assertEquals(8L, f.fibo(3));
     }
     @Test
     public void Teste3() {
         Fibonacci f = new Fibonacci();
-        assertEquals(34L, f.fibo(9));
+        assertEquals(512L, f.fibo(9));
     }
     @Test
     public void Teste4() {
         Fibonacci f = new Fibonacci();
-        assertEquals(233L, f.fibo(13));
+        assertEquals(4L, f.fibo(2));
     }
     @Test
     public void Teste5() {
         Fibonacci f = new Fibonacci();
-        assertEquals(514229L, f.fibo(29));
+        assertEquals(16L, f.fibo(4));
     }
 }
\ No newline at end of file

From 91ed35ac413e9c1318eabf865c54d0d5ed83f230 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 03:01:37 -0200
Subject: [PATCH 14/17] Alterando tipo de valor

---
 src/main/java/com/example/Fibonacci.java |  2 +-
 src/test/java/TesteFibo.java             | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/example/Fibonacci.java b/src/main/java/com/example/Fibonacci.java
index 13d94957e..cd925519e 100644
--- a/src/main/java/com/example/Fibonacci.java
+++ b/src/main/java/com/example/Fibonacci.java
@@ -5,7 +5,7 @@ public class Fibonacci{
     public Fibonacci(){
 
     }
-    public static long fibo(int n) {
+    public static double fibo(int n) {
         if (n >= 0) {
             return Math.pow(2,n);
         } else {
diff --git a/src/test/java/TesteFibo.java b/src/test/java/TesteFibo.java
index 25a1865cf..d7397627a 100644
--- a/src/test/java/TesteFibo.java
+++ b/src/test/java/TesteFibo.java
@@ -7,26 +7,26 @@ public class TesteFibo {
     @Test
     public void Teste1() {
         Fibonacci f = new Fibonacci();
-        assertEquals(2L, f.fibo(1));
+        assertEquals(2, f.fibo(1));
     }
     @Test
     public void Teste2() {
         Fibonacci f = new Fibonacci();
-        assertEquals(8L, f.fibo(3));
+        assertEquals(8, f.fibo(3));
     }
     @Test
     public void Teste3() {
         Fibonacci f = new Fibonacci();
-        assertEquals(512L, f.fibo(9));
+        assertEquals(512, f.fibo(9));
     }
     @Test
     public void Teste4() {
         Fibonacci f = new Fibonacci();
-        assertEquals(4L, f.fibo(2));
+        assertEquals(4, f.fibo(2));
     }
     @Test
     public void Teste5() {
         Fibonacci f = new Fibonacci();
-        assertEquals(16L, f.fibo(4));
+        assertEquals(16, f.fibo(4));
     }
 }
\ No newline at end of file

From 9b2dc9cb3ca641cca941d3de15c7de8d43195eec Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 03:06:49 -0200
Subject: [PATCH 15/17] Alterando doubleno main

---
 src/main/java/com/example/Main.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/example/Main.java b/src/main/java/com/example/Main.java
index bc9d9de2c..0613db3f2 100644
--- a/src/main/java/com/example/Main.java
+++ b/src/main/java/com/example/Main.java
@@ -46,7 +46,7 @@ String index() {
 
   @RequestMapping("/fibo")
   String fibo(Map<String, Object> model) {
-     ArrayList<Long> sequencia = new ArrayList<Long>();
+     ArrayList<Double> sequencia = new ArrayList<Double>();
      for (int i = 0; i < 30; i++) {
        sequencia.add(f.fibo(i));
      }

From 7d1e185a9541d243cfeed677217080f6fe7f00ce Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 03:11:44 -0200
Subject: [PATCH 16/17] =?UTF-8?q?corre=C3=A7=C3=A3o=20do=20teste=20double?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/TesteFibo.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/TesteFibo.java b/src/test/java/TesteFibo.java
index d7397627a..dd6cd2a19 100644
--- a/src/test/java/TesteFibo.java
+++ b/src/test/java/TesteFibo.java
@@ -7,26 +7,26 @@ public class TesteFibo {
     @Test
     public void Teste1() {
         Fibonacci f = new Fibonacci();
-        assertEquals(2, f.fibo(1));
+        assertEquals(2D, f.fibo(1));
     }
     @Test
     public void Teste2() {
         Fibonacci f = new Fibonacci();
-        assertEquals(8, f.fibo(3));
+        assertEquals(8D, f.fibo(3));
     }
     @Test
     public void Teste3() {
         Fibonacci f = new Fibonacci();
-        assertEquals(512, f.fibo(9));
+        assertEquals(512D, f.fibo(9));
     }
     @Test
     public void Teste4() {
         Fibonacci f = new Fibonacci();
-        assertEquals(4, f.fibo(2));
+        assertEquals(4D, f.fibo(2));
     }
     @Test
     public void Teste5() {
         Fibonacci f = new Fibonacci();
-        assertEquals(16, f.fibo(4));
+        assertEquals(16D, f.fibo(4));
     }
 }
\ No newline at end of file

From d7f36c2c5632b546d554d53d9bcc0d833eaf3b27 Mon Sep 17 00:00:00 2001
From: Thiago Teixeira <thiagoh.teixeira@outlook.com>
Date: Thu, 6 Dec 2018 03:16:44 -0200
Subject: [PATCH 17/17] =?UTF-8?q?corrigindo=20precis=C3=A3o=20dos=20valore?=
 =?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/TesteFibo.java | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/test/java/TesteFibo.java b/src/test/java/TesteFibo.java
index dd6cd2a19..3623076e5 100644
--- a/src/test/java/TesteFibo.java
+++ b/src/test/java/TesteFibo.java
@@ -7,26 +7,26 @@ public class TesteFibo {
     @Test
     public void Teste1() {
         Fibonacci f = new Fibonacci();
-        assertEquals(2D, f.fibo(1));
+        assertEquals(2D, f.fibo(1), 0.01);
     }
     @Test
     public void Teste2() {
         Fibonacci f = new Fibonacci();
-        assertEquals(8D, f.fibo(3));
+        assertEquals(8D, f.fibo(3), 0.01);
     }
     @Test
     public void Teste3() {
         Fibonacci f = new Fibonacci();
-        assertEquals(512D, f.fibo(9));
+        assertEquals(512D, f.fibo(9), 0.01);
     }
     @Test
     public void Teste4() {
         Fibonacci f = new Fibonacci();
-        assertEquals(4D, f.fibo(2));
+        assertEquals(4D, f.fibo(2), 0.01);
     }
     @Test
     public void Teste5() {
         Fibonacci f = new Fibonacci();
-        assertEquals(16D, f.fibo(4));
+        assertEquals(16D, f.fibo(4), 0.01);
     }
 }
\ No newline at end of file