Merge "[view-compiler] Better namespacing of util functions" (36c39533) · Commits · e / os / android_frameworks_base

startop/view_compiler/main.cc

+1 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@
		namespace {

		using namespace tinyxml2;
		using namespace startop::util;
		using std::string;

		constexpr char kStdoutFilename[]{"stdout"};

+6 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,9 @@

		using std::string;

		namespace startop {
		namespace util {

		// TODO: see if we can borrow this from somewhere else, like aapt2.
		string FindLayoutNameFromFilename(const string& filename) {
		size_t start = filename.rfind("/");
		@@ -30,3 +33,6 @@ string FindLayoutNameFromFilename(const string& filename) {

		return filename.substr(start, end - start);
		}

		} // namespace util
		} // namespace startop

+9 −3

Original line number	Diff line number	Diff line
		@@ -13,11 +13,17 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		#ifndef UTIL_H_
		#define UTIL_H_
		#ifndef VIEW_COMPILER_UTIL_H_
		#define VIEW_COMPILER_UTIL_H_

		#include <string>

		namespace startop {
		namespace util {

		std::string FindLayoutNameFromFilename(const std::string& filename);

		#endif // UTIL_H_
		} // namespace util
		} // namespace startop

		#endif // VIEW_COMPILER_UTIL_H_

+10 −4

Original line number	Diff line number	Diff line
		@@ -20,9 +20,15 @@

		using std::string;

		namespace startop {
		namespace util {

		TEST(UtilTest, FindLayoutNameFromFilename) {
		EXPECT_EQ("bar", ::FindLayoutNameFromFilename("foo/bar.xml"));
		EXPECT_EQ("bar", ::FindLayoutNameFromFilename("bar.xml"));
		EXPECT_EQ("bar", ::FindLayoutNameFromFilename("./foo/bar.xml"));
		EXPECT_EQ("bar", ::FindLayoutNameFromFilename("/foo/bar.xml"));
		EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("foo/bar.xml"));
		EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("bar.xml"));
		EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("./foo/bar.xml"));
		EXPECT_EQ("bar", startop::util::FindLayoutNameFromFilename("/foo/bar.xml"));
		}

		} // namespace util
		} // namespace startop