Rename packages to match Google conventions

Pete West · Pete West · commit 66a3c3dcdb63 · 2017-04-26T16:41:36.000+01:00
diff --git a/main-module/pom.xml b/main-module/pom.xml
@@ -1,15 +1,15 @@
 <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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  
-  <groupId>com.diffblue.java_test</groupId>
+
+  <groupId>com.diffblue.javatest</groupId>
   <artifactId>main-module</artifactId>
   <version>1.0-SNAPSHOT</version>
   <packaging>jar</packaging>
-  
+
   <name>Java Test Project</name>
   <url>http://maven.apache.org</url>
-  
+
   <dependencies>
     <dependency>
       <groupId>junit</groupId>
diff --git a/main-module/src/main/java/com/diffblue/java_test/other_stuff/Bla.java b/main-module/src/main/java/com/diffblue/java_test/other_stuff/Bla.java
diff --git a/main-module/src/main/java/com/diffblue/javatest/Additions.java b/main-module/src/main/java/com/diffblue/javatest/Additions.java
@@ -1,4 +1,4 @@
-package com.diffblue.java_test;
+package com.diffblue.javatest;
 
 public class Additions {
   /**
diff --git a/main-module/src/main/java/com/diffblue/javatest/Calc.java b/main-module/src/main/java/com/diffblue/javatest/Calc.java
@@ -1,4 +1,4 @@
-package com.diffblue.java_test;
+package com.diffblue.javatest;
 
 public class Calc {
   int div(int a, int b) {
diff --git a/main-module/src/main/java/com/diffblue/javatest/Main.java b/main-module/src/main/java/com/diffblue/javatest/Main.java
@@ -1,4 +1,4 @@
-package com.diffblue.java_test;
+package com.diffblue.javatest;
 
 public class Main {
   void do_stuff(String a, String b) {
diff --git a/main-module/src/main/java/com/diffblue/javatest/Search.java b/main-module/src/main/java/com/diffblue/javatest/Search.java
@@ -1,4 +1,4 @@
-package com.diffblue.java_test;
+package com.diffblue.javatest;
 
 public class Search {
   public boolean search(int [] array, int target) {
diff --git a/main-module/src/main/java/com/diffblue/javatest/otherstuff/Bla.java b/main-module/src/main/java/com/diffblue/javatest/otherstuff/Bla.java
@@ -0,0 +1,19 @@
+package com.diffblue.javatest.otherstuff;
+
+public class Bla {
+  public Bla(com.diffblue.javatest.somestuff.A a)  {
+    this.m = a;
+  }
+
+  public boolean check(com.diffblue.javatest.somestuff.B b) {
+    if (!m.hasB()) {
+      return false;
+    }
+    if (m.b.x == b.x) {
+      return true;
+    }
+    return false;
+  }
+
+  private com.diffblue.javatest.somestuff.A m;
+}
diff --git a/main-module/src/main/java/com/diffblue/javatest/somestuff/A.java b/main-module/src/main/java/com/diffblue/javatest/somestuff/A.java
@@ -1,4 +1,4 @@
-package com.diffblue.java_test.some_stuff;
+package com.diffblue.javatest.somestuff;
 
 public class A {
   public B b;
@@ -10,6 +10,7 @@ public boolean hasB() {
       return true;
     }
   }
+
   public boolean setB(B b) {
     boolean exists = hasB();
     this.b = b;
diff --git a/main-module/src/main/java/com/diffblue/javatest/somestuff/B.java b/main-module/src/main/java/com/diffblue/javatest/somestuff/B.java
@@ -1,4 +1,4 @@
-package com.diffblue.java_test.some_stuff;
+package com.diffblue.javatest.somestuff;
 
 public class B {
   public int x;
diff --git a/main-module/src/test/java/com/diffblue/javatest/CalcTest.java b/main-module/src/test/java/com/diffblue/javatest/CalcTest.java
@@ -1,4 +1,4 @@
-package com.diffblue.java_test;
+package com.diffblue.javatest;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/main-module/src/test/java/com/diffblue/javatest/SomeStuffTest.java b/main-module/src/test/java/com/diffblue/javatest/SomeStuffTest.java
@@ -1,12 +1,12 @@
-package com.diffblue.java_test;
+package com.diffblue.javatest;
 
 import org.junit.Assert;
 import org.junit.Test;
 
 public class SomeStuffTest {
   @Test
   public void hasB0() {
-    com.diffblue.java_test.some_stuff.A a = new com.diffblue.java_test.some_stuff.A();
+    com.diffblue.javatest.somestuff.A a = new com.diffblue.javatest.somestuff.A();
     boolean r = a.hasB();
     Assert.assertEquals(r, false);
   }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.diffblue.java_test;`
	`1`	`+package com.diffblue.javatest;`
`2`	`2`
`3`	`3`	`public class Additions {`
`4`	`4`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.diffblue.java_test.some_stuff;`
	`1`	`+package com.diffblue.javatest.somestuff;`
`2`	`2`
`3`	`3`	`public class A {`
`4`	`4`	`public B b;`
`@@ -10,6 +10,7 @@ public boolean hasB() {`
`10`	`10`	`return true;`
`11`	`11`	`}`
`12`	`12`	`}`
	`13`	`+`
`13`	`14`	`public boolean setB(B b) {`
`14`	`15`	`boolean exists = hasB();`
`15`	`16`	`this.b = b;`